[ADD] possibilty to initiate picking from external position obtained by…

[ADD] possibilty to initiate picking from external position obtained by connector instead of single click

src/modules/pickingDVR/WMPickingDVR.cpp

@@ -35,6 +35,7 @@
 #include <osg/ShapeDrawable>
 #include <osg/ShapeDrawable>
 #include <osgViewer/View>
 #include <osgViewer/View>
 
 
+#include "core/common/datastructures/WSinglePosition.h"
 #include "core/dataHandler/WDataSetScalar.h"
 #include "core/dataHandler/WDataSetScalar.h"
 #include "core/graphicsEngine/WGEGeodeUtils.h"
 #include "core/graphicsEngine/WGEGeodeUtils.h"
 #include "core/graphicsEngine/WGEManagedGroupNode.h"
 #include "core/graphicsEngine/WGEManagedGroupNode.h"
@@ -64,10 +65,11 @@ W_LOADABLE_MODULE( WMPickingDVR )
 WMPickingDVR::WMPickingDVR():
 WMPickingDVR::WMPickingDVR():
 WModule(),
 WModule(),
     m_propCondition( new WCondition() ),
     m_propCondition( new WCondition() ),
+    m_intersected( false ),
     m_curve3D( 0 ),
     m_curve3D( 0 ),
-    m_oldRayStart( 0.0, 0.0, 0.0 )
+    m_oldRayStart( 0.0, 0.0, 0.0 ),
+    m_pickHandlerConnected( false )
 {
 {
-    m_intersected = false;
     m_posStart = osg::Vec3f( 0.0, 0.0, 0.0 );
     m_posStart = osg::Vec3f( 0.0, 0.0, 0.0 );
     m_posEnd = osg::Vec3f( 0.0, 0.0, 0.0 );
     m_posEnd = osg::Vec3f( 0.0, 0.0, 0.0 );
 }
 }
@@ -93,8 +95,15 @@ const std::string WMPickingDVR::getDescription() const
 
 
 void WMPickingDVR::connectors()
 void WMPickingDVR::connectors()
 {
 {
-    m_transferFunction = WModuleInputData< WDataSetSingle >::createAndAdd( shared_from_this(), "transfer function", "The 1D transfer function." );
-    m_scalarIC = WModuleInputData< WDataSetScalar >::createAndAdd( shared_from_this(), "scalar data", "Scalar data." );
+    m_transferFunction = WModuleInputData< WDataSetSingle >::createAndAdd( shared_from_this(),
+                                                                           "transfer function",
+                                                                           "The 1D transfer function." );
+    m_scalarIC = WModuleInputData< WDataSetScalar >::createAndAdd( shared_from_this(),
+                                                                   "scalar data",
+                                                                   "Scalar data." );
+    m_externalScreenPos = WModuleInputData< WSinglePosition >::createAndAdd( shared_from_this(),
+                                                                             "External Screen Position",
+                                                                             "External screen position for picking." );
 
 
     WModule::connectors();
     WModule::connectors();
 }
 }
@@ -201,6 +210,7 @@ void WMPickingDVR::moduleMain()
     m_moduleState.setResetable( true, true );
     m_moduleState.setResetable( true, true );
     m_moduleState.add( m_scalarIC->getDataChangedCondition() );
     m_moduleState.add( m_scalarIC->getDataChangedCondition() );
     m_moduleState.add( m_transferFunction->getDataChangedCondition() );
     m_moduleState.add( m_transferFunction->getDataChangedCondition() );
+    m_moduleState.add( m_externalScreenPos->getDataChangedCondition() );
     m_moduleState.add( m_propCondition );
     m_moduleState.add( m_propCondition );
 
 
     ready();
     ready();
@@ -213,9 +223,6 @@ void WMPickingDVR::moduleMain()
     boost::shared_ptr< WGraphicsEngine > graphicsEngine = WGraphicsEngine::getGraphicsEngine();
     boost::shared_ptr< WGraphicsEngine > graphicsEngine = WGraphicsEngine::getGraphicsEngine();
     boost::shared_ptr< WGEViewer > mainView = graphicsEngine->getViewerByName( "Main View" );
     boost::shared_ptr< WGEViewer > mainView = graphicsEngine->getViewerByName( "Main View" );
 
 
-    // Register PickHandler
-    mainView->getPickHandler()->getPickSignal()->connect( boost::bind( &WMPickingDVR::pickHandler, this, _1 ) );
-
     // Main loop
     // Main loop
     while( !m_shutdownFlag() )
     while( !m_shutdownFlag() )
     {
     {
@@ -228,6 +235,28 @@ void WMPickingDVR::moduleMain()
             break;
             break;
         }
         }
 
 
