Modify the dialog of Extrusion to place the scale parameter under the checkbox allowi...

3 new DlgRef were added.
The documentation is updated as well.

diff --git a/doc/salome/gui/GEOM/images/extrusion1.png b/doc/salome/gui/GEOM/images/extrusion1.png
index 6e702bfdc4fb247dfcefcc01720a2514d6d90308..1d3bc40daf45d70fa8596da53085739a79883aed 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/extrusion1.png and b/doc/salome/gui/GEOM/images/extrusion1.png differ

diff --git a/doc/salome/gui/GEOM/images/extrusion2.png b/doc/salome/gui/GEOM/images/extrusion2.png
index c4bd1c8b4124dbe90a5ac3860a03e0fc1a9be249..42b6d8ba5317655f883a49ecb6158d7f95a2b7b2 100755 (executable)
Binary files a/doc/salome/gui/GEOM/images/extrusion2.png and b/doc/salome/gui/GEOM/images/extrusion2.png differ

diff --git a/doc/salome/gui/GEOM/images/extrusion3.png b/doc/salome/gui/GEOM/images/extrusion3.png
index f0923b7945370afaa8a15c2273bf42fec3c6f2ce..47cd7226071422cc9a50cd21cb117391e53c062a 100644 (file)
Binary files a/doc/salome/gui/GEOM/images/extrusion3.png and b/doc/salome/gui/GEOM/images/extrusion3.png differ

diff --git a/src/DlgRef/DlgRef.cxx b/src/DlgRef/DlgRef.cxx
index 59b8831b16b8c5d97aa0c5da81bb1416e62dcfa6..a9aa9286b44fb2281648b82c1a489267dc4365c5 100644 (file)
--- a/src/DlgRef/DlgRef.cxx
+++ b/src/DlgRef/DlgRef.cxx
@@ -190,6 +190,20 @@ DlgRef_1Sel3Spin::~DlgRef_1Sel3Spin()
 {
 }
 
+//////////////////////////////////////////
+// DlgRef_1Sel3Spin2Check1Spin
+//////////////////////////////////////////
+
+DlgRef_1Sel3Spin2Check1Spin::DlgRef_1Sel3Spin2Check1Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel3Spin2Check1Spin::~DlgRef_1Sel3Spin2Check1Spin()
+{
+}
+
 //////////////////////////////////////////
 // DlgRef_1Sel3Spin1Check
 //////////////////////////////////////////
@@ -358,6 +372,20 @@ DlgRef_2Sel1Spin2Check::~DlgRef_2Sel1Spin2Check()
 {
 }
 
+//////////////////////////////////////////
+// DlgRef_2Sel1Spin3Check1Spin
+//////////////////////////////////////////
+
+DlgRef_2Sel1Spin3Check1Spin::DlgRef_2Sel1Spin3Check1Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_2Sel1Spin3Check1Spin::~DlgRef_2Sel1Spin3Check1Spin()
+{
+}
+
 //////////////////////////////////////////
 // DlgRef_2Sel1Spin
 //////////////////////////////////////////
@@ -668,6 +696,36 @@ void DlgRef_3Sel3Spin1Check::ShowRows( int fromRow, int toRow, bool toShow )
   }
 }
 
+//////////////////////////////////////////
+// DlgRef_3Sel2Check3Spin
+//////////////////////////////////////////
+
+DlgRef_3Sel2Check3Spin::DlgRef_3Sel2Check3Spin( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_3Sel2Check3Spin::~DlgRef_3Sel2Check3Spin()
+{
+}
+
+void DlgRef_3Sel2Check3Spin::ShowRows( int fromRow, int toRow, bool toShow )
+{
+  const int maxRows = 8;
+  
+  if ( toRow >= fromRow && fromRow >= 0 && toRow <= maxRows ) {
+    int c = gridLayout1->count();
+    for ( int i = 0; i < c; i++ ) {
+      QWidget* w = gridLayout1->itemAt( i )->widget();
+      int row, col, rowspan, colspan;
+      gridLayout1->getItemPosition( i, &row, &col, &rowspan, &colspan );
+      if ( w && row >= fromRow && row <= toRow )
+        w->setVisible( toShow );
+    }
+  }
+}
+
 //////////////////////////////////////////
 // DlgRef_3Sel3Spin2Check
 //////////////////////////////////////////

diff --git a/src/DlgRef/DlgRef.h b/src/DlgRef/DlgRef.h
index 0ff004f41eb35e23f8dc1e1addce5d268c2367d5..fc324f56b507fdeacfc6cd942439d73c7a246c44 100644 (file)
--- a/src/DlgRef/DlgRef.h
+++ b/src/DlgRef/DlgRef.h
@@ -227,6 +227,22 @@ public:
   ~DlgRef_1Sel3Spin();
 };
 
