From: vsr Date: Tue, 23 Oct 2007 14:02:10 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: snapshot_171207~4 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c115a0bf0c984221f0e73d80030d96b3b7d896e4;p=modules%2Fgeom.git *** empty log message *** --- diff --git a/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui b/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui new file mode 100644 index 000000000..522369808 --- /dev/null +++ b/src/DlgRef/DlgRef_1Sel2Spin1View1Check_QTD.ui @@ -0,0 +1,139 @@ + + DlgRef_1Sel2Spin1View1Check_QTD + + + + 0 + 0 + 176 + 220 + + + + + + + + 0 + + + 6 + + + + + + + + + 9 + + + 6 + + + + + + + + + + + + + + Check + + + + + + + + 0 + 0 + 0 + 0 + + + + TL3 + + + false + + + + + + + + 0 + 0 + 0 + 0 + + + + TL2 + + + false + + + + + + + + + + + 0 + 0 + 0 + 0 + + + + + + + + + + + + 0 + 0 + 0 + 0 + + + + TL1 + + + false + + + + + + + + + + qPixmapFromMimeSource + + PushButton1 + LineEdit1 + SpinBox1 + SpinBox2 + TextBrowser1 + CheckBox1 + + + + diff --git a/src/DlgRef/GEOM_DlgRef.cxx b/src/DlgRef/GEOM_DlgRef.cxx index c67cdee2a..b612d00f8 100644 --- 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 71e797a06..e282a3dbb 100644 --- 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 ae699d94f..c561a9172 100644 --- 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 5fd4b4f5b..1cd16819f 100644 --- a/src/GEOMBase/GEOMBase_Skeleton.cxx +++ b/src/GEOMBase/GEOMBase_Skeleton.cxx @@ -38,6 +38,7 @@ #include #include +#include #include 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 2656f4f19..f674edf84 100644 --- 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* );