X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=vv%2Fqt_ui%2FvvMainWindow.ui;h=09050ba7c80129842382b70491a77aaf95effa38;hb=c99626f17e07dbde440eb40a25683ce441a49a6e;hp=88eddcf87d9aef92a1a510ef23c8ece1fdf94e24;hpb=acdc20ec4afc95db1db29bf8d885a3b72c9c7ee0;p=clitk.git

diff --git a/vv/qt_ui/vvMainWindow.ui b/vv/qt_ui/vvMainWindow.ui
index 88eddcf..09050ba 100644
--- a/vv/qt_ui/vvMainWindow.ui
+++ b/vv/qt_ui/vvMainWindow.ui
@@ -39,8 +39,8 @@
    <property name="statusTip">
     <string>Type 'F1' on image to display help on navigation</string>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout">
-    <item>
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
      <widget class="QFrame" name="frame">
       <property name="sizePolicy">
        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
@@ -67,19 +67,6 @@
        <property name="spacing">
         <number>2</number>
        </property>
-       <item row="0" column="17">
-        <spacer>
-         <property name="orientation">
-          <enum>Qt::Horizontal</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>40</width>
-           <height>20</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item row="0" column="0">
         <widget class="QPushButton" name="goToCursorPushButton">
          <property name="sizePolicy">
@@ -159,7 +146,7 @@
        <item row="0" column="8">
         <widget class="QDoubleSpinBox" name="windowSpinBox">
          <property name="decimals">
-          <number>3</number>
+          <number>6</number>
          </property>
          <property name="minimum">
           <double>-66000.000000000000000</double>
@@ -208,7 +195,7 @@
        <item row="0" column="11">
         <widget class="QDoubleSpinBox" name="levelSpinBox">
          <property name="decimals">
-          <number>3</number>
+          <number>6</number>
          </property>
          <property name="minimum">
           <double>-66000.000000000000000</double>
@@ -267,6 +254,11 @@
            <string>Bones</string>
           </property>
          </item>
+         <item>
+          <property name="text">
+           <string>Head/Brain</string>
+          </property>
+         </item>
          <item>
           <property name="text">
            <string>[0,1] Scale</string>
@@ -330,7 +322,7 @@
          </item>
         </widget>
        </item>
-       <item row="0" column="19">
+       <item row="0" column="21">
         <widget class="QPushButton" name="viewButton">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -356,13 +348,6 @@
          </property>
         </widget>
        </item>
-       <item row="0" column="18">
-        <widget class="Line" name="line_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-        </widget>
-       </item>
        <item row="0" column="4">
         <widget class="QSpinBox" name="frameRateSpinBox">
          <property name="minimum">
@@ -402,10 +387,44 @@
          </property>
         </widget>
        </item>
+       <item row="0" column="19">
+        <widget class="QComboBox" name="slicingPresetComboBox">
+         <item>
+          <property name="text">
+           <string>World</string>
+          </property>
+         </item>
+         <item>
+          <property name="text">
+           <string>Voxels</string>
+          </property>
+         </item>
+        </widget>
+       </item>
+       <item row="0" column="18">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Slice to</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="17">
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </widget>
     </item>
-    <item>
+    <item row="1" column="0">
      <widget class="QSplitter" name="splitter_4">
       <property name="orientation">
        <enum>Qt::Horizontal</enum>
@@ -526,6 +545,12 @@
           </item>
          </layout>
         </widget>
+        <widget class="QWidget" name="ROItab">
+         <attribute name="title">
+          <string>ROI</string>
+         </attribute>
+         <layout class="QGridLayout" name="gridLayout_2"/>
+        </widget>
         <widget class="QWidget" name="LinkTab">
          <property name="sizePolicy">
           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -626,7 +651,7 @@
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QVTKWidget" name="NOViewWidget">
+           <widget class="QVTKOpenGLNativeWidget" name="NOViewWidget" native="true">
             <property name="mouseTracking">
              <bool>true</bool>
             </property>
@@ -666,7 +691,7 @@
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QVTKWidget" name="SOViewWidget">
+           <widget class="QVTKOpenGLNativeWidget" name="SOViewWidget" native="true">
             <property name="mouseTracking">
              <bool>true</bool>
             </property>
