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

diff --combined vv/qt_ui/vvOverlayPanel.ui
index 912bf5e660dc44b5b190dfc169d282a8056b7c14,1a6e5b81398e9671e854aaa1c33367027c48c0c0..a6585160d53ee2ee6873b7a614f18789a47fb175
--- 1/vv/qt_ui/vvOverlayPanel.ui
--- 2/vv/qt_ui/vvOverlayPanel.ui
+++ b/vv/qt_ui/vvOverlayPanel.ui
@@@ -422,7 -422,7 +422,7 @@@ p, li { white-space: pre-wrap; 
          </property>
         </widget>
        </item>
-       <item row="0" column="1">
+       <item row="0" column="1" colspan="5">
         <widget class="QLabel" name="dataFusionnedLabel">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@@ -435,14 -435,14 +435,14 @@@
          </property>
         </widget>
        </item>
-       <item row="1" column="0" colspan="2">
+       <item row="1" column="0" colspan="3">
         <widget class="QLabel" name="opacityLabel">
          <property name="text">
           <string>Global Opacity :</string>
          </property>
         </widget>
        </item>
-       <item row="1" column="3" colspan="3">
+       <item row="1" column="3" colspan="2">
         <widget class="QSlider" name="opacityHorizontalSlider">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@@ -455,7 -455,7 +455,7 @@@
          </property>
         </widget>
        </item>
-       <item row="1" column="6">
+       <item row="1" column="5">
         <widget class="QDoubleSpinBox" name="fusionOpacitySpin">
          <property name="decimals">
           <number>2</number>
@@@ -490,7 -490,7 +490,7 @@@
          </property>
         </widget>
        </item>
-       <item row="2" column="3" colspan="3">
+       <item row="2" column="3" colspan="2">
         <widget class="QSlider" name="thresOpacityHorizontalSlider">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@@ -503,7 -503,7 +503,7 @@@
          </property>
         </widget>
        </item>
-       <item row="2" column="6">
+       <item row="2" column="5">
         <widget class="QDoubleSpinBox" name="fusionThresSpin">
          <property name="decimals">
           <number>2</number>
@@@ -518,7 -518,7 +518,7 @@@
           <double>1.000000000000000</double>
          </property>
          <property name="value">
 -         <double>0.000000000000000</double>
 +         <double>1.000000000000000</double>
          </property>
         </widget>
        </item>
@@@ -567,14 -567,14 +567,14 @@@
          </item>
         </widget>
        </item>
-       <item row="4" column="0" colspan="2">
+       <item row="4" column="0">
         <widget class="QLabel" name="label_7">
          <property name="text">
           <string>Window :</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="2" colspan="2">
+       <item row="4" column="1" colspan="2">
         <widget class="QDoubleSpinBox" name="fusionWindowSpinBox">
          <property name="decimals">
           <number>4</number>
@@@ -593,14 -593,14 +593,14 @@@
          </property>
         </widget>
        </item>
-       <item row="4" column="4">
+       <item row="4" column="3">
         <widget class="QLabel" name="label_8">
          <property name="text">
           <string>Level :</string>
          </property>
         </widget>
        </item>
-       <item row="4" column="5" colspan="2">
+       <item row="4" column="4" colspan="2">
         <widget class="QDoubleSpinBox" name="fusionLevelSpinBox">
          <property name="decimals">
           <number>4</number>