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

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

diff --cc segmentation/clitkExtractLungFilter.txx
Simple merge

diff --cc vv/CMakeLists.txt
Simple merge

diff --cc vv/vvSlicerManager.cxx
Simple merge

diff --cc vv/vvSlicerManager.h
Simple merge

diff --cc vv/vvSlicerManagerCommand.cxx
index 77b667e263bee3269a1f210e98a1f1bbf2c7cf0f,73a0ab5efda3e79ba42b604908662a2149806b4b..ad80b925a6d0b5bfc34fe6516e5f1d889bf9c003
--- 1/vv/vvSlicerManagerCommand.cxx
--- 2/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());