@@ -708,7 +733,7 @@
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QVTKWidget" name="NEViewWidget">
+           <widget class="QVTKOpenGLNativeWidget" name="NEViewWidget" native="true">
             <property name="mouseTracking">
              <bool>true</bool>
             </property>
@@ -745,7 +770,7 @@
            <number>2</number>
           </property>
           <item row="0" column="0">
-           <widget class="QVTKWidget" name="SEViewWidget">
+           <widget class="QVTKOpenGLNativeWidget" name="SEViewWidget" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
               <horstretch>0</horstretch>
@@ -785,7 +810,7 @@
      <x>0</x>
      <y>0</y>
      <width>1008</width>
-     <height>19</height>
+     <height>27</height>
     </rect>
    </property>
    <property name="defaultUp">
@@ -804,7 +829,9 @@
      <string>Overlay</string>
     </property>
     <addaction name="actionAdd_VF_to_current_Image"/>
+    <addaction name="actionAdd_overlay_image_to_current_image"/>
     <addaction name="actionAdd_fusion_image"/>
+    <addaction name="actionAdd_USSequence_toCT"/>
    </widget>
    <widget class="QMenu" name="menuScreenshots">
     <property name="title">
@@ -844,14 +871,17 @@
     <addaction name="actionOpen_Multiple_Images_As_One"/>
     <addaction name="separator"/>
     <addaction name="actionOpen_Dicom"/>
-    <addaction name="actionOpen_Dicom_Struct"/>
     <addaction name="actionOpen_VTK_contour"/>
+    <addaction name="actionConnect_Pacs"/>
     <addaction name="separator"/>
     <addaction name="actionSave_As"/>
     <addaction name="separator"/>
-    <addaction name="actionExit"/>
-    <addaction name="actionSave_current_state"/>
     <addaction name="actionRead_saved_state"/>
+    <addaction name="actionSave_current_state"/>
+    <addaction name="separator"/>
+    <addaction name="actionExit"/>
+    <addaction name="separator"/>
+    <addaction name="separator"/>
    </widget>
    <addaction name="menuFile"/>
    <addaction name="menuOverlay"/>
@@ -869,6 +899,12 @@
    <property name="text">
     <string>Open image(s)</string>
    </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionClose_image">
    <property name="text">
@@ -883,6 +919,9 @@
    <property name="text">
     <string>Exit</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionSave_screenshot">
    <property name="text">
@@ -918,6 +957,9 @@
    <property name="text">
     <string>About</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionReload_images">
    <property name="text">
@@ -932,6 +974,9 @@
    <property name="text">
     <string>Open Dicom</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionOpen_Multiple_Images_As_One">
    <property name="icon">
@@ -941,6 +986,9 @@
    <property name="text">
     <string>Merge several nD images into a single (n+1)D image</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionSlice_Image_As_Multiple_Images">
    <property name="icon">
@@ -950,6 +998,9 @@
    <property name="text">
     <string>Slice a nD image into several (n-1)D images</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionOpen_one_Image_as_Multiple">
    <property name="text">
@@ -967,6 +1018,9 @@
    <property name="shortcut">
     <string>Ctrl+S</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionAdd_VF_to_current_Image">
    <property name="icon">
@@ -976,6 +1030,9 @@
    <property name="text">
     <string>Add deformation field to current image</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionNorth_West_Window">
    <property name="icon">
@@ -985,6 +1042,9 @@
    <property name="text">
     <string>Save image in TL</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionNorth_East_Window">
    <property name="icon">
@@ -994,6 +1054,9 @@
    <property name="text">
     <string>Save image in TR</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionSouth_West_Window">
    <property name="icon">
@@ -1003,6 +1066,9 @@
    <property name="text">
     <string>Save image in BL</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionSouth_East_Window">
    <property name="icon">
@@ -1012,6 +1078,9 @@
    <property name="text">
     <string>Save image in BR</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionOpen_Image_With_Time">
    <property name="icon">
