[REMOVE] - removed deprecated getPickPixelPosition. It returned a std::pair as...

[REMOVE] - removed deprecated getPickPixelPosition. It returned a std::pair as point! If I see something like this again in your newly commited code, I will personally force you to program on windows with notepad as punishment.

src/graphicsEngine/WPickInfo.h

@@ -131,11 +131,6 @@ public:
      */
     inline WVector3d_2 getPickNormal() const;
 
-    /**
-     * Get pixel coordinates where object was hit.
-     */
-    OW_API_DEPRECATED inline std::pair< float, float > getPickPixelPosition() const;
-
     /**
      * Returns the picked pixel coordinates in screen-space.
      *
@@ -234,11 +229,6 @@ WVector3d_2 WPickInfo::getPickNormal() const
     return m_pickNormal;
 }
 
-std::pair< float, float > WPickInfo::getPickPixelPosition() const
-{
-    return m_pixelCoords;
-}
-
 inline bool WPickInfo::operator==( WPickInfo rhs ) const
 {
     return ( this->m_name == rhs.m_name

src/graphicsEngine/WROIBox.cpp

@@ -114,7 +114,7 @@ WROIBox::WROIBox( WPosition_2 minPos, WPosition_2 maxPos ) :
     WROI(),
     boxId( maxBoxId++ ),
     m_pickNormal( WVector3d_2() ),
-    m_oldPixelPosition( std::make_pair( 0, 0 ) ),
+    m_oldPixelPosition( WVector2d_2::zero() ),
     m_color( osg::Vec4( 0.f, 1.f, 1.f, 0.4f ) ),
     m_notColor( osg::Vec4( 1.0f, 0.0f, 0.0f, 0.4f ) )
 {
@@ -222,21 +222,21 @@ void WROIBox::updateGFX()
     ss << "ROIBox" << boxId << "";
     if ( m_pickInfo.getName() == ss.str() )
     {
-        std::pair< float, float > newPixelPos( m_pickInfo.getPickPixelPosition() );
+        WVector2d_2 newPixelPos( m_pickInfo.getPickPixel() );
         if ( m_isPicked )
         {
-            osg::Vec3 in( newPixelPos.first, newPixelPos.second, 0.0 );
+            osg::Vec3 in( newPixelPos.x(), newPixelPos.y(), 0.0 );
             osg::Vec3 world = wge::unprojectFromScreen( in, m_viewer->getCamera() );
 
             WPosition_2 newPixelWorldPos( world[0], world[1], world[2] );
             WPosition_2 oldPixelWorldPos;
-            if(  m_oldPixelPosition.first == 0 && m_oldPixelPosition.second == 0 )
+            if(  m_oldPixelPosition.x() == 0 && m_oldPixelPosition.y() == 0 )
             {
                 oldPixelWorldPos = newPixelWorldPos;
             }
             else
             {
-                osg::Vec3 in( m_oldPixelPosition.first, m_oldPixelPosition.second, 0.0 );
+                osg::Vec3 in( m_oldPixelPosition.x(), m_oldPixelPosition.y(), 0.0 );
                 osg::Vec3 world = wge::unprojectFromScreen( in, m_viewer->getCamera() );
                 oldPixelWorldPos = WPosition_2( world[0], world[1], world[2] );
             }

src/graphicsEngine/WROIBox.h

@@ -84,7 +84,7 @@ private:
     bool m_isPicked; //!< Indicates whether the box is currently picked or not.
     WPosition_2 m_pickedPosition; //!< Caches the old picked position to a allow for cmoparison
     WVector3d_2 m_pickNormal; //!< Store the normal that occured when the pick action was started.
-    std::pair< float, float > m_oldPixelPosition; //!< Caches the old picked position to a allow for cmoparison
+    WVector2d_2 m_oldPixelPosition; //!< Caches the old picked position to a allow for cmoparison
     boost::shared_mutex m_updateLock; //!< Lock to prevent concurrent threads trying to update the osg node
     osg::ref_ptr< osg::Geometry > m_surfaceGeometry; //!< store this pointer for use in updates
 

src/graphicsEngine/WROISphere.cpp

@@ -43,7 +43,7 @@ WROISphere::WROISphere( WPosition_2 position, float radius ) :
     m_originalPosition( position ),
     m_radius( radius ),
     m_pickNormal( WVector3d_2() ),
-    m_oldPixelPosition( std::make_pair( 0, 0 ) ),
+    m_oldPixelPosition( WVector2d_2::zero() ),
     m_color( osg::Vec4( 0.f, 1.f, 1.f, 0.4f ) ),
     m_notColor( osg::Vec4( 1.0f, 0.0f, 0.0f, 0.4f ) ),
     m_lockPoint( WVector3d_2( 0.0, 0.0, 0.0 ) ),
@@ -151,21 +151,21 @@ void WROISphere::updateGFX()
 
     if ( m_pickInfo.getName() == ss.str() )
     {
-        std::pair< float, float > newPixelPos( m_pickInfo.getPickPixelPosition() );
+        WVector2d_2 newPixelPos( m_pickInfo.getPickPixel() );
         if ( m_isPicked )
         {
-            osg::Vec3 in( newPixelPos.first, newPixelPos.second, 0.0 );
+            osg::Vec3 in( newPixelPos.x(), newPixelPos.y(), 0.0 );
             osg::Vec3 world = wge::unprojectFromScreen( in, m_viewer->getCamera() );
 
             WPosition_2 newPixelWorldPos( world[0], world[1], world[2] );
             WPosition_2 oldPixelWorldPos;
-            if(  m_oldPixelPosition.first == 0 && m_oldPixelPosition.second == 0 )
+            if(  m_oldPixelPosition.x() == 0 && m_oldPixelPosition.y() == 0 )
             {
                 oldPixelWorldPos = newPixelWorldPos;
             }
             else
             {
-                osg::Vec3 in( m_oldPixelPosition.first, m_oldPixelPosition.second, 0.0 );
+                osg::Vec3 in( m_oldPixelPosition.x(), m_oldPixelPosition.y(), 0.0 );
                 osg::Vec3 world = wge::unprojectFromScreen( in, m_viewer->getCamera() );
                 oldPixelWorldPos = WPosition_2( world[0], world[1], world[2] );
             }

src/graphicsEngine/WROISphere.h

@@ -170,7 +170,7 @@ private:
 
     WVector3d_2 m_pickNormal; //!< Store the normal that occured when the pick action was started.
 
-    std::pair< float, float > m_oldPixelPosition; //!< Caches the old picked position to a allow for cmoparison
+    WVector2d_2 m_oldPixelPosition; //!< Caches the old picked position to a allow for cmoparison
 
     WPickInfo m_pickInfo; //!< Stores the pick information for potential redraw
 

src/kernel/modules/navSlices/WMNavSlices.cpp

@@ -346,8 +346,8 @@ void WMNavSlices::setSlicePosFromPick( WPickInfo pickInfo )
         boost::unique_lock< boost::shared_mutex > lock;
         lock = boost::unique_lock< boost::shared_mutex >( m_updateLock );
 
-        double x = static_cast< double >( pickInfo.getPickPixelPosition().first );
-        double y = static_cast< double >( pickInfo.getPickPixelPosition().second );
+        double x = static_cast< double >( pickInfo.getPickPixel().x() );
+        double y = static_cast< double >( pickInfo.getPickPixel().y() );
         double xPos = 0.0;
         double yPos = 0.0;
         double width;
@@ -494,11 +494,11 @@ void WMNavSlices::setSlicePosFromPick( WPickInfo pickInfo )
 
         WVector3d_2 normal = pickInfo.getPickNormal();
 
-        std::pair< float, float > newPixelPos( pickInfo.getPickPixelPosition() );
+        WVector2d_2 newPixelPos( pickInfo.getPickPixel() );
         if ( m_isPicked )
         {
-            osg::Vec3 startPosScreen( m_oldPixelPosition.first, m_oldPixelPosition.second, 0.0 );
-            osg::Vec3 endPosScreen( newPixelPos.first, newPixelPos.second, 0.0 );
+            osg::Vec3 startPosScreen( m_oldPixelPosition.x(), m_oldPixelPosition.y(), 0.0 );
+            osg::Vec3 endPosScreen( newPixelPos.x(), newPixelPos.y(), 0.0 );
 
             osg::Vec3 startPosWorld = wge::unprojectFromScreen( startPosScreen, m_viewer->getCamera() );
             osg::Vec3 endPosWorld = wge::unprojectFromScreen( endPosScreen, m_viewer->getCamera() );

src/kernel/modules/navSlices/WMNavSlices.h

@@ -244,7 +244,7 @@ private:
      */
     void initUniforms( osg::StateSet* rootState );
 
