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

diff --git a/common/clitkCommon.cxx b/common/clitkCommon.cxx
index 785b0fd2c021ad087dd500a68ba0d03a60481b65..10f608e6ce8b7ba7c92d6085f4d1b1588a047e3d 100644 (file)
--- a/common/clitkCommon.cxx
+++ b/common/clitkCommon.cxx
@@ -243,7 +243,7 @@ double clitk::ComputeEuclideanDistanceFromPointToPlane(const itk::ContinuousInde
 // Open a file for reading
 void clitk::openFileForReading(std::ifstream & is, const std::string & filename)
 {
-  is.open(filename.c_str(), std::ios::in);
+  is.open(filename.c_str(), std::ios::in | std::ios::binary);
   if ( is.fail() ) {
     clitkExceptionMacro("Could not open file for reading: " 
                         << filename << ". Error is : <" 

diff --git a/common/clitkDD.h b/common/clitkDD.h
index f43db9d005d9ef9d98f4b6ca4dc66bb5713b8b66..c21bb815acbc080e97f3adfd9b844c934209292e 100644 (file)
--- a/common/clitkDD.h
+++ b/common/clitkDD.h
@@ -29,6 +29,7 @@
     std::ostringstream ossDD; \
     ossDD << #a " = [ " << a << " ]" << std::endl; \
     OutputDebugString(ossDD.str().c_str()); \
+    std::cout << ossDD.str() << std::endl; \
   }
 #else
 # define DD(a) std::cout << #a " = [ " << a << " ]" << std::endl;std::cout.flush();

diff --git a/vv/qt_ui/vvOverlayPanel.ui b/vv/qt_ui/vvOverlayPanel.ui
index ef00277a607422d80eada75b340040ef3b86c5ed..1a6e5b81398e9671e854aaa1c33367027c48c0c0 100644 (file)
--- a/vv/qt_ui/vvOverlayPanel.ui
+++ b/vv/qt_ui/vvOverlayPanel.ui
@@ -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 @@ p, li { white-space: pre-wrap; }
         </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 @@ p, li { white-space: pre-wrap; }
         </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 @@ p, li { white-space: pre-wrap; }
         </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 @@ p, li { white-space: pre-wrap; }
         </property>
        </widget>
       </item>
-      <item row="2" column="6">
+      <item row="2" column="5">
        <widget class="QDoubleSpinBox" name="fusionThresSpin">
         <property name="decimals">
          <number>2</number>
@@ -567,14 +567,14 @@ p, li { white-space: pre-wrap; }
         </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 @@ p, li { white-space: pre-wrap; }
         </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>