*** empty log message ***

diff --git a/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
new file mode 100644 (file)
index 0000000..5223698
--- /dev/null
+++ b/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui
@@ -0,0 +1,139 @@
+<ui version="4.0" >
+ <class>DlgRef_1Sel2Spin1View1Check_QTD</class>
+ <widget class="QWidget" name="DlgRef_1Sel2Spin1View1Check_QTD" >
+  <property name="geometry" >
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>176</width>
+    <height>220</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" >
+      <property name="margin" >
+       <number>9</number>
+      </property>
+      <property name="spacing" >
+       <number>6</number>
+      </property>
+      <item row="3" column="0" colspan="3" >
+       <widget class="QTextBrowser" name="TextBrowser1" />
+      </item>
+      <item row="2" column="2" >
+       <widget class="QSpinBox" name="SpinBox2" />
+      </item>
+      <item row="1" column="2" >
+       <widget class="QSpinBox" name="SpinBox1" />
+      </item>
+      <item row="4" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckBox1" >
+        <property name="text" >
+         <string>Check</string>
+        </property>
+       </widget>
+      </item>
+      <item row="2" column="0" >
+       <widget class="QLabel" name="TextLabel3" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <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="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <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="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="0" column="1" >
+       <widget class="QPushButton" name="PushButton1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string/>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="text" >
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <layoutdefault spacing="6" margin="11" />
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <tabstops>
+  <tabstop>PushButton1</tabstop>
+  <tabstop>LineEdit1</tabstop>
+  <tabstop>SpinBox1</tabstop>
+  <tabstop>SpinBox2</tabstop>
+  <tabstop>TextBrowser1</tabstop>
+  <tabstop>CheckBox1</tabstop>
+ </tabstops>
+ <resources/>
+ <connections/>
+</ui>

diff --git a/src/DlgRef/GEOM_DlgRef.cxx b/src/DlgRef/GEOM_DlgRef.cxx
index c67cdee2a9ed968798583ba06ce3a748065a135a..b612d00f83052c769288c20afb6517bf108ae234 100644 (file)
--- a/src/DlgRef/GEOM_DlgRef.cxx
+++ b/src/DlgRef/GEOM_DlgRef.cxx
@@ -121,6 +121,20 @@ DlgRef_1Sel1Spin::~DlgRef_1Sel1Spin()
 {
 }
 
+//////////////////////////////////////////
+// DlgRef_1Sel2Spin1View1Check
+//////////////////////////////////////////
+
+DlgRef_1Sel2Spin1View1Check::DlgRef_1Sel2Spin1View1Check( QWidget* parent, Qt::WindowFlags f )
+: QWidget( parent, f )
+{
+  setupUi( this );
+}
+
+DlgRef_1Sel2Spin1View1Check::~DlgRef_1Sel2Spin1View1Check()
+{
+}
+
 //////////////////////////////////////////
 // DlgRef_1Sel2Spin
 //////////////////////////////////////////

diff --git a/src/DlgRef/GEOM_DlgRef.h b/src/DlgRef/GEOM_DlgRef.h
index 71e797a06f35c51740b9ffb40c77bc0eab75853e..e282a3dbb10786346281b1851c571f11d6350104 100644 (file)
--- a/src/DlgRef/GEOM_DlgRef.h
+++ b/src/DlgRef/GEOM_DlgRef.h
@@ -146,6 +146,22 @@ public:
   ~DlgRef_1Sel1Spin();
 };
 
+//////////////////////////////////////////
+// DlgRef_1Sel2Spin1View1Check
+//////////////////////////////////////////
+
+#include "ui_DlgRef_1Sel2Spin1View1Check_QTD.h"
+
+class DLGREF_EXPORT DlgRef_1Sel2Spin1View1Check : public QWidget, 
+                                                  public Ui::DlgRef_1Sel2Spin1View1Check_QTD
+{
+  Q_OBJECT
+
+public:
+  DlgRef_1Sel2Spin1View1Check( QWidget* = 0, Qt::WindowFlags = 0 );
+  ~DlgRef_1Sel2Spin1View1Check();
+};
+
 //////////////////////////////////////////
 // DlgRef_1Sel2Spin
 //////////////////////////////////////////

diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am
index ae699d94f908bb76e7a8602ac4b4c0b0a593b1e8..c561a9172d4625c5d7c60741340f0514cac38bbb 100644 (file)
--- a/src/DlgRef/Makefile.am
+++ b/src/DlgRef/Makefile.am
@@ -38,43 +38,44 @@ MOC_FILES = \
        GEOM_DlgRef_moc.cxx
 
 UIC_FILES = \
-       ui_DlgRef_1List1Spin1Btn_QTD.h  \
-       ui_DlgRef_1Sel1Check1List_QTD.h \
-       ui_DlgRef_1Sel1Check1Sel_QTD.h  \
-       ui_DlgRef_1Sel1Check_QTD.h      \
-       ui_DlgRef_1Sel1List4Btn_QTD.h   \
-       ui_DlgRef_1Sel1Spin1Check_QTD.h \
-       ui_DlgRef_1Sel1Spin_QTD.h       \
-       ui_DlgRef_1Sel2Spin_QTD.h       \
-       ui_DlgRef_1Sel3Check_QTD.h      \
-       ui_DlgRef_1Sel3Spin_QTD.h       \
-       ui_DlgRef_1Sel4Spin_QTD.h       \
-       ui_DlgRef_1Sel5Spin_QTD.h       \
-       ui_DlgRef_1Sel_QTD.h            \
-       ui_DlgRef_1SelExt_QTD.h         \
-       ui_DlgRef_1Spin_QTD.h           \
-       ui_DlgRef_2Sel1List_QTD.h       \
-       ui_DlgRef_2Sel1Spin2Check_QTD.h \
-       ui_DlgRef_2Sel1Spin_QTD.h       \
-       ui_DlgRef_2Sel2Spin1Check_QTD.h \
-       ui_DlgRef_2Sel2Spin_QTD.h       \
-       ui_DlgRef_2Sel3Spin_QTD.h       \
-       ui_DlgRef_2Sel4Spin1Check_QTD.h \
-       ui_DlgRef_2Sel_QTD.h            \
-       ui_DlgRef_2SelExt_QTD.h         \
-       ui_DlgRef_2Spin_QTD.h           \
-       ui_DlgRef_3Check_QTD.h          \
-       ui_DlgRef_3Sel1Check_QTD.h      \
-       ui_DlgRef_3Sel1Spin_QTD.h       \
-       ui_DlgRef_3Sel3Spin1Check_QTD.h \
-       ui_DlgRef_3Sel4Spin2Check_QTD.h \
-       ui_DlgRef_3Sel_QTD.h            \
-       ui_DlgRef_3Spin1Check_QTD.h     \
-       ui_DlgRef_3Spin_QTD.h           \
-       ui_DlgRef_4Sel1List1Check_QTD.h \
-       ui_DlgRef_4Sel1List_QTD.h       \
-       ui_DlgRef_4Sel1Spin2Check_QTD.h \
-       ui_DlgRef_6Sel_QTD.h            \
+       ui_DlgRef_1List1Spin1Btn_QTD.h          \
+       ui_DlgRef_1Sel1Check1List_QTD.h         \
+       ui_DlgRef_1Sel1Check1Sel_QTD.h          \
+       ui_DlgRef_1Sel1Check_QTD.h              \
+       ui_DlgRef_1Sel1List4Btn_QTD.h           \
+       ui_DlgRef_1Sel1Spin1Check_QTD.h         \
+       ui_DlgRef_1Sel1Spin_QTD.h               \
+       ui_DlgRef_1Sel2Spin1View1Check_QTD.h    \
+       ui_DlgRef_1Sel2Spin_QTD.h               \
+       ui_DlgRef_1Sel3Check_QTD.h              \
+       ui_DlgRef_1Sel3Spin_QTD.h               \
+       ui_DlgRef_1Sel4Spin_QTD.h               \
+       ui_DlgRef_1Sel5Spin_QTD.h               \
+       ui_DlgRef_1Sel_QTD.h                    \
+       ui_DlgRef_1SelExt_QTD.h                 \
+       ui_DlgRef_1Spin_QTD.h                   \
+       ui_DlgRef_2Sel1List_QTD.h               \
+       ui_DlgRef_2Sel1Spin2Check_QTD.h         \
+       ui_DlgRef_2Sel1Spin_QTD.h               \
+       ui_DlgRef_2Sel2Spin1Check_QTD.h         \
+       ui_DlgRef_2Sel2Spin_QTD.h               \
+       ui_DlgRef_2Sel3Spin_QTD.h               \
+       ui_DlgRef_2Sel4Spin1Check_QTD.h         \
+       ui_DlgRef_2Sel_QTD.h                    \
+       ui_DlgRef_2SelExt_QTD.h                 \
+       ui_DlgRef_2Spin_QTD.h                   \
+       ui_DlgRef_3Check_QTD.h                  \
+       ui_DlgRef_3Sel1Check_QTD.h              \
+       ui_DlgRef_3Sel1Spin_QTD.h               \
+       ui_DlgRef_3Sel3Spin1Check_QTD.h         \
+       ui_DlgRef_3Sel4Spin2Check_QTD.h         \
+       ui_DlgRef_3Sel_QTD.h                    \
+       ui_DlgRef_3Spin1Check_QTD.h             \
+       ui_DlgRef_3Spin_QTD.h                   \
+       ui_DlgRef_4Sel1List1Check_QTD.h         \
+       ui_DlgRef_4Sel1List_QTD.h               \
+       ui_DlgRef_4Sel1Spin2Check_QTD.h         \
+       ui_DlgRef_6Sel_QTD.h                    \
        ui_DlgRef_Skeleton_QTD.h
 
 BUILT_SOURCES = $(UIC_FILES)

