ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2025-01-23 17:00:32 +05:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
3 new DlgRef were added.
The documentation is updated as well.
This commit is contained in:
gdd 2012-03-27 16:00:08 +00:00
parent e98f44ce25
commit 0304ec44b3
12 changed files with 713 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
doc/salome/gui/GEOM/images/extrusion1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 36 KiB

BIN
doc/salome/gui/GEOM/images/extrusion2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 35 KiB

BIN
doc/salome/gui/GEOM/images/extrusion3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 36 KiB

58
src/DlgRef/DlgRef.cxx
View File

@ -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 // 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 // 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 // DlgRef_3Sel3Spin2Check
////////////////////////////////////////// //////////////////////////////////////////

50
src/DlgRef/DlgRef.h
View File

@ -227,6 +227,22 @@ public:
~DlgRef_1Sel3Spin(); ~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 // DlgRef_1Sel3Spin1Check
////////////////////////////////////////// //////////////////////////////////////////
@ -419,6 +435,22 @@ public:
~DlgRef_2Sel1Spin2Check(); ~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 // DlgRef_2Sel1Spin
////////////////////////////////////////// //////////////////////////////////////////
@ -757,6 +789,24 @@ public:
void ShowRows( int, int, bool = true ); 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 // DlgRef_3Sel3Spin2Check
////////////////////////////////////////// //////////////////////////////////////////

6
src/DlgRef/DlgRef.pro
View File

@ -63,8 +63,10 @@ HEADERS += DlgRef_2Sel2Spin_QTD.h
HEADERS += DlgRef_2Sel3Spin_QTD.h HEADERS += DlgRef_2Sel3Spin_QTD.h
HEADERS += DlgRef_1Sel1Spin1Check_QTD.h HEADERS += DlgRef_1Sel1Spin1Check_QTD.h
HEADERS += DlgRef_1Sel3Spin1Check_QTD.h HEADERS += DlgRef_1Sel3Spin1Check_QTD.h
HEADERS += DlgRef_1Sel3Spin2Check1Spin_QTD.h
HEADERS += DlgRef_1Sel4Spin2Check_QTD.h HEADERS += DlgRef_1Sel4Spin2Check_QTD.h
HEADERS += DlgRef_2Sel1Spin2Check_QTD.h HEADERS += DlgRef_2Sel1Spin2Check_QTD.h
HEADERS += DlgRef_2Sel1Spin3Check1Spin_QTD.h
HEADERS += DlgRef_2Sel2Spin1Check_QTD.h HEADERS += DlgRef_2Sel2Spin1Check_QTD.h
HEADERS += DlgRef_2Sel2Spin3Check_QTD.h HEADERS += DlgRef_2Sel2Spin3Check_QTD.h
HEADERS += DlgRef_2Sel4Spin1Check_QTD.h HEADERS += DlgRef_2Sel4Spin1Check_QTD.h
@ -77,6 +79,7 @@ HEADERS += DlgRef_1Spin_QTD.h
HEADERS += DlgRef_2Spin_QTD.h HEADERS += DlgRef_2Spin_QTD.h
HEADERS += DlgRef_3Spin_QTD.h HEADERS += DlgRef_3Spin_QTD.h
HEADERS += DlgRef_3Spin1Check_QTD.h HEADERS += DlgRef_3Spin1Check_QTD.h
HEADERS += DlgRef_3Spin2Check3Spin_QTD.h
HEADERS += DlgRef_3Sel3Spin1Check_QTD.h HEADERS += DlgRef_3Sel3Spin1Check_QTD.h
HEADERS += DlgRef_4Sel1Spin2Check_QTD.h HEADERS += DlgRef_4Sel1Spin2Check_QTD.h
HEADERS += DlgRef_4Sel1Spin3Check_QTD.h HEADERS += DlgRef_4Sel1Spin3Check_QTD.h
@ -122,8 +125,10 @@ SOURCES += DlgRef_2Sel2Spin.cxx
SOURCES += DlgRef_2Sel3Spin.cxx SOURCES += DlgRef_2Sel3Spin.cxx
SOURCES += DlgRef_1Sel1Spin1Check.cxx SOURCES += DlgRef_1Sel1Spin1Check.cxx
SOURCES += DlgRef_1Sel3Spin1Check.cxx SOURCES += DlgRef_1Sel3Spin1Check.cxx
SOURCES += DlgRef_1Sel3Spin2Check1Spin.cxx
SOURCES += DlgRef_1Sel4Spin2Check.cxx SOURCES += DlgRef_1Sel4Spin2Check.cxx
SOURCES += DlgRef_2Sel1Spin2Check.cxx SOURCES += DlgRef_2Sel1Spin2Check.cxx
SOURCES += DlgRef_2Sel1Spin3Check1Spin.cxx
SOURCES += DlgRef_2Sel2Spin1Check.cxx SOURCES += DlgRef_2Sel2Spin1Check.cxx
SOURCES += DlgRef_2Sel2Spin3Check.cxx SOURCES += DlgRef_2Sel2Spin3Check.cxx
SOURCES += DlgRef_2Sel4Spin1Check.cxx SOURCES += DlgRef_2Sel4Spin1Check.cxx
@ -133,6 +138,7 @@ SOURCES += DlgRef_1Spin.cxx
SOURCES += DlgRef_2Spin.cxx SOURCES += DlgRef_2Spin.cxx
SOURCES += DlgRef_3Spin.cxx SOURCES += DlgRef_3Spin.cxx
SOURCES += DlgRef_3Spin1Check.cxx SOURCES += DlgRef_3Spin1Check.cxx
SOURCES += DlgRef_3Spin2Check3Spin.cxx
SOURCES += DlgRef_3Sel1Spin.cxx SOURCES += DlgRef_3Sel1Spin.cxx
SOURCES += DlgRef_4Sel1Spin2Check.cxx SOURCES += DlgRef_4Sel1Spin2Check.cxx

