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

diff --git a/vv/qt_ui/vvOverlayPanel.ui b/vv/qt_ui/vvOverlayPanel.ui
index a6585160d53ee2ee6873b7a614f18789a47fb175..dfe6ede89e8a66b638fae1e95f53976492ab43fa 100644 (file)
--- a/vv/qt_ui/vvOverlayPanel.ui
+++ b/vv/qt_ui/vvOverlayPanel.ui
@@ -619,7 +619,7 @@ p, li { white-space: pre-wrap; }
         </property>
        </widget>
       </item>
-      <item row="5" column="0" colspan="3">
+      <item row="5" column="0" colspan="4">
        <widget class="QLabel" name="valueFusionnedLabel">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

diff --git a/vv/vvSlicerManager.cxx b/vv/vvSlicerManager.cxx
index a1d88c996ab0a634816bef843adfd19025ee7b9d..9a163093ea40b9db9397581f9f56c57a6befeb4c 100644 (file)
--- a/vv/vvSlicerManager.cxx
+++ b/vv/vvSlicerManager.cxx
@@ -57,8 +57,8 @@ vvSlicerManager::vvSlicerManager(int numberOfSlicers)
   mPreset = 0;
   mOverlayColor = 130;
 
-  mFusionOpacity = 70;
-  mFusionThresOpacity = 0;
+  mFusionOpacity = 30;
+  mFusionThresOpacity = 1;
   mFusionColorMap = 3;
   mFusionWindow = 1000;
   mFusionLevel = 1000;