-    std::pair< float, float > m_oldPixelPosition; //!< Caches the old picked position to a allow for comparison
+    WVector2d_2 m_oldPixelPosition; //!< Caches the old picked position to a allow for comparison
     bool m_isPicked; //!< Indicates whether a slice is currently picked or not.
     bool m_isPickedSagittal; //!< Indicates whether a sagittal slice is currently picked or not.
     bool m_isPickedCoronal; //!< Indicates whether coronal slice is currently picked or not.

src/modules/clusterDisplay/WMClusterDisplay.cpp

@@ -971,8 +971,8 @@ void WMClusterDisplay::dendrogramClick( WPickInfo pickInfo )
     {
         return;
     }
-    int x = pickInfo.getPickPixelPosition().first;
-    int y = pickInfo.getPickPixelPosition().second;
+    int x = pickInfo.getPickPixel().x();
+    int y = pickInfo.getPickPixel().y();
 
     m_propSelectedCluster->set( m_dendrogramGeode->getClickedCluster( x, y ) );
 }

src/modules/clusterDisplayVoxels/WMClusterDisplayVoxels.cpp

@@ -1066,8 +1066,8 @@ void WMClusterDisplayVoxels::dendrogramClick( WPickInfo pickInfo )
     {
         return;
     }
-    int x = pickInfo.getPickPixelPosition().first;
-    int y = pickInfo.getPickPixelPosition().second;
+    int x = pickInfo.getPickPixel().x();
+    int y = pickInfo.getPickPixel().y();
 
     size_t cluster = m_dendrogramGeode->getClickedCluster( x, y );
     //std::cout << cluster << std::endl;

