diff --git a/doc/salome/gui/GEOM/images/extrusion1.png b/doc/salome/gui/GEOM/images/extrusion1.png index 6e702bfdc..1d3bc40da 100755 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 c4bd1c8b4..42b6d8ba5 100755 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 f0923b794..47cd72260 100644 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 59b8831b1..a9aa9286b 100644 --- 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 0ff004f41..fc324f56b 100644 --- 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 cea85d4a7..b75774a0c 100644 --- 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 index 000000000..0eeeedded --- /dev/null +++ b/src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui @@ -0,0 +1,180 @@ + + + DlgRef_1Sel3Spin2Check1Spin_QTD + + + + 0 + 0 + 196 + 183 + + + + + + + + 0 + + + 6 + + + + + + + + + 6 + + + + + + 0 + 0 + + + + TL1 + + + false + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + 0 + 0 + + + + TL2 + + + false + + + + + + + + + + + 0 + 0 + + + + TL3 + + + false + + + + + + + + + + + 0 + 0 + + + + TL4 + + + false + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + TL5 + + + false + + + + + + + + + + + + + qPixmapFromMimeSource + + + SalomeApp_DoubleSpinBox + QDoubleSpinBox +
SalomeApp_DoubleSpinBox.h
+ + + + PushButton1 + LineEdit1 + SpinBox_DX + SpinBox_DY + SpinBox_DZ + SpinBox_SC + CheckBox1 + CheckBox2 + + + + diff --git a/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui b/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui new file mode 100644 index 000000000..479e7bd81 --- /dev/null +++ b/src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui @@ -0,0 +1,182 @@ + + + DlgRef_2Sel1Spin3Check1Spin_QTD + + + + 0 + 0 + 196 + 181 + + + + + + + + 0 + + + 0 + + + + + + + + + 6 + + + + + + 0 + 0 + + + + TL1 + + + false + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + 0 + 0 + + + + TL2 + + + false + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + 0 + 0 + + + + TL3 + + + false + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + TL4 + + + false + + + + + + + + + + + + + qPixmapFromMimeSource + + + SalomeApp_DoubleSpinBox + QDoubleSpinBox +
SalomeApp_DoubleSpinBox.h
+ + + + PushButton1 + LineEdit1 + PushButton2 + LineEdit2 + SpinBox_DX + SpinBox_DY + CheckBox1 + CheckBox2 + CheckBox3 + + + + diff --git a/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui b/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui new file mode 100644 index 000000000..7d6b025ed --- /dev/null +++ b/src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui @@ -0,0 +1,225 @@ + + + DlgRef_3Sel2Check3Spin_QTD + + + + 0 + 0 + 196 + 216 + + + + + + + + 0 + + + + + + + + + 6 + + + + + + 0 + 0 + + + + TL1 + + + false + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + 0 + 0 + + + + TL2 + + + false + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + 0 + 0 + + + + TL3 + + + false + + + + + + + + 0 + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + + + + TL4 + + + false + + + + + + + + + + + 0 + 0 + + + + TL5 + + + false + + + + + + + + + + + 0 + 0 + + + + TL6 + + + false + + + + + + + + + + + + + qPixmapFromMimeSource + + + SalomeApp_DoubleSpinBox + QDoubleSpinBox +
SalomeApp_DoubleSpinBox.h
+ + + + PushButton1 + LineEdit1 + PushButton2 + LineEdit2 + PushButton3 + LineEdit3 + SpinBox1 + SpinBox2 + SpinBox3 + CheckBox1 + CheckBox2 + + + + diff --git a/src/DlgRef/Makefile.am b/src/DlgRef/Makefile.am index 35118e4ec..b66ba8cc2 100644 --- 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 04de1156f..a2b0c5ec7 100644 --- 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 7ef737a1b..b86811278 100644 --- 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();