+//////////////////////////////////////////
+// DlgRef_1Sel3Spin2Check1Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel3Spin2Check1Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel3Spin2Check1Spin : public QWidget, 
+                                                  public Ui::DlgRef_1Sel3Spin2Check1Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel3Spin2Check1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel3Spin2Check1Spin();
+};
+
 //////////////////////////////////////////
 // DlgRef_1Sel3Spin1Check
 //////////////////////////////////////////
@@ -419,6 +435,22 @@ public:
   ~DlgRef_2Sel1Spin2Check();
 };
 
+//////////////////////////////////////////
+// DlgRef_2Sel1Spin3Check1Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_2Sel1Spin3Check1Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_2Sel1Spin3Check1Spin : public QWidget, 
+                                                  public Ui::DlgRef_2Sel1Spin3Check1Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_2Sel1Spin3Check1Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_2Sel1Spin3Check1Spin();
+};
+
 //////////////////////////////////////////
 // DlgRef_2Sel1Spin
 //////////////////////////////////////////
@@ -757,6 +789,24 @@ public:
   void ShowRows( int, int, bool = true );
 };
 
+//////////////////////////////////////////
+// DlgRef_3Sel2Check3Spin
+//////////////////////////////////////////
+
+#include "ui_DlgRef_3Sel2Check3Spin_QTD.h"
+
+class DLGREF_EXPORT DlgRef_3Sel2Check3Spin : public QWidget, 
+                                             public Ui::DlgRef_3Sel2Check3Spin_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_3Sel2Check3Spin( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_3Sel2Check3Spin();
+
+  void ShowRows( int, int, bool = true );
+};
+
 //////////////////////////////////////////
 // DlgRef_3Sel3Spin2Check
 //////////////////////////////////////////

diff --git a/src/DlgRef/DlgRef.pro b/src/DlgRef/DlgRef.pro
index cea85d4a78a93aa35577bc05e8f995a3e17ba3ec..b75774a0cf2af84bff75c989171cd86b3653764c 100644 (file)
--- a/src/DlgRef/DlgRef.pro
+++ b/src/DlgRef/DlgRef.pro
@@ -63,8 +63,10 @@ HEADERS += DlgRef_2Sel2Spin_QTD.h
 HEADERS += DlgRef_2Sel3Spin_QTD.h
 HEADERS += DlgRef_1Sel1Spin1Check_QTD.h
 HEADERS += DlgRef_1Sel3Spin1Check_QTD.h
+HEADERS += DlgRef_1Sel3Spin2Check1Spin_QTD.h
 HEADERS += DlgRef_1Sel4Spin2Check_QTD.h
 HEADERS += DlgRef_2Sel1Spin2Check_QTD.h
+HEADERS += DlgRef_2Sel1Spin3Check1Spin_QTD.h
 HEADERS += DlgRef_2Sel2Spin1Check_QTD.h
 HEADERS += DlgRef_2Sel2Spin3Check_QTD.h
 HEADERS += DlgRef_2Sel4Spin1Check_QTD.h
@@ -77,6 +79,7 @@ HEADERS += DlgRef_1Spin_QTD.h
 HEADERS += DlgRef_2Spin_QTD.h
 HEADERS += DlgRef_3Spin_QTD.h
 HEADERS += DlgRef_3Spin1Check_QTD.h
