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

diff --git a/vv/qt_ui/vvOverlayPanel.ui b/vv/qt_ui/vvOverlayPanel.ui
index 1a6e5b81398e9671e854aaa1c33367027c48c0c0..a6585160d53ee2ee6873b7a614f18789a47fb175 100644 (file)
--- a/vv/qt_ui/vvOverlayPanel.ui
+++ b/vv/qt_ui/vvOverlayPanel.ui
@@ -518,7 +518,7 @@ p, li { white-space: pre-wrap; }
          <double>1.000000000000000</double>
         </property>
         <property name="value">
-         <double>0.000000000000000</double>
+         <double>1.000000000000000</double>
         </property>
        </widget>
       </item>

diff --git a/vv/vvOverlayPanel.cxx b/vv/vvOverlayPanel.cxx
index 4d2bcf246901af90bb55d2eb413646695a87a687..68356bfd2df1d91d1fc7029d20d5e6afe331d44b 100644 (file)
--- a/vv/vvOverlayPanel.cxx
+++ b/vv/vvOverlayPanel.cxx
@@ -192,6 +192,8 @@ void vvOverlayPanel::getFusionProperty(int opacity, int thresOpacity, int colorm
     opacityHorizontalSlider->setValue(opacity);
     thresOpacityHorizontalSlider->setEnabled(1);
     thresOpacityHorizontalSlider->setValue(thresOpacity);
+    fusionOpacitySpin->setValue(opacity); 
+    fusionThresSpin->setValue(thresOpacity);
     fusionWindowSpinBox->setEnabled(1);
     fusionLevelSpinBox->setEnabled(1);
     fusionWindowSpinBox->setValue(window);
@@ -207,6 +209,8 @@ void vvOverlayPanel::getFusionProperty(int opacity, int thresOpacity, int colorm
     opacityHorizontalSlider->setValue(0);
     thresOpacityHorizontalSlider->setEnabled(0);
     thresOpacityHorizontalSlider->setValue(0);
+    fusionOpacitySpin->setValue(0); 
+    fusionThresSpin->setValue(0);
     fusionColorMapComboBox->setEnabled(0);
     fusionColorMapComboBox->setCurrentIndex(-1);
     fusionWindowSpinBox->setEnabled(0);

diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index 853d4c0b711bdb9f21095e621116c5f7568af673..a1d88c996ab0a634816bef843adfd19025ee7b9d 100644 (file)
--- a/vv/vvSlicerManager.cxx
+++ b/vv/vvSlicerManager.cxx
@@ -58,7 +58,7 @@ vvSlicerManager::vvSlicerManager(int numberOfSlicers)
   mOverlayColor = 130;
 
   mFusionOpacity = 70;
-  mFusionThresOpacity = 1;
+  mFusionThresOpacity = 0;
   mFusionColorMap = 3;
   mFusionWindow = 1000;
   mFusionLevel = 1000;