Remove obsoletes includes + update dialog boxes

 Modified Files:
  Tag: V7_3_BR
 	src/HEXABLOCKGUI/CMakeLists.txt
 	src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
 	src/HEXABLOCKGUI/MakeCylinder_QTD.ui
 	src/HEXABLOCKGUI/MakePipe_QTD.ui
 	src/HEXABLOCKGUI/ReplaceHexa_QTD.ui
 ----------------------------------------------------------------------

diff --git a/src/HEXABLOCKGUI/CMakeLists.txt b/src/HEXABLOCKGUI/CMakeLists.txt
index ac53afbc8e48a282a4f88aece49b9b5a602e04a0..af1c2926fb1191375f7be29572df1b1a57320013 100644 (file)
--- a/src/HEXABLOCKGUI/CMakeLists.txt
+++ b/src/HEXABLOCKGUI/CMakeLists.txt
@@ -74,7 +74,6 @@ SET(_moc_HEADERS
   HEXABLOCKGUI.hxx
   HEXABLOCKGUI_VtkDocumentGraphicView.hxx
   HEXABLOCKGUI_DocumentPanel.hxx
-  HEXABLOCKGUI_DocumentDelegate.hxx
   HEXABLOCKGUI_DocumentSelectionModel.hxx
   HEXABLOCKGUI_DocumentModel.hxx
   kmodelindexproxymapper.hxx
@@ -118,8 +117,6 @@ SET(_other_SOURCES
   HEXABLOCKGUI_DocumentSelectionModel.cxx
   HEXABLOCKGUI_DocumentItem.hxx
   HEXABLOCKGUI_DocumentItem.cxx
-  HEXABLOCKGUI_DocumentDelegate.hxx
-  HEXABLOCKGUI_DocumentDelegate.cxx
   HEXABLOCKGUI_DocumentPanel.hxx
   HEXABLOCKGUI_DocumentPanel.cxx
   HEXABLOCKGUI_SalomeTools.hxx

diff --git a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
index a57319c434b5b112edabde045a9fdc3b3331b616..4acadca255b45d673a82cfa78fdcce1c31060553 100755 (executable)
--- a/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
+++ b/src/HEXABLOCKGUI/HEXABLOCKGUI.cxx
@@ -108,12 +108,8 @@
 
 
 #include <Visual3d_ViewManager.hxx>
-#include <Graphic3d_Structure.hxx>
-#include <Graphic3d_Group.hxx>
 #include <V3d_PerspectiveView.hxx>
 #include <V3d_AmbientLight.hxx>
-#include <Graphic3d_GraphicDevice.hxx>
-#include <Graphic3d_Array1OfVertex.hxx>
 #include <V3d_DirectionalLight.hxx>
 #include <Xw_Window.hxx>
 #include <V3d_TypeOfShadingModel.hxx>
@@ -2916,12 +2912,12 @@ QStringList HEXABLOCKGUI::getQuickDirList()
 
 extern "C"
 {
-    HexaExport CAM_Module* createModule()
+    HEXABLOCK_EXPORT CAM_Module* createModule()
     {
         return new HEXABLOCKGUI();
     }
 
-    HexaExport char* getModuleVersion()
+    HEXABLOCK_EXPORT char* getModuleVersion()
     {
         return (char*)HEXABLOCK_VERSION_STR;
     }

diff --git a/src/HEXABLOCKGUI/MakeCylinder_QTD.ui b/src/HEXABLOCKGUI/MakeCylinder_QTD.ui
index 00fb8e13c9308b8e0dea612db5b46766743e5998..9df00a2f1e701270bdadcd5e3b485fa635496c04 100644 (file)
--- a/src/HEXABLOCKGUI/MakeCylinder_QTD.ui
+++ b/src/HEXABLOCKGUI/MakeCylinder_QTD.ui
@@ -102,8 +102,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>354</width>
-        <height>638</height>
+        <width>348</width>
+        <height>619</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_3">
@@ -224,7 +224,7 @@
              <double>10.000000000000000</double>
             </property>
             <property name="value">
-             <double>90.000000000000000</double>
+             <double>360.000000000000000</double>
             </property>
            </widget>
           </item>

diff --git a/src/HEXABLOCKGUI/MakePipe_QTD.ui b/src/HEXABLOCKGUI/MakePipe_QTD.ui
index c3ecb3fb506a749998ca273dc59fe1ed1fd3ab2e..4f4c43fdbdfa0f2c7ba8d0622ad2743dad907236 100644 (file)
--- a/src/HEXABLOCKGUI/MakePipe_QTD.ui
+++ b/src/HEXABLOCKGUI/MakePipe_QTD.ui
@@ -102,8 +102,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>337</width>
-        <height>638</height>
+        <width>331</width>
+        <height>619</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -221,7 +221,7 @@
              <double>10.000000000000000</double>
             </property>
             <property name="value">
-             <double>90.000000000000000</double>
+             <double>360.000000000000000</double>
             </property>
            </widget>
           </item>

diff --git a/src/HEXABLOCKGUI/ReplaceHexa_QTD.ui b/src/HEXABLOCKGUI/ReplaceHexa_QTD.ui
index e387f00a839c12afa8e98be5783f175188b9db30..451e65785ac823a93d4a86a5782bfeab823242a4 100644 (file)
--- a/src/HEXABLOCKGUI/ReplaceHexa_QTD.ui
+++ b/src/HEXABLOCKGUI/ReplaceHexa_QTD.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>287</width>
-    <height>500</height>
+    <width>285</width>
+    <height>669</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -20,6 +20,47 @@
    <string>Replace Hexahedron</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
+   <item>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <item>
+       <widget class="QRadioButton" name="radioButton">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Hexa</string>
+        </property>
+       </widget>
+      </item>
+      <item>
+       <widget class="QRadioButton" name="radioButton_2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>Hexas</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
    <item>
     <widget class="QScrollArea" name="scrollArea">
      <property name="sizePolicy">
@@ -36,8 +77,8 @@
        <rect>
         <x>0</x>
         <y>0</y>
-        <width>267</width>
-        <height>480</height>
+        <width>265</width>
+        <height>585</height>
        </rect>
       </property>
       <layout class="QVBoxLayout" name="verticalLayout_4">
@@ -174,85 +215,113 @@
           </sizepolicy>
          </property>
          <property name="title">
-          <string>Quad destination</string>
+          <string>Quad(s) destination</string>
          </property>
-         <layout class="QFormLayout" name="formLayout_3">
-          <item row="0" column="0">
-           <widget class="QLabel" name="label">
-            <property name="text">
-             <string>Point a</string>
-            </property>
-           </widget>
-          </item>
-          <item row="0" column="1">
-           <widget class="QLineEdit" name="c1_le">
+         <layout class="QVBoxLayout" name="verticalLayout_5">
+          <item>
+           <widget class="QListWidget" name="quads_lw_2">
             <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+             <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
               <horstretch>0</horstretch>
               <verstretch>0</verstretch>
              </sizepolicy>
             </property>
-            <property name="toolTip">
-             <string>Select vertex</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="readOnly">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QLabel" name="label_2">
-            <property name="text">
-             <string>Point b</string>
-            </property>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QLineEdit" name="c2_le">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
+            <property name="maximumSize">
+             <size>
+              <width>16777215</width>
+              <height>16777215</height>
+             </size>
             </property>
             <property name="toolTip">
-             <string>Select vertex</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="readOnly">
-             <bool>false</bool>
-            </property>
-           </widget>
-          </item>
-          <item row="2" column="0">
-           <widget class="QLabel" name="label_3">
-            <property name="text">
-             <string>Point c</string>
+             <string>Select hexa</string>
             </property>
            </widget>
           </item>
-          <item row="2" column="1">
-           <widget class="QLineEdit" name="c3_le">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="toolTip">
-             <string>Select vertex</string>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="readOnly">
-             <bool>false</bool>
-            </property>
+          <item>
+           <widget class="QWidget" name="widget_3" native="true">
+            <layout class="QFormLayout" name="formLayout">
+             <property name="fieldGrowthPolicy">
+              <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+             </property>
+             <item row="1" column="0">
+              <widget class="QLabel" name="label">
+               <property name="text">
+                <string>Point a</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QLineEdit" name="c1_le">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="toolTip">
+                <string>Select vertex</string>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+               <property name="readOnly">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QLabel" name="label_2">
+               <property name="text">
+                <string>Point b</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QLineEdit" name="c2_le">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="toolTip">
+                <string>Select vertex</string>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+               <property name="readOnly">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QLabel" name="label_3">
+               <property name="text">
+                <string>Point c</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="1">
+              <widget class="QLineEdit" name="c3_le">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="toolTip">
+                <string>Select vertex</string>
+               </property>
+               <property name="text">
+                <string/>
+               </property>
+               <property name="readOnly">
+                <bool>false</bool>
+               </property>
+              </widget>
+             </item>
+            </layout>
            </widget>
           </item>
          </layout>
@@ -269,10 +338,40 @@
   <tabstop>p1_le</tabstop>
   <tabstop>p2_le</tabstop>
   <tabstop>p3_le</tabstop>
-  <tabstop>c1_le</tabstop>
-  <tabstop>c2_le</tabstop>
-  <tabstop>c3_le</tabstop>
  </tabstops>
  <resources/>
- <connections/>
+ <connections>
+  <connection>
+   <sender>radioButton</sender>
+   <signal>clicked()</signal>
+   <receiver>quads_lw_2</receiver>
+   <slot>hide()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>109</x>
+     <y>44</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>146</x>
+     <y>453</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>radioButton_2</sender>
+   <signal>clicked()</signal>
+   <receiver>quads_lw_2</receiver>
+   <slot>show()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>232</x>
+     <y>44</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>146</x>
+     <y>453</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
 </ui>