Merge branch 'master' of /home/dsarrut/clitk3.server

diff --combined vv/vvMainWindow.cxx
index 41ae6ba841cca05f1472e7e5d24affb01bfe09ac,c60c04da4771dd2c4ec64c753449161ae410189c..7117da868c2126a5ebf529ea92dc9b0bf08df72b
--- 1/vv/vvMainWindow.cxx
--- 2/vv/vvMainWindow.cxx
+++ b/vv/vvMainWindow.cxx
@@@ -290,8 -290,8 +290,8 @@@ vvMainWindow::vvMainWindow():vvMainWind
    connect(linkPanel,SIGNAL(removeLink(QString,QString)),this,SLOT(RemoveLink(QString,QString)));
    connect(overlayPanel,SIGNAL(VFPropertyUpdated(int,int,int,int,double,double,double)),this,SLOT(SetVFProperty(int,int,int,int,double,double,double)));
    connect(overlayPanel,SIGNAL(OverlayPropertyUpdated(int)),this,SLOT(SetOverlayProperty(int)));
-   connect(overlayPanel,SIGNAL(FusionPropertyUpdated(int,int,double,double)),
-           this,SLOT(SetFusionProperty(int,int,double,double)));
+   connect(overlayPanel,SIGNAL(FusionPropertyUpdated(int,int,int,double,double)),
+           this,SLOT(SetFusionProperty(int,int,int,double,double)));
    connect(landmarksPanel,SIGNAL(UpdateRenderWindows()),this,SLOT(UpdateRenderWindows()));
  
    playMode = 0;//pause
@@@ -910,6 -910,8 +910,6 @@@ void vvMainWindow::LoadImages(std::vect
                  this, SLOT(OverlayChanged(int,double,double)));
          connect(mSlicerManagers.back(), SIGNAL(UpdateFusion(int, double)),
                  this, SLOT(FusionChanged(int,double)));
 -        connect(mSlicerManagers.back(), SIGNAL(UpdateWindows(int, int, int)),
 -                this,SLOT(WindowsChanged(int, int, int)));
          connect(mSlicerManagers.back(), SIGNAL(WindowLevelChanged(double, double,int, int)),
                  this,SLOT(WindowLevelChanged(double, double, int, int)));
          connect(mSlicerManagers.back(), SIGNAL(UpdateSlice(int,int)),
@@@ -1166,12 -1168,13 +1166,13 @@@ void vvMainWindow::ImageInfoChanged(
      if (mSlicerManagers[index]->GetSlicer(0)->GetFusion()) {
        overlayPanel->getFusionName(mSlicerManagers[index]->GetFusionName().c_str());
        overlayPanel->getFusionProperty(mSlicerManagers[index]->GetFusionOpacity(),
+                                       mSlicerManagers[index]->GetFusionThresholdOpacity(),
                                        mSlicerManagers[index]->GetFusionColorMap(),
                                        mSlicerManagers[index]->GetFusionWindow(),
                                        mSlicerManagers[index]->GetFusionLevel());
      } else {
        overlayPanel->getFusionName(mSlicerManagers[index]->GetFusionName().c_str());
-       overlayPanel->getFusionProperty(-1, -1,-1,-1);
+       overlayPanel->getFusionProperty(-1, -1, -1, -1, -1);
      }
    }
  }
