Allow placing cursor on isosurfaces

Author: rpwang17

freeview/Interactor3DPointSetEdit.cpp

@@ -39,6 +39,7 @@ bool Interactor3DPointSetEdit::ProcessKeyDownEvent( QKeyEvent* event, RenderView
 bool Interactor3DPointSetEdit::ProcessMouseUpEvent( QMouseEvent* event, RenderView* renderview )
 {
   RenderView3D* view = ( RenderView3D* )renderview;
+  MainWindow* mwnd = MainWindow::GetMainWindow();
   if (m_bEditAttempted && qAbs(event->x() - this->m_nPressedPosX) < 2
       && qAbs(event->y() - this->m_nPressedPosY) < 2)
   {
@@ -50,24 +51,40 @@ bool Interactor3DPointSetEdit::ProcessMouseUpEvent( QMouseEvent* event, RenderVi
       return false;
     }
 
-    if (surf && wp)
+    if (wp)
     {
       if ( !(event->modifiers() & Qt::ShiftModifier) )
       {
-        int nvo = -1;
-        nvo = view->PickCurrentSurfaceVertex(event->x(), event->y(), surf);
-        if (nvo >= 0)
+        if (!mwnd->GetVisibleLayers("Surf").isEmpty())
         {
-          wp->SaveForUndo();
-          double ras[3];
-          surf->GetTargetAtVertex(nvo, ras, surf->IsInflated()?FSSurface::SurfaceWhite:-1);
-          int nIndex = wp->FindPoint( ras );
-          if ( nIndex < 0 )
+          int nvo = -1;
+          nvo = view->PickCurrentSurfaceVertex(event->x(), event->y(), surf);
+          if (nvo >= 0)
           {
-            nIndex = wp->AddPoint( ras, 1, true );
-            return true;
+            wp->SaveForUndo();
+            double ras[3];
+            surf->GetTargetAtVertex(nvo, ras, surf->IsInflated()?FSSurface::SurfaceWhite:-1);
+            int nIndex = wp->FindPoint( ras );
+            if ( nIndex < 0 )
+            {
+              nIndex = wp->AddPoint( ras, 1, true );
+              return true;
+            }
           }
         }
+//        else if (!mwnd->GetVisibleLayers("MRI").isEmpty())
+//        {
+//          double ras[3];
+//          if (view->PickVolume(event->x(), event->y(), ras))
+//          {
+//            int nIndex = wp->FindPoint( ras );
+//            if ( nIndex < 0 )
+//            {
+//              nIndex = wp->AddPoint( ras, 1, true );
+//              return true;
+//            }
+//          }
+//        }
       }
       else
       {

freeview/RenderView3D.cpp

@@ -438,7 +438,6 @@ void RenderView3D::DoUpdateRASPosition( int posX, int posY, bool bCursor, bool b
   // MousePositionToRAS( posX, posY, pos );
   // vtkPointPicker* picker = vtkPointPicker::SafeDownCast( this->GetPicker() );
   vtkCellPicker* picker = vtkCellPicker::SafeDownCast( this->GetRenderWindow()->GetInteractor()->GetPicker() );
-  // vtkPropPicker* picker = vtkPropPicker::SafeDownCast( this->GetPicker() );
   if ( picker )
   {
     picker->InitializePickList();
@@ -553,8 +552,13 @@ void RenderView3D::DoUpdateRASPosition( int posX, int posY, bool bCursor, bool b
       picker->Pick( posX, posY, 0, GetRenderer() );
       picker->GetPickPosition( pos );
       prop = picker->GetViewProp();
-
-      if ( lc_mri->HasProp( prop ) || lc_roi->HasProp( prop ) )
+      LayerMRI* mri_sel = (LayerMRI*)lc_mri->HasProp(prop);
+      if (mri_sel->GetProperty()->GetShowAsContour())
+      {
+        lc_mri->SetCursorRASPosition( pos );
+        MainWindow::GetMainWindow()->SetSlicePosition( pos );
+      }
+      else if ( lc_mri->HasProp( prop ) || lc_roi->HasProp( prop ) )
       {
         if ( bCursor )
         {
@@ -783,9 +787,8 @@ int RenderView3D::PickCurrentSurfaceVertex(int posX, int posY, LayerSurface* cur
 
 int RenderView3D::PickCurrentPointSetPoint(int posX, int posY, LayerPointSet *curPointSet)
 {
-  LayerCollection* lc_ps = MainWindow::GetMainWindow()->GetLayerCollection( "PointSet" );
-
   this->setToolTip("");
+  LayerCollection* lc_ps = MainWindow::GetMainWindow()->GetLayerCollection( "PointSet" );
   if ( lc_ps->IsEmpty() )
   {
     return -1;
@@ -1922,3 +1925,23 @@ void RenderView3D::SavePathAsControlPoints(SurfacePath *sp)
       QMessageBox::warning(this, "Error", "Failed to save file " + fn);
   }
 }
+
+bool RenderView3D::PickVolume(int posX, int posY, double *pos_out)
+{
+  vtkProp* prop = this->PickProp( posX, posY, pos_out );
+  if ( !prop )
+  {
+    return false;
+  }
+
+  LayerCollection* lc_mri = MainWindow::GetMainWindow()->GetLayerCollection( "MRI" );
+  for ( int i = 0; i < lc_mri->GetNumberOfLayers(); i++ )
+  {
+    LayerMRI* mri = (LayerMRI*)lc_mri->GetLayer(i);
+    if (mri->GetProperty()->GetShowAsContour() && mri->HasProp(prop))
+    {
+      return true;
+    }
+  }
+  return false;
+}

freeview/RenderView3D.h

@@ -115,6 +115,8 @@ class RenderView3D : public RenderView
 
   int PickCurrentPointSetPoint(int posX, int posY, LayerPointSet* curPointSet = NULL);
 
+  bool PickVolume(int posX, int posY, double* pt_out);
+
   void ShowSlice(int nPlane, bool bshow);
 
   QVariantMap GetCameraInfo();