+        if( m_externalScreenPos->isConnected() == 0 )
+        {
+            if( !m_pickHandlerConnected )
+            {
+                // Register PickHandler
+                mainView->getPickHandler()->getPickSignal()->connect( boost::bind( &WMPickingDVR::pickHandler, this, _1 ) );
+                m_pickHandlerConnected = true;
+            }
+        }
+        else
+        {
+            if( m_pickHandlerConnected )
+            {
+                // Register PickHandler
+                mainView->getPickHandler()->getPickSignal()->disconnect( boost::bind( &WMPickingDVR::pickHandler, this, _1 ) );
+                m_pickHandlerConnected = false;
+            }
+        }
+
+
+
+
         std::string pickingMode;
         std::string pickingMode;
 
 
         const int selectionType =  m_selectionType->get( true ).getItemIndexOfSelected( 0 );
         const int selectionType =  m_selectionType->get( true ).getItemIndexOfSelected( 0 );
@@ -251,6 +280,30 @@ void WMPickingDVR::moduleMain()
 
 
         if( selectionType == 0 )
         if( selectionType == 0 )
         {
         {
+            if( m_externalScreenPos->isConnected() != 0 && m_externalScreenPos->getData() )
+            {
+                float fPosX = ( *( m_externalScreenPos->getData() ) )[0];
+                float fPosY = ( *( m_externalScreenPos->getData() ) )[1];
+
+                boost::shared_ptr< WGraphicsEngine > graphicsEngine = WGraphicsEngine::getGraphicsEngine();
+                boost::shared_ptr< WGEViewer > mainView = graphicsEngine->getViewerByName( "Main View" );
+
+                osg::ref_ptr< osgViewer::Viewer > view = mainView->getView();
+                osgUtil::LineSegmentIntersector::Intersections intersections;
+
+                bool intersected = view->computeIntersections( fPosX, fPosY, intersections, 0xFFFFFFFF );
+                if( intersected )
+                {
+                    osgUtil::LineSegmentIntersector::Intersection start= *intersections.begin();
+                    osgUtil::LineSegmentIntersector::Intersection end = *intersections.rbegin();
+
+                    m_posStart = start.getWorldIntersectPoint();
+                    m_posEnd  = end.getWorldIntersectPoint();
+
+                    m_intersected = true;
+                }
+            }
+
             // Valid position picked on proxy cube
             // Valid position picked on proxy cube
             if( m_intersected )
             if( m_intersected )
             {
             {
@@ -343,7 +396,7 @@ void WMPickingDVR::pickHandler( WPickInfo pickInfo )
     boost::shared_ptr< WGraphicsEngine > graphicsEngine = WGraphicsEngine::getGraphicsEngine();
     boost::shared_ptr< WGraphicsEngine > graphicsEngine = WGraphicsEngine::getGraphicsEngine();
     boost::shared_ptr< WGEViewer > mainView = graphicsEngine->getViewerByName( "Main View" );
     boost::shared_ptr< WGEViewer > mainView = graphicsEngine->getViewerByName( "Main View" );
 
 
-    osg::ref_ptr<osgViewer::Viewer> view = mainView->getView();
+    osg::ref_ptr< osgViewer::Viewer > view = mainView->getView();
     osgUtil::LineSegmentIntersector::Intersections intersections;
     osgUtil::LineSegmentIntersector::Intersections intersections;
 
 
     float fPosX = pickInfo.getPickPixel().x();
     float fPosX = pickInfo.getPickPixel().x();

src/modules/pickingDVR/WMPickingDVR.h

@@ -36,6 +36,7 @@
 // forward declarations to reduce compile dependencies
 // forward declarations to reduce compile dependencies
 template< class T > class WModuleInputData;
 template< class T > class WModuleInputData;
 class WDataSetScalar;
 class WDataSetScalar;
+class WSinglePosition;
 class WGEManagedGroupNode;
 class WGEManagedGroupNode;
 
 
 /**
 /**
@@ -196,6 +197,8 @@ private:
 
 
     boost::shared_ptr< WModuleInputData< WDataSetSingle > > m_transferFunction; //!< The transfer function as an input data set
     boost::shared_ptr< WModuleInputData< WDataSetSingle > > m_transferFunction; //!< The transfer function as an input data set
 
 
+    boost::shared_ptr< WModuleInputData< WSinglePosition > > m_externalScreenPos; //!< External screen position for picking instead of by clicking.
+
     osg::ref_ptr< WGEManagedGroupNode > m_rootNode; //!< All other geodes or OSG nodes of this module will be attached on this node.
     osg::ref_ptr< WGEManagedGroupNode > m_rootNode; //!< All other geodes or OSG nodes of this module will be attached on this node.
 
 
     osg::ref_ptr< osg::Geode > m_geode; //!< The geometry rendered by this module.
     osg::ref_ptr< osg::Geode > m_geode; //!< The geometry rendered by this module.
@@ -247,6 +250,8 @@ private:
     WVisiTrace m_visiTrace; //!< Class providing VisiTrace optimization.
     WVisiTrace m_visiTrace; //!< Class providing VisiTrace optimization.
 
 
     WPosition m_oldRayStart; //!< Used to check if position of picking has changed
     WPosition m_oldRayStart; //!< Used to check if position of picking has changed
+
+    bool m_pickHandlerConnected; //!< Is the signal from the pick handler connected?
 };
 };
 
 
 #endif  // WMPICKINGDVR_H
 #endif  // WMPICKINGDVR_H