diff --git a/src/GEOMBase/GEOMBase_Skeleton.cxx b/src/GEOMBase/GEOMBase_Skeleton.cxx
index 5fd4b4f5bb484d1ff539b4a638cd4958e307f867..1cd16819f5391af85d6cd40c7d8d5e7042b3ce4f 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.cxx
+++ b/src/GEOMBase/GEOMBase_Skeleton.cxx
@@ -38,6 +38,7 @@
 #include <SUIT_MessageBox.h>
 
 #include <QKeyEvent>
+#include <QSpinBox>
 #include <QDoubleSpinBox>
 
 using namespace std;
@@ -121,6 +122,13 @@ void GEOMBase_Skeleton::Init()
   myMainFrame->RadioButton4->hide();
 }
 
+void GEOMBase_Skeleton::initSpinBox( QSpinBox* spinBox, 
+                                    int min,  int max, int step )
+{
+  spinBox->setRange( min, max );
+  spinBox->setSingleStep( step );
+}
+
 void GEOMBase_Skeleton::initSpinBox( QDoubleSpinBox* spinBox, 
                                     double min,  double max, 
                                     double step, int decimals )

diff --git a/src/GEOMBase/GEOMBase_Skeleton.h b/src/GEOMBase/GEOMBase_Skeleton.h
index 2656f4f1991e877f381daf8e4720d17ce7c6f790..f674edf84364857673ef1c36b2ff887f27e1b055 100644 (file)
--- a/src/GEOMBase/GEOMBase_Skeleton.h
+++ b/src/GEOMBase/GEOMBase_Skeleton.h
@@ -33,6 +33,7 @@
 
 class GeometryGUI;
 class DlgRef_Skeleton;
+class QSpinBox;
 class QDoubleSpinBox;
 class QLineEdit;
 class QButtonGroup;
@@ -57,6 +58,7 @@ private:
     void Init();
 
 protected:
+    void                initSpinBox( QSpinBox*, int, int, int = 1 );
     void                initSpinBox( QDoubleSpinBox*, double, double, double = 0.1, int = 3 );
     
     void                closeEvent( QCloseEvent* );