180
src/DlgRef/DlgRef_1Sel3Spin2Check1Spin_QTD.ui Normal file
View File

@ -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>

182
src/DlgRef/DlgRef_2Sel1Spin3Check1Spin_QTD.ui Normal file
View File

@ -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>

225
src/DlgRef/DlgRef_3Sel2Check3Spin_QTD.ui Normal file
View File

@ -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>

3
src/DlgRef/Makefile.am
View File

@ -49,6 +49,7 @@ UIC_FILES = \
ui_DlgRef_1Sel3Check_QTD.h \ ui_DlgRef_1Sel3Check_QTD.h \
ui_DlgRef_1Sel3Spin_QTD.h \ ui_DlgRef_1Sel3Spin_QTD.h \
ui_DlgRef_1Sel3Spin1Check_QTD.h \ ui_DlgRef_1Sel3Spin1Check_QTD.h \
ui_DlgRef_1Sel3Spin2Check1Spin_QTD.h \
ui_DlgRef_1Sel4Spin2Check_QTD.h \ ui_DlgRef_1Sel4Spin2Check_QTD.h \
ui_DlgRef_1Sel4Spin_QTD.h \ ui_DlgRef_1Sel4Spin_QTD.h \
ui_DlgRef_1Sel5Spin1Check_QTD.h \ ui_DlgRef_1Sel5Spin1Check_QTD.h \
@ -60,6 +61,7 @@ UIC_FILES = \
ui_DlgRef_2Sel1List2Check_QTD.h \ ui_DlgRef_2Sel1List2Check_QTD.h \
ui_DlgRef_2Sel1List_QTD.h \ ui_DlgRef_2Sel1List_QTD.h \
ui_DlgRef_2Sel1Spin2Check_QTD.h \ ui_DlgRef_2Sel1Spin2Check_QTD.h \
ui_DlgRef_2Sel1Spin3Check1Spin_QTD.h \
ui_DlgRef_2Sel1Spin_QTD.h \ ui_DlgRef_2Sel1Spin_QTD.h \
ui_DlgRef_2Sel1SpinInt_QTD.h \ ui_DlgRef_2Sel1SpinInt_QTD.h \
ui_DlgRef_2Sel2List_QTD.h \ ui_DlgRef_2Sel2List_QTD.h \
@ -78,6 +80,7 @@ UIC_FILES = \
ui_DlgRef_3Radio_QTD.h \ ui_DlgRef_3Radio_QTD.h \
ui_DlgRef_3Radio1Sel1Spin_QTD.h \ ui_DlgRef_3Radio1Sel1Spin_QTD.h \
ui_DlgRef_3Sel1Check_QTD.h \ ui_DlgRef_3Sel1Check_QTD.h \
ui_DlgRef_3Sel2Check3Spin_QTD.h \
ui_DlgRef_3Sel1Spin_QTD.h \ ui_DlgRef_3Sel1Spin_QTD.h \
ui_DlgRef_3Sel2Spin_QTD.h \ ui_DlgRef_3Sel2Spin_QTD.h \
ui_DlgRef_3Sel3Spin1Check_QTD.h \ ui_DlgRef_3Sel3Spin1Check_QTD.h \

6
src/GenerationGUI/GenerationGUI_PrismDlg.cxx
View File

@ -73,7 +73,7 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg (GeometryGUI* theGeometryGUI, QWi
mainFrame()->RadioButton1->setChecked(true); mainFrame()->RadioButton1->setChecked(true);
GroupVecH = new DlgRef_2Sel2Spin3Check(centralWidget()); GroupVecH = new DlgRef_2Sel1Spin3Check1Spin(centralWidget());
GroupVecH->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV")); GroupVecH->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV"));
GroupVecH->TextLabel1->setText(tr("GEOM_BASE")); GroupVecH->TextLabel1->setText(tr("GEOM_BASE"));
GroupVecH->TextLabel2->setText(tr("GEOM_VECTOR")); GroupVecH->TextLabel2->setText(tr("GEOM_VECTOR"));
@ -87,7 +87,7 @@ GenerationGUI_PrismDlg::GenerationGUI_PrismDlg (GeometryGUI* theGeometryGUI, QWi
GroupVecH->CheckBox2->setText(tr("GEOM_REVERSE")); GroupVecH->CheckBox2->setText(tr("GEOM_REVERSE"));
GroupVecH->CheckBox3->setText(tr("GEOM_SCALE_PRISM")); 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->GroupBox1->setTitle(tr("GEOM_EXTRUSION_BSV_2P"));
Group2Points->TextLabel1->setText(tr("GEOM_BASE")); Group2Points->TextLabel1->setText(tr("GEOM_BASE"));
Group2Points->TextLabel2->setText(tr("GEOM_POINT_I").arg(1)); 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->CheckBox1->setText(tr("GEOM_BOTHWAY"));
Group2Points->CheckBox2->setText(tr("GEOM_SCALE_PRISM")); 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->GroupBox1->setTitle(tr("GEOM_EXTRUSION_DXDYDZ"));
GroupDXDYDZ->TextLabel1->setText(tr("GEOM_BASE")); GroupDXDYDZ->TextLabel1->setText(tr("GEOM_BASE"));
GroupDXDYDZ->PushButton1->setIcon(image1); GroupDXDYDZ->PushButton1->setIcon(image1);

12
src/GenerationGUI/GenerationGUI_PrismDlg.h
View File

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