src/modules/hud/WMHud.cpp

@@ -221,7 +221,7 @@ void WMHud::updatePickText( WPickInfo pickInfo )
     os << std::setprecision( 5 )
        << "Name: " << pickInfo.getName() << "\n"
        << "Position: [" << pickInfo.getPickPosition()[0] << ", " << pickInfo.getPickPosition()[1] << ", " << pickInfo.getPickPosition()[2] << "]\n"
-       << "Pixel coordinates: "  << pickInfo.getPickPixelPosition().first << " " << pickInfo.getPickPixelPosition().second << "\n"
+       << "Pixel coordinates: "  << pickInfo.getPickPixel().x() << " " << pickInfo.getPickPixel().y() << "\n"
        << "Object Normal: [" << pickInfo.getPickNormal()[0] << ", " << pickInfo.getPickNormal()[1] << ", " << pickInfo.getPickNormal()[2] << "]\n";
 
     m_pickText = os.str();

src/modules/lineGuidedSlice/WMLineGuidedSlice.cpp

@@ -196,10 +196,10 @@ void WMLineGuidedSlice::setSlicePosFromPick( WPickInfo pickInfo )
 
         WVector3d_2 normal = pickInfo.getPickNormal();
 
-        std::pair< float, float > newPixelPos( pickInfo.getPickPixelPosition() );
+        WVector2d_2 newPixelPos( pickInfo.getPickPixel() );
         if( m_isPicked )
         {
-            float diff = newPixelPos.first - m_oldPixelPosition.first;
+            float diff = newPixelPos.x() - m_oldPixelPosition.x();
 
             diff *= 0.01;
 

src/modules/lineGuidedSlice/WMLineGuidedSlice.h

@@ -151,7 +151,7 @@ private:
 
     WPropDouble m_pos; //!< Slice position along line.
 
-    std::pair< float, float > m_oldPixelPosition; //!< Caches the old picked position to a allow for cmoparison
+    WVector2d_2 m_oldPixelPosition; //!< Caches the old picked position to a allow for cmoparison
     bool m_isPicked; //!< Indicates whether a slice is currently picked or not.
     boost::shared_ptr< WGEViewer > m_viewer; //!< Stores reference to the main viewer
     boost::shared_ptr< WModuleInputData< const WFiberCluster > > m_input; //!< Input connector for a fiber cluster