@@@ -1621,6 -1624,13 +1622,6 @@@ void vvMainWindow::FusionChanged(int vi
  }
  //------------------------------------------------------------------------------
  
 -//------------------------------------------------------------------------------
 -void vvMainWindow::WindowsChanged(int window, int view, int slice)
 -{
 -  infoPanel->setViews(window, view, slice);
 -}
 -//------------------------------------------------------------------------------
 -
  //------------------------------------------------------------------------------
  void vvMainWindow::WindowLevelChanged(double window, double level,int preset,int colormap)
  {
@@@ -2131,11 -2141,12 +2132,12 @@@ void vvMainWindow::SetOverlayProperty(i
  //------------------------------------------------------------------------------
  
  //------------------------------------------------------------------------------
- void vvMainWindow::SetFusionProperty(int opacity, int colormap,double window, double level)
+ void vvMainWindow::SetFusionProperty(int opacity, int thresOpacity, int colormap,double window, double level)
  {
    int index = GetSlicerIndexFromItem(DataTree->selectedItems()[0]);
    if (mSlicerManagers[index]->GetSlicer(0)->GetFusion()) {
      mSlicerManagers[index]->SetFusionOpacity(opacity);
+     mSlicerManagers[index]->SetFusionThresholdOpacity(thresOpacity);
      mSlicerManagers[index]->SetFusionColorMap(colormap);
      mSlicerManagers[index]->SetFusionWindow(window);
      mSlicerManagers[index]->SetFusionLevel(level);
@@@ -2819,6 -2830,8 +2821,6 @@@ vvSlicerManager* vvMainWindow::AddImage
            this, SLOT(OverlayChanged(int,double,double)));
    connect(mSlicerManagers.back(), SIGNAL(UpdateFusion(int, double)),
            this, SLOT(FusionChanged(int,double)));
 -  connect(mSlicerManagers.back(), SIGNAL(UpdateWindows(int, int, int)),
 -          this,SLOT(WindowsChanged(int, int, int)));
    connect(mSlicerManagers.back(), SIGNAL(WindowLevelChanged(double, double,int, int)),
            this,SLOT(WindowLevelChanged(double, double, int, int)));
    connect(mSlicerManagers.back(), SIGNAL(UpdateSlice(int,int)),

diff --combined vv/vvMainWindow.h
index 39f6ee50f5785fe00030d38cc0d2a3ab9fd0a8f4,d47dacce49a837b32d8dc2cd7877bc3cdfad7fff..81588c146a6ca7a746b1747b2bb9b74dcd0503ae
--- 1/vv/vvMainWindow.h
--- 2/vv/vvMainWindow.h
+++ b/vv/vvMainWindow.h
@@@ -101,6 -101,7 +101,6 @@@ public slots
    void SegmentationOnCurrentImage();
    void SurfaceViewerLaunch();
  
 -  void WindowsChanged(int window, int view, int slice);
    void WindowLevelChanged(double window, double level,int preset, int colormap);
    void UpdateSlice(int slicer, int slice);
    void UpdateTSlice(int slicer, int slice);
@@@ -142,7 -143,7 +142,7 @@@
  
    void SetVFProperty(int subsampling,int scale,int lut, int width, double r, double g, double b);
    void SetOverlayProperty(int color);
-   void SetFusionProperty(int opacity,int colormap,double window,double level);
+   void SetFusionProperty(int opacity, int tresOpacity, int colormap,double window,double level);
  
    void GoToCursor();
    void PlayPause();

diff --combined vv/vvSlicerManager.h
index 0aa43d4d09ff8953db74fffd36ee0550394df192,a148d196e6ebdeeb175c4d7407b2276e3c77a2ff..581f9a351ba3e2b3fd5bd203961ed76b1556e2f9
--- 1/vv/vvSlicerManager.h
--- 2/vv/vvSlicerManager.h
+++ b/vv/vvSlicerManager.h
@@@ -121,6 -121,9 +121,9 @@@ class vvSlicerManager : public QObject 
    void SetFusionOpacity(int opacity) {
      mFusionOpacity = opacity;
    }
+   void SetFusionThresholdOpacity(int thresOpacity) {
+     mFusionThresOpacity = thresOpacity;
+   }
    void SetFusionColorMap(int colorMap) {
      mFusionColorMap = colorMap;
    }
@@@ -146,6 -149,9 +149,9 @@@
    int GetFusionOpacity() {
      return mFusionOpacity;
    }
+   int GetFusionThresholdOpacity() {
+     return mFusionThresOpacity;
+   }
    int GetFusionColorMap() {
      return mFusionColorMap;
    }
@@@ -205,6 -211,7 +211,6 @@@ signals 
    void UpdateVector(int display, double x, double y, double z, double value);
    void UpdateOverlay(int display, double valueOver, double valueRef);
    void UpdateFusion(int display, double valueFus);
 -  void UpdateWindows(int slicer, int view, int slice);
    void UpdateOrientation(int slicer, int orientation);
    void UpdateSlice(int slicer, int slice);
    void UpdateTSlice(int slicer, int slice);
@@@ -229,6 -236,7 +235,7 @@@ protected
    int mOverlayColor;
  
    int mFusionOpacity;
+   int mFusionThresOpacity;
    int mFusionColorMap;
    double mFusionWindow;
    double mFusionLevel;