X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=vv%2FvvSlicerManagerCommand.cxx;h=5b35bdd826e9eb94797518a8fcd5f565a9e949bb;hb=000ac5b867a708575268c7c823db4fcbe727c2d6;hp=ac806ae517a379d3fa252c88ae6fd2fc1210a320;hpb=a2df2b8fbe6e9e78ab861e899e6b6c0a7f80588d;p=clitk.git diff --git a/vv/vvSlicerManagerCommand.cxx b/vv/vvSlicerManagerCommand.cxx index ac806ae..5b35bdd 100644 --- a/vv/vvSlicerManagerCommand.cxx +++ b/vv/vvSlicerManagerCommand.cxx @@ -31,9 +31,11 @@ #include #include #include - +#include +#include #include "vvSlicer.h" #include "vvInteractorStyleNavigator.h" +#include "vtkTransform.h" #include @@ -80,6 +82,8 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller, if (VisibleInWindow>-1) renderer=this->SM->GetSlicer(VisibleInWindow)->GetRenderer(); newLandmark = false; + + if (event == vtkCommand::StartPickEvent && VisibleInWindow == -1) { @@ -283,6 +287,7 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller, this->SM->UpdateSliceRange(VisibleInWindow); this->SM->UpdateInfoOnCursorPosition(VisibleInWindow); } + } //All type of mouse events @@ -294,6 +299,15 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller, return; } + //DD(event); + // Mouse release HERE + if (event == vtkCommand::EndPickEvent) { + // DD(VisibleInWindow); + if (VisibleInWindow > -1) + this->SM->LeftButtonReleaseEvent(VisibleInWindow); + return; // no return !!!! ??? + } + if (event == vtkCommand::StartWindowLevelEvent) { mStartSlicer = -1; @@ -508,7 +522,10 @@ void vvSlicerManagerCommand::Dolly(double factor, vtkRenderWindowInteractor *int renderer->ResetCameraClippingRange(); //interactor->Render(); } +//------------------------------------------------------------------------------ + +//------------------------------------------------------------------------------ void vvSlicerManagerCommand::FlyToPosition(vtkRenderWindowInteractor *interactor,vvSlicer* slicer) { double flyFrom[3], flyTo[3]; @@ -577,3 +594,4 @@ void vvSlicerManagerCommand::FlyToPosition(vtkRenderWindowInteractor *interactor } } } +//------------------------------------------------------------------------------