X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2FvvSlicerManager.h;h=5bbc3c7343f239c5eef45e7e7fdd1a99f204a7dc;hb=05faf03369aefc02b249d8b15cc1bb2aa89103f6;hp=1608fbcec492dff52fae769cc3f957b6c3e5bb51;hpb=78ae141332b4f8d5146952b08dced58e4d248e06;p=clitk.git

diff --git a/vv/vvSlicerManager.h b/vv/vvSlicerManager.h
index 1608fbc..5bbc3c7 100644
--- a/vv/vvSlicerManager.h
+++ b/vv/vvSlicerManager.h
@@ -1,3 +1,4 @@
+
 /*=========================================================================
   Program:   vv                     http://www.creatis.insa-lyon.fr/rio/vv
 
@@ -98,7 +99,7 @@ class vvSlicerManager : public QObject {
     else return -1;
   }
 
-  void SetFilename(std::string f);
+  void SetFilename(std::string f, int number=0);
 
   void SetTSlice(int slice);
   void SetNextTSlice(int originating_slicer);
@@ -114,7 +115,7 @@ class vvSlicerManager : public QObject {
   void SetColorMap(int colormap);
   void SetPreset(int preset);
   void SetOverlayColor(int color) {
-    mOverlayColor = color;
+    mOverlayColor = (color/60)*60; //SR: new vvBlendImageActor needs 0 or 255 per component
   }
   void SetFusionOpacity(int opacity) {
     mFusionOpacity = opacity;
@@ -157,13 +158,14 @@ class vvSlicerManager : public QObject {
   void SetCursorVisibility(int s);
   void UpdateViews(int current, int slicer);
   void UpdateLinked(int slicer);
+  void UpdateLinkedNavigation(vvSlicer *slicer, bool bPropagate=false);
   void Render();
 
   void AddLink(std::string newId) {
     mLinkedId.push_back(newId);
   }
   void RemoveLink(std::string oldId) {
-    mLinkedId.remove(oldId);
+    mLinkedId.remove(oldId); 
   }
 
   ///Remove the actor defined by its type and index (example: 3rd contour)
@@ -186,6 +188,8 @@ class vvSlicerManager : public QObject {
   
   void NextImage(int slicer);
   void PrevImage(int slicer);
+  void LeftButtonReleaseEvent(int slicer);
+  void VerticalSliderHasChanged(int slicer, int slice);
 
 signals :
   void currentImageChanged(std::string id);
@@ -199,8 +203,11 @@ signals :
   void UpdateSliceRange(int slice, int min, int max, int tmin, int tmax);
   void WindowLevelChanged(double window, double level, int preset, int colormap);
   void UpdateLinkManager(std::string, int slicer, double x, double y, double z, int temps);
+  void UpdateLinkedNavigation(std::string, vvSlicerManager*);
   void LandmarkAdded();
   void ChangeImageWithIndexOffset(vvSlicerManager *sm, int slicer, int offset);
+  void LeftButtonReleaseSignal(int slicer);
+  void AVerticalSliderHasChanged(int slicer, int slice);
 
 protected:
   std::vector<vvSlicer*> mSlicers;
@@ -235,6 +242,9 @@ protected:
   std::list<std::string> mLinkedId;
 
   vvLandmarks* mLandmarks;
+  
+  std::vector<int> mPreviousSlice;
+  std::vector<int> mPreviousTSlice;
 };
 
 #endif