+HEADERS += DlgRef_3Spin2Check3Spin_QTD.h
 HEADERS += DlgRef_3Sel3Spin1Check_QTD.h
 HEADERS += DlgRef_4Sel1Spin2Check_QTD.h
 HEADERS += DlgRef_4Sel1Spin3Check_QTD.h
@@ -122,8 +125,10 @@ SOURCES += DlgRef_2Sel2Spin.cxx
 SOURCES += DlgRef_2Sel3Spin.cxx
 SOURCES += DlgRef_1Sel1Spin1Check.cxx
 SOURCES += DlgRef_1Sel3Spin1Check.cxx
+SOURCES += DlgRef_1Sel3Spin2Check1Spin.cxx
 SOURCES += DlgRef_1Sel4Spin2Check.cxx
 SOURCES += DlgRef_2Sel1Spin2Check.cxx
+SOURCES += DlgRef_2Sel1Spin3Check1Spin.cxx
 SOURCES += DlgRef_2Sel2Spin1Check.cxx
 SOURCES += DlgRef_2Sel2Spin3Check.cxx
 SOURCES += DlgRef_2Sel4Spin1Check.cxx
@@ -133,6 +138,7 @@ SOURCES += DlgRef_1Spin.cxx
 SOURCES += DlgRef_2Spin.cxx
 SOURCES += DlgRef_3Spin.cxx
 SOURCES += DlgRef_3Spin1Check.cxx
+SOURCES += DlgRef_3Spin2Check3Spin.cxx
 SOURCES += DlgRef_3Sel1Spin.cxx
 SOURCES += DlgRef_4Sel1Spin2Check.cxx
 

diff --git a/src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui b/src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui
new file mode 100644 (file)
index 0000000..0eeeedd
--- /dev/null
+++ b/src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgRef_1Sel3Spin2Check1Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel3Spin2Check1Spin_QTD">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>196</width>
+    <height>183</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QGridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>6</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="GroupBox1">
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="TextLabel1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QPushButton" name="PushButton1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLineEdit" name="LineEdit1"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="TextLabel2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="TextLabel3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY"/>
+      </item>
+      <item row="3" column="0">
+       <widget class="QLabel" name="TextLabel4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="3" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ"/>
+      </item>
+      <item row="4" column="0" colspan="3">
+       <widget class="QCheckBox" name="CheckBox1">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="3">
+       <widget class="QCheckBox" name="CheckBox2">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="TextLabel5">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_SC"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global">SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>SpinBox_DZ</tabstop>
+  <tabstop>SpinBox_SC</tabstop>
+  <tabstop>CheckBox1</tabstop>
+  <tabstop>CheckBox2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui
new file mode 100644 (file)
index 0000000..479e7bd
--- /dev/null
+++ b/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui
@@ -0,0 +1,182 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgRef_2Sel1Spin3Check1Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_2Sel1Spin3Check1Spin_QTD">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>196</width>
+    <height>181</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QGridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <property name="spacing">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="GroupBox1">
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="TextLabel1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QPushButton" name="PushButton1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLineEdit" name="LineEdit1"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="TextLabel2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="PushButton2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLineEdit" name="LineEdit2"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="TextLabel3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX"/>
+      </item>
+      <item row="3" column="0" colspan="3">
+       <widget class="QCheckBox" name="CheckBox1">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="3">
+       <widget class="QCheckBox" name="CheckBox2">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0" colspan="3">
+       <widget class="QCheckBox" name="CheckBox3">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="TextLabel4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global">SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>SpinBox_DX</tabstop>
+  <tabstop>SpinBox_DY</tabstop>
+  <tabstop>CheckBox1</tabstop>
+  <tabstop>CheckBox2</tabstop>
+  <tabstop>CheckBox3</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui b/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui
new file mode 100644 (file)
index 0000000..7d6b025
--- /dev/null
+++ b/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>DlgRef_3Sel2Check3Spin_QTD</class>
+ <widget class="QWidget" name="DlgRef_3Sel2Check3Spin_QTD">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>196</width>
+    <height>216</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string/>
+  </property>
+  <layout class="QGridLayout">
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="0" column="0">
+    <widget class="QGroupBox" name="GroupBox1">
+     <property name="title">
+      <string/>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <property name="spacing">
+       <number>6</number>
+      </property>
+      <item row="0" column="0">
+       <widget class="QLabel" name="TextLabel1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QPushButton" name="PushButton1">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLineEdit" name="LineEdit1"/>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="TextLabel2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL2</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1">
+       <widget class="QPushButton" name="PushButton2">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="2">
+       <widget class="QLineEdit" name="LineEdit2"/>
+      </item>
+      <item row="2" column="0">
+       <widget class="QLabel" name="TextLabel3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL3</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="1">
+       <widget class="QPushButton" name="PushButton3">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="2">
+       <widget class="QLineEdit" name="LineEdit3"/>
+      </item>
+      <item row="3" column="0" colspan="3">
+       <widget class="QCheckBox" name="CheckBox1">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="4" column="0" colspan="3">
+       <widget class="QCheckBox" name="CheckBox2">
+        <property name="text">
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="0">
+       <widget class="QLabel" name="TextLabel4">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL4</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="5" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox1"/>
+      </item>
+      <item row="6" column="0">
+       <widget class="QLabel" name="TextLabel5">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL5</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="6" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox2"/>
+      </item>
+      <item row="7" column="0">
+       <widget class="QLabel" name="TextLabel6">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text">
+         <string>TL6</string>
+        </property>
+        <property name="wordWrap">
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+      <item row="7" column="1" colspan="2">
+       <widget class="SalomeApp_DoubleSpinBox" name="SpinBox3"/>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SalomeApp_DoubleSpinBox</class>
+   <extends>QDoubleSpinBox</extends>
+   <header location="global">SalomeApp_DoubleSpinBox.h</header>
+  </customwidget>
+ </customwidgets>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>PushButton2</tabstop>
+  <tabstop>LineEdit2</tabstop>
+  <tabstop>PushButton3</tabstop>
+  <tabstop>LineEdit3</tabstop>
+  <tabstop>SpinBox1</tabstop>
+  <tabstop>SpinBox2</tabstop>
+  <tabstop>SpinBox3</tabstop>
+  <tabstop>CheckBox1</tabstop>
+  <tabstop>CheckBox2</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am
index 35118e4ec5d35f92996c64dec4f36c48e5614741..b66ba8cc206b7e02e37ce42562c28457982d34bc 100644 (file)
--- a/src/DlgRef/Makefile.am
+++ b/src/DlgRef/Makefile.am
@@ -49,6 +49,7 @@ UIC_FILES =                                   \
        ui_DlgRef_1Sel3Check_QTD.h              \
        ui_DlgRef_1Sel3Spin_QTD.h               \
        ui_DlgRef_1Sel3Spin1Check_QTD.h         \
+       ui_DlgRef_1Sel3Spin2Check1Spin_QTD.h    \
        ui_DlgRef_1Sel4Spin2Check_QTD.h         \
        ui_DlgRef_1Sel4Spin_QTD.h               \
        ui_DlgRef_1Sel5Spin1Check_QTD.h         \
@@ -60,6 +61,7 @@ UIC_FILES =                                   \
        ui_DlgRef_2Sel1List2Check_QTD.h         \
        ui_DlgRef_2Sel1List_QTD.h               \
        ui_DlgRef_2Sel1Spin2Check_QTD.h         \
+       ui_DlgRef_2Sel1Spin3Check1Spin_QTD.h    \
        ui_DlgRef_2Sel1Spin_QTD.h               \
        ui_DlgRef_2Sel1SpinInt_QTD.h            \
        ui_DlgRef_2Sel2List_QTD.h               \
@@ -78,6 +80,7 @@ UIC_FILES =                                   \
        ui_DlgRef_3Radio_QTD.h                  \
        ui_DlgRef_3Radio1Sel1Spin_QTD.h         \
        ui_DlgRef_3Sel1Check_QTD.h              \
+       ui_DlgRef_3Sel2Check3Spin_QTD.h         \
        ui_DlgRef_3Sel1Spin_QTD.h               \
        ui_DlgRef_3Sel2Spin_QTD.h               \
        ui_DlgRef_3Sel3Spin1Check_QTD.h         \

diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
index 04de1156fde1f6e9d00dbd6ed0f6bc3f204d665c..a2b0c5ec7da32f8250255340036ce5ee1cf95cf1 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.cxx
@@ -73,7 +73,7 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg (GeometryGUI* theGeometryGUI, QWi
 
   mainFrame()->RadioButton1->setChecked(true);
 
-  GroupVecH = new DlgRef_2Sel2Spin3Check(centralWidget());
+  GroupVecH = new DlgRef_2Sel1Spin3Check1Spin(centralWidget());
   GroupVecH->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV"));
   GroupVecH->TextLabel1->setText(tr("GEOM_BASE"));
   GroupVecH->TextLabel2->setText(tr("GEOM_VECTOR"));
@@ -87,7 +87,7 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg (GeometryGUI* theGeometryGUI, QWi
   GroupVecH->CheckBox2->setText(tr("GEOM_REVERSE"));
   GroupVecH->CheckBox3->setText(tr("GEOM_SCALE_PRISM"));
 
-  Group2Points = new DlgRef_3Sel3Spin2Check(centralWidget());
+  Group2Points = new DlgRef_3Sel2Check3Spin(centralWidget());
   Group2Points->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV_2P"));
   Group2Points->TextLabel1->setText(tr("GEOM_BASE"));
   Group2Points->TextLabel2->setText(tr("GEOM_POINT_I").arg(1));
@@ -99,7 +99,7 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg (GeometryGUI* theGeometryGUI, QWi
   Group2Points->CheckBox1->setText(tr("GEOM_BOTHWAY"));
   Group2Points->CheckBox2->setText(tr("GEOM_SCALE_PRISM"));
 
-  GroupDXDYDZ = new DlgRef_1Sel4Spin2Check(centralWidget());
+  GroupDXDYDZ = new DlgRef_1Sel3Spin2Check1Spin(centralWidget());
   GroupDXDYDZ->GroupBox1->setTitle(tr("GEOM_EXTRUSION_DXDYDZ"));
   GroupDXDYDZ->TextLabel1->setText(tr("GEOM_BASE"));
   GroupDXDYDZ->PushButton1->setIcon(image1);

diff --git a/src/GenerationGUI/GenerationGUI_PrismDlg.h b/src/GenerationGUI/GenerationGUI_PrismDlg.h
index 7ef737a1bcfdb16c46f2b556b744c6e657b29fc9..b8681127856a1b6236a6f3f7da18b5706fad3136 100644 (file)
--- a/src/GenerationGUI/GenerationGUI_PrismDlg.h
+++ b/src/GenerationGUI/GenerationGUI_PrismDlg.h
@@ -30,9 +30,9 @@
 #include "GEOMBase_Skeleton.h"
 #include "GEOM_GenericObjPtr.h"
 
-class DlgRef_2Sel2Spin3Check;
-class DlgRef_3Sel3Spin2Check;
-class DlgRef_1Sel4Spin2Check;
+class DlgRef_2Sel1Spin3Check1Spin;
+class DlgRef_3Sel2Check3Spin;
+class DlgRef_1Sel3Spin2Check1Spin;
 
 //=================================================================================
 // class    : GenerationGUI_PrismDlg
@@ -63,9 +63,9 @@ private:
   GEOM::GeomObjPtr                   myVec;  /* Vector, defining the direction */
   GEOM::GeomObjPtr                   myPoint1, myPoint2;   /* Points for extrusion */ 
   
-  DlgRef_2Sel2Spin3Check*            GroupVecH;
-  DlgRef_3Sel3Spin2Check*            Group2Points;
-  DlgRef_1Sel4Spin2Check*            GroupDXDYDZ;
+  DlgRef_2Sel1Spin3Check1Spin*       GroupVecH;
+  DlgRef_3Sel2Check3Spin*            Group2Points;
+  DlgRef_1Sel3Spin2Check1Spin*       GroupDXDYDZ;
   
 private slots:
   void                               ClickOnOk();