From: David Sarrut <david.sarrut@gmail.com>
Date: Wed, 17 Oct 2012 10:55:39 +0000 (+0200)
Subject: Merge branch 'master' of git.creatis.insa-lyon.fr:clitk
X-Git-Tag: v1.4.0~289
X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=commitdiff_plain;h=f1cebc71809c5218578a58486f829980eeb29ab3;p=clitk.git

Merge branch 'master' of git.creatis.insa-lyon.fr:clitk

Conflicts:
	vv/vv.cxx
	vv/vvSlicerManager.cxx
	vv/vvSlicerManagerCommand.cxx
---

f1cebc71809c5218578a58486f829980eeb29ab3
diff --cc vv/vvSlicerManagerCommand.cxx
index 77b667e,73a0ab5..ad80b92
--- a/vv/vvSlicerManagerCommand.cxx
+++ b/vv/vvSlicerManagerCommand.cxx
@@@ -363,11 -363,12 +363,24 @@@ void vvSlicerManagerCommand::Execute(vt
          break;
        }
  
-       this->SM->GetSlicer(VisibleInWindow)->SetCurrentPosition(xWorld,yWorld,zWorld,
-                                                                this->SM->GetSlicer(VisibleInWindow)->GetTSlice());
++      // <<<<<<< HEAD
++      //       this->SM->GetSlicer(VisibleInWindow)->SetCurrentPosition(xWorld,yWorld,zWorld,
++      //                           this->SM->GetSlicer(VisibleInWindow)->GetTSlice());
++      //       // We propagate the mouse position
++      //       this->SM->EmitMousePositionUpdated(VisibleInWindow);      
++      // =======
+       double p[3]; p[0] = xWorld; p[1] = yWorld; p[2] = zWorld;
+       double pt[3];
+       this->SM->GetSlicer(VisibleInWindow)->GetSlicingTransform()->TransformPoint(p, pt);
+ 
+       this->SM->GetSlicer(VisibleInWindow)->SetCurrentPosition(pt[0],pt[1],pt[2],
+           this->SM->GetSlicer(VisibleInWindow)->GetMaxCurrentTSlice());
++
 +      // We propagate the mouse position
 +      this->SM->EmitMousePositionUpdated(VisibleInWindow);
 +
++      //>>>>>>> 921642d767beba2442dacc8fdb40dc36396e1b7d
++
        if (newLandmark) {
          this->SM->AddLandmark(xWorld,yWorld,zWorld,
                                this->SM->GetSlicer(VisibleInWindow)->GetTSlice());