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

[clitk.git] / vv / qt_ui / vvOverlayPanel.ui

diff --git a/vv/qt_ui/vvOverlayPanel.ui b/vv/qt_ui/vvOverlayPanel.ui
index b26dc0c8f7b536bf8f580d5b2539ac2c4da3daf2..60a6803859eb98011b98a10c9cd2961e5c7ac997 100644 (file)
--- a/vv/qt_ui/vvOverlayPanel.ui
+++ b/vv/qt_ui/vvOverlayPanel.ui
@@ -53,90 +53,142 @@ p, li { white-space: pre-wrap; }
      <property name="frameShadow">
       <enum>QFrame::Raised</enum>
      </property>
-     <layout class="QGridLayout">
-      <property name="margin">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
+      <property name="spacing">
        <number>2</number>
       </property>
-      <property name="spacing">
+      <property name="margin">
        <number>2</number>
       </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label_4">
-        <property name="maximumSize">
-         <size>
-          <width>24</width>
-          <height>24</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="../vvIcons.qrc">:/common/icons/cursor-uparrow.png</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1" colspan="4">
-       <widget class="QLabel" name="vectorFieldNameLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
-        <property name="text">
-         <string>Deformation field :</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="0" colspan="2">
-       <widget class="QLabel" name="label_2">
-        <property name="text">
-         <string>Subsampling : </string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="2">
-       <widget class="QSpinBox" name="subSamplingSpinBox">
-        <property name="minimum">
-         <number>1</number>
-        </property>
-        <property name="value">
-         <number>5</number>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_2">
+        <item>
+         <widget class="QLabel" name="label_4">
+          <property name="maximumSize">
+           <size>
+            <width>24</width>
+            <height>24</height>
+           </size>
+          </property>
+          <property name="text">
+           <string/>
+          </property>
+          <property name="pixmap">
+           <pixmap resource="../vvIcons.qrc">:/common/icons/cursor-uparrow.png</pixmap>
+          </property>
+          <property name="scaledContents">
+           <bool>true</bool>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="vectorFieldNameLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>Deformation field :</string>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="1" column="3">
-       <widget class="QLabel" name="label_3">
-        <property name="text">
-         <string> Scale : </string>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <item>
+         <widget class="QLabel" name="label_2">
+          <property name="text">
+           <string>&lt;b&gt;Subsampling : &lt;/b&gt;</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="subSamplingSpinBox">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>5</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_3">
+          <property name="text">
+           <string>&lt;b&gt; Scale : &lt;/b&gt;</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="scaleSpinBox">
+          <property name="value">
+           <number>1</number>
+          </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="1" column="4">
-       <widget class="QSpinBox" name="scaleSpinBox">
-        <property name="value">
-         <number>1</number>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_3">
+        <item>
+         <widget class="QLabel" name="coordinatesLabel">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text">
+           <string>&lt;b&gt;Displacement :&lt;/b&gt;</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QLabel" name="label_9">
+          <property name="text">
+           <string>&lt;b&gt;Width : &lt;/b&gt;</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QSpinBox" name="vfWidthSpinBox">
+          <property name="minimum">
+           <number>1</number>
+          </property>
+          <property name="maximum">
+           <number>10</number>
+          </property>
+          <property name="singleStep">
+           <number>1</number>
+          </property>
+          <property name="value">
+           <number>1</number>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QToolButton" name="vfColorButton">
+           <property name="styleSheet">
+            <string>
+              background-color: rgb(0, 255, 0);
+              border: 0px;
+            </string>
+           </property>
+         </widget>
+        </item>
+       </layout>
       </item>
-      <item row="3" column="0" colspan="5">
-       <widget class="QLabel" name="coordinatesLabel">
-        <property name="sizePolicy">
-         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-          <horstretch>0</horstretch>
-          <verstretch>0</verstretch>
-         </sizepolicy>
-        </property>
+      <item>
+       <widget class="QCheckBox" name="lutCheckBox">
         <property name="text">
-         <string>Displacement :</string>
+         <string>Use Logarithm LUT</string>
         </property>
        </widget>
       </item>
-      <item row="4" column="0" colspan="5">
+      <item>
        <widget class="QLabel" name="normLabel">
         <property name="sizePolicy">
          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -149,13 +201,6 @@ p, li { white-space: pre-wrap; }
         </property>
        </widget>
       </item>
-      <item row="2" column="0" colspan="5">
-       <widget class="QCheckBox" name="lutCheckBox">
-        <property name="text">
-         <string>Use Logarithm LUT</string>
-        </property>
-       </widget>
-      </item>
      </layout>
     </widget>
    </item>
@@ -225,7 +270,7 @@ p, li { white-space: pre-wrap; }
       <item row="1" column="2">
        <widget class="QSlider" name="colorHorizontalSlider">
         <property name="maximum">
-         <number>180</number>
+         <number>359</number>
         </property>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -391,7 +436,7 @@ p, li { white-space: pre-wrap; }
       <item row="3" column="2">
        <widget class="QDoubleSpinBox" name="windowSpinBox">
         <property name="decimals">
-         <number>1</number>
+         <number>4</number>
         </property>
         <property name="minimum">
          <double>-999999.000000000000000</double>
@@ -417,7 +462,7 @@ p, li { white-space: pre-wrap; }
       <item row="3" column="4">
        <widget class="QDoubleSpinBox" name="levelSpinBox">
         <property name="decimals">
-         <number>1</number>
+         <number>4</number>
         </property>
         <property name="minimum">
          <double>-999999.000000000000000</double>
@@ -467,6 +512,7 @@ p, li { white-space: pre-wrap; }
  <resources>
   <include location="../vvIcons.qrc"/>
   <include location="../vvIcons.qrc"/>
+  <include location="vvIcons.qrc"/>
  </resources>
  <connections/>
 </ui>