X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSlicerManagerCommand.cxx;h=d73bcfcd2ca1bd80510bf6043c357dc0f5fd7d36;hb=e34a7746ec0b9f82124e344edc79e348bb0278d2;hp=5b1ad270442ecce2dc4267400b5c4991b1775b03;hpb=a7057e740e0ea78a2a53f9e579ff07058e8b060f;p=clitk.git

diff --git a/vv/vvSlicerManagerCommand.cxx b/vv/vvSlicerManagerCommand.cxx
index 5b1ad27..d73bcfc 100644
--- a/vv/vvSlicerManagerCommand.cxx
+++ b/vv/vvSlicerManagerCommand.cxx
@@ -85,7 +85,7 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller,
 
 
     if (event == vtkCommand::StartPickEvent && VisibleInWindow == -1) {
-      for (int i = 0; i < this->SM->NumberOfSlicers(); i++) {
+      for (int i = 0; i < this->SM->GetNumberOfSlicers(); i++) {
         if (this->SM->GetSlicer(i)->GetCursorVisibility()) {
           this->SM->GetSlicer(i)->SetCursorVisibility(0);
           this->SM->GetSlicer(i)->Render();
@@ -189,15 +189,14 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller,
           return;
         }
         if (KeyPress == "x") {
-	  for(int i=0;i<SM->NumberOfSlicers();i++)
-	  {
-	   SM->RemoveActor("overlay",0);
-	   SM->SetColorMap(0);
-	   SM->Render();
-	  }
-	   return;
-	}
-	if (KeyPress == "u") {
+          for(int i=0; i<SM->GetNumberOfSlicers(); i++) {
+            SM->RemoveActor("overlay",0);
+            SM->SetColorMap(0);
+            SM->Render();
+          }
+          return;
+        }
+        if (KeyPress == "u") {
           this->SM->Reload();
           this->SM->Render();
           return;
@@ -205,6 +204,7 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller,
         if (KeyPress == "r" || KeyPress=="R") {
           this->SM->GetSlicer(VisibleInWindow)->ResetCamera();
           this->SM->GetSlicer(VisibleInWindow)->Render();
+          this->SM->UpdateLinkedNavigation( this->SM->GetSlicer(VisibleInWindow) );
           return;
         }
         if (KeyPress == "g") {
@@ -226,18 +226,12 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller,
           return;
         }
         if (KeyPress == "Up") {
-          DD("------------ up");
           this->SM->GetSlicer(VisibleInWindow)->SetSlice(this->SM->GetSlicer(VisibleInWindow)->GetSlice()+1);
-          DD("------------ after set slice");
-          this->SM->UpdateInfoOnCursorPosition(VisibleInWindow);
-          DD("------------ after UpdateInfoOnCursorPosition");
           this->SM->UpdateSlice(VisibleInWindow);
-          DD("------------ after updateslice");
         }
         if (KeyPress == "Down") {
           this->SM->GetSlicer(VisibleInWindow)->SetSlice(this->SM->GetSlicer(VisibleInWindow)->GetSlice()-1);
           this->SM->UpdateSlice(VisibleInWindow);
-          this->SM->UpdateInfoOnCursorPosition(VisibleInWindow);
         }
         if (KeyPress == "space") {
           newLandmark = true;
@@ -251,19 +245,16 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller,
           this->SM->GetSlicer(VisibleInWindow)->GetAnnotation()->SetText(2,"Sagital\n<slice>");
           this->SM->GetSlicer(VisibleInWindow)->SetSliceOrientation(0);
           this->SM->UpdateSliceRange(VisibleInWindow);
-          this->SM->UpdateInfoOnCursorPosition(VisibleInWindow);
         }
         if (KeyPress == "F3") {
           this->SM->GetSlicer(VisibleInWindow)->GetAnnotation()->SetText(2,"Coronal\n<slice>");
           this->SM->GetSlicer(VisibleInWindow)->SetSliceOrientation(1);
           this->SM->UpdateSliceRange(VisibleInWindow);
-          this->SM->UpdateInfoOnCursorPosition(VisibleInWindow);
         }
         if (KeyPress == "F4") {
           this->SM->GetSlicer(VisibleInWindow)->GetAnnotation()->SetText(2,"Axial\n<slice>");
           this->SM->GetSlicer(VisibleInWindow)->SetSliceOrientation(2);
           this->SM->UpdateSliceRange(VisibleInWindow);
-          this->SM->UpdateInfoOnCursorPosition(VisibleInWindow);
         }
 
       }
@@ -300,6 +291,10 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller,
         mStartSlicer = -1;
       }
 
+      if (event == vtkCommand::EndInteractionEvent) {
+        this->SM->UpdateLinkedNavigation(this->SM->GetSlicer(VisibleInWindow),true);
+        return;
+      }
     }
     if (VisibleInWindow > -1) {
       this->SM->Activated();
@@ -309,17 +304,17 @@ void vvSlicerManagerCommand::Execute(vtkObject *caller,
       if (event == vtkCommand::MouseWheelForwardEvent && !isi->GetInteractor()->GetControlKey()) {
         this->SM->GetSlicer(VisibleInWindow)->SetSlice(this->SM->GetSlicer(VisibleInWindow)->GetSlice()+1);
         this->SM->UpdateSlice(VisibleInWindow);
-        this->SM->UpdateInfoOnCursorPosition(VisibleInWindow);
       } else if (event == vtkCommand::MouseWheelForwardEvent && isi->GetInteractor()->GetControlKey()) {
         double factor = 2;
         this->Dolly(pow((double)1.1, factor),isi->GetInteractor());
+        Execute(caller, vtkCommand::EndInteractionEvent, NULL);
       } else if (event == vtkCommand::MouseWheelBackwardEvent && !isi->GetInteractor()->GetControlKey()) {
         this->SM->GetSlicer(VisibleInWindow)->SetSlice(this->SM->GetSlicer(VisibleInWindow)->GetSlice()-1);
         this->SM->UpdateSlice(VisibleInWindow);
-        this->SM->UpdateInfoOnCursorPosition(VisibleInWindow);
       } else if (event == vtkCommand::MouseWheelBackwardEvent && isi->GetInteractor()->GetControlKey()) {
         double factor = -2;
         this->Dolly(pow((double)1.1, factor),isi->GetInteractor());
+        Execute(caller, vtkCommand::EndInteractionEvent, NULL);
       }
       double xWorld=0;
       double yWorld=0;