@@ -1021,6 +1090,9 @@
    <property name="text">
     <string>Open a nD image as a (n-1)D + t image</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionMerge_images_as_n_dim_t">
    <property name="icon">
@@ -1030,6 +1102,9 @@
    <property name="text">
     <string>Open several nD images into a single nD+t image</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionAdd_fusion_image">
    <property name="icon">
@@ -1039,11 +1114,17 @@
    <property name="text">
     <string>Add fusion image to current image</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionSegmentation">
    <property name="text">
     <string>Segmentation</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionResampler">
    <property name="text">
@@ -1054,6 +1135,9 @@
    <property name="text">
     <string>Surface Viewer</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionDebug">
    <property name="text">
@@ -1064,11 +1148,17 @@
    <property name="text">
     <string>Deformable Registration</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionWarp_image_with_vector_field">
    <property name="text">
     <string>Verify Registration</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionMaximum_Intensity_Projection">
    <property name="text">
@@ -1083,13 +1173,19 @@
    <property name="text">
     <string>Open VTK or OBJ contour</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionNavigation_Help">
    <property name="text">
     <string>Navigation Help</string>
    </property>
-   <property name="shortcut">
-    <string>F1</string>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
+   <property name="priority">
+    <enum>QAction::NormalPriority</enum>
    </property>
   </action>
   <action name="actionOpen_Dicom_Struct">
@@ -1100,11 +1196,17 @@
    <property name="text">
     <string>Open Dicom-Struct</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionCompute_mid_position_image">
    <property name="text">
     <string>Compute mid-position image</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionExperimental">
    <property name="text">
@@ -1115,6 +1217,9 @@
    <property name="text">
     <string>Register vv</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionSave_all_slices">
    <property name="text">
@@ -1123,8 +1228,8 @@
   </action>
   <action name="actionSave_current_state">
    <property name="icon">
-    <iconset>
-     <normaloff>../icons/filesave.png</normaloff>../icons/filesave.png</iconset>
+    <iconset resource="../vvIcons.qrc">
+     <normaloff>:/common/icons/filesave.png</normaloff>:/common/icons/filesave.png</iconset>
    </property>
    <property name="text">
     <string>Save current state</string>
@@ -1132,22 +1237,57 @@
    <property name="toolTip">
     <string>Save current window and file states</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
   </action>
   <action name="actionRead_saved_state">
    <property name="icon">
-    <iconset>
-     <normaloff>../icons/filesave.png</normaloff>../icons/filesave.png</iconset>
+    <iconset resource="../vvIcons.qrc">
+     <normaloff>:/common/icons/open.png</normaloff>:/common/icons/open.png</iconset>
    </property>
    <property name="text">
     <string>Read Saved State</string>
    </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
+  </action>
+  <action name="actionAdd_overlay_image_to_current_image">
+   <property name="icon">
+    <iconset resource="../vvIcons.qrc">
+     <normaloff>:/common/icons/GPSup.png</normaloff>:/common/icons/GPSup.png</iconset>
+   </property>
+   <property name="text">
+    <string>Add overlay image to current image</string>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
+  </action>
+  <action name="actionAdd_USSequence_toCT">
+   <property name="icon">
+    <iconset resource="../vvIcons.qrc">
+     <normaloff>:/common/icons/rotateright.png</normaloff>:/common/icons/rotateright.png</iconset>
+   </property>
+   <property name="text">
+    <string>Test / Fusion of US &amp; CT sequences</string>
+   </property>
+   <property name="iconVisibleInMenu">
+    <bool>true</bool>
+   </property>
+  </action>
+  <action name="actionConnect_Pacs">
+   <property name="text">
+    <string>Connect Pacs</string>
+   </property>
   </action>
  </widget>
  <customwidgets>
   <customwidget>
-   <class>QVTKWidget</class>
+   <class>QVTKOpenGLNativeWidget</class>
    <extends>QWidget</extends>
-   <header>QVTKWidget.h</header>
+   <header>QVTKOpenGLNativeWidget.h</header>
   </customwidget>
   <customwidget>
    <class>vvInfoPanel</class>