ForkMaster/geom
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/geom.git synced 2024-11-15 18:18:35 +05:00
Code Issues Packages Projects Releases Wiki Activity

rnc: slight improvements of widgets behaviour and added some missing translations

Browse Source
This commit is contained in:
gdd 2011-03-29 12:39:50 +00:00
parent 8598f0fe49
commit 01bec554f7
9 changed files with 279 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/EntityGUI/EntityGUI_1Sel1Spin1Check_QTD.ui
View File

@ -25,7 +25,7 @@
<property name="title"> <property name="title">
<string>Values</string> <string>Values</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout" columnstretch="0,0,1,0">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="TextLabel1"> <widget class="QLabel" name="TextLabel1">
<property name="sizePolicy"> <property name="sizePolicy">

93
src/EntityGUI/EntityGUI_1Sel_QTD.ui
View File

@ -1,108 +1,103 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntityGUI_1Sel_QTD</class> <class>EntityGUI_1Sel_QTD</class>
<widget class="QWidget" name="EntityGUI_1Sel_QTD" > <widget class="QWidget" name="EntityGUI_1Sel_QTD">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>402</width> <width>402</width>
<height>88</height> <height>92</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>EntityGUI_1Sel_QTD</string> <string>EntityGUI_1Sel_QTD</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QGroupBox" name="GroupBox1" > <widget class="QGroupBox" name="GroupBox1">
<property name="title" > <property name="title">
<string>Values</string> <string>Values</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" rowstretch="0,0" columnstretch="0,0,1,0">
<property name="margin" > <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="3" > <item row="1" column="3">
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="margin" > <property name="spacing">
<number>0</number>
</property>
<property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="margin">
<number>0</number>
</property>
<item> <item>
<widget class="QPushButton" name="buttonUndo" > <widget class="QPushButton" name="buttonUndo">
<property name="text" > <property name="text">
<string>Undo</string> <string>Undo</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="buttonRedo" > <widget class="QPushButton" name="buttonRedo">
<property name="text" > <property name="text">
<string>Redo</string> <string>Redo</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<widget class="QLineEdit" name="LineEdit1" > <widget class="QLineEdit" name="LineEdit1">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="TextLabel1" > <widget class="QLabel" name="TextLabel1">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>TL1</string> <string>TL1</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QPushButton" name="PushButton1" > <widget class="QPushButton" name="PushButton1">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3" > <item row="0" column="3">
<widget class="QPushButton" name="buttonApply" > <widget class="QPushButton" name="buttonApply">
<property name="text" > <property name="text">
<string>Create</string> <string>Create</string>
</property> </property>
</widget> </widget>
@ -112,7 +107,7 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<tabstops> <tabstops>
<tabstop>PushButton1</tabstop> <tabstop>PushButton1</tabstop>

79
src/EntityGUI/EntityGUI_1Spin_QTD.ui
View File

@ -1,84 +1,83 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntityGUI_1Spin_QTD</class> <class>EntityGUI_1Spin_QTD</class>
<widget class="QWidget" name="EntityGUI_1Spin_QTD" > <widget class="QWidget" name="EntityGUI_1Spin_QTD">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>268</width> <width>270</width>
<height>88</height> <height>92</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>EntityGUI_1Spin_QTD</string> <string>EntityGUI_1Spin_QTD</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QGroupBox" name="GroupBox1" > <widget class="QGroupBox" name="GroupBox1">
<property name="title" > <property name="title">
<string>Values</string> <string>Values</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" columnstretch="0,1,0">
<property name="margin" > <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" /> <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX"/>
</item> </item>
<item row="1" column="2" > <item row="1" column="2">
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QPushButton" name="buttonRedo" > <widget class="QPushButton" name="buttonRedo">
<property name="text" > <property name="text">
<string>Redo</string> <string>Redo</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QPushButton" name="buttonUndo" > <widget class="QPushButton" name="buttonUndo">
<property name="text" > <property name="text">
<string>Undo</string> <string>Undo</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<widget class="QPushButton" name="buttonApply" > <widget class="QPushButton" name="buttonApply">
<property name="text" > <property name="text">
<string>Create</string> <string>Create</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="TextLabel1" > <widget class="QLabel" name="TextLabel1">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>TL1</string> <string>TL1</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
@ -88,13 +87,13 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>SalomeApp_DoubleSpinBox</class> <class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends> <extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header> <header location="global">SalomeApp_DoubleSpinBox.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>

2
src/EntityGUI/EntityGUI_2Sel1Check_QTD.ui
View File

@ -25,7 +25,7 @@
<property name="title"> <property name="title">
<string>Values</string> <string>Values</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" columnstretch="0,0,1,0">
<property name="margin"> <property name="margin">
<number>9</number> <number>9</number>
</property> </property>

97
src/EntityGUI/EntityGUI_2Spin_QTD.ui
View File

@ -1,105 +1,102 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntityGUI_2Spin_QTD</class> <class>EntityGUI_2Spin_QTD</class>
<widget class="QWidget" name="EntityGUI_2Spin_QTD" > <widget class="QWidget" name="EntityGUI_2Spin_QTD">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>264</width> <width>276</width>
<height>88</height> <height>92</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>EntityGUI_2Spin_QTD</string> <string>EntityGUI_2Spin_QTD</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QGroupBox" name="GroupBox1" > <widget class="QGroupBox" name="GroupBox1">
<property name="title" > <property name="title">
<string>Values</string> <string>Values</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" columnstretch="0,1,0">
<property name="margin" > <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="1" > <item row="1" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" /> <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY"/>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" /> <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX"/>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="TextLabel2" > <widget class="QLabel" name="TextLabel2">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>TL2</string> <string>TL2</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="TextLabel1" > <widget class="QLabel" name="TextLabel1">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>TL1</string> <string>TL1</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2" > <item row="1" column="2">
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QPushButton" name="buttonUndo" > <widget class="QPushButton" name="buttonUndo">
<property name="text" > <property name="text">
<string>Undo</string> <string>Undo</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QPushButton" name="buttonRedo" > <widget class="QPushButton" name="buttonRedo">
<property name="text" > <property name="text">
<string>Redo</string> <string>Redo</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<widget class="QPushButton" name="buttonApply" > <widget class="QPushButton" name="buttonApply">
<property name="text" > <property name="text">
<string>Create</string> <string>Create</string>
</property> </property>
</widget> </widget>
@ -109,13 +106,13 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>SalomeApp_DoubleSpinBox</class> <class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends> <extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header> <header location="global">SalomeApp_DoubleSpinBox.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>

15
src/EntityGUI/EntityGUI_3Spin1Check_QTD.ui
View File

@ -25,7 +25,7 @@
<property name="title"> <property name="title">
<string>Values</string> <string>Values</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" rowstretch="0,0,0,0,0" columnstretch="0,1,0">
<property name="margin"> <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
@ -127,6 +127,19 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

2
src/EntityGUI/EntityGUI_4Spin1Check_QTD.ui
View File

@ -25,7 +25,7 @@
<property name="title"> <property name="title">
<string>Values</string> <string>Values</string>
</property> </property>
<layout class="QGridLayout"> <layout class="QGridLayout" columnstretch="0,1,0">
<property name="margin"> <property name="margin">
<number>9</number> <number>9</number>
</property> </property>

133
src/EntityGUI/EntityGUI_4Spin_QTD.ui
View File

@ -1,147 +1,140 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>EntityGUI_4Spin_QTD</class> <class>EntityGUI_4Spin_QTD</class>
<widget class="QWidget" name="EntityGUI_4Spin_QTD" > <widget class="QWidget" name="EntityGUI_4Spin_QTD">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>264</width> <width>270</width>
<height>140</height> <height>144</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string>EntityGUI_4Spin_QTD</string> <string>EntityGUI_4Spin_QTD</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>0</number> <number>0</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QGroupBox" name="GroupBox1" > <widget class="QGroupBox" name="GroupBox1">
<property name="title" > <property name="title">
<string>Values</string> <string>Values</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" columnstretch="1,0,0">
<property name="margin" > <property name="margin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="1" > <item row="2" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ" /> <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DZ"/>
</item> </item>
<item row="3" column="1" > <item row="3" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DS" /> <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DS"/>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY" /> <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DY"/>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX" /> <widget class="SalomeApp_DoubleSpinBox" name="SpinBox_DX"/>
</item> </item>
<item row="1" column="2" > <item row="1" column="2">
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QPushButton" name="buttonRedo" > <widget class="QPushButton" name="buttonRedo">
<property name="text" > <property name="text">
<string>Redo</string> <string>Redo</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QPushButton" name="buttonUndo" > <widget class="QPushButton" name="buttonUndo">
<property name="text" > <property name="text">
<string>Undo</string> <string>Undo</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<widget class="QPushButton" name="buttonApply" > <widget class="QPushButton" name="buttonApply">
<property name="text" > <property name="text">
<string>Create</string> <string>Create</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="TextLabel1" > <widget class="QLabel" name="TextLabel1">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>TL1</string> <string>TL1</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<widget class="QLabel" name="TextLabel4" > <widget class="QLabel" name="TextLabel4">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>TL4</string> <string>TL4</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="TextLabel2" > <widget class="QLabel" name="TextLabel2">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>TL2</string> <string>TL2</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QLabel" name="TextLabel3" > <widget class="QLabel" name="TextLabel3">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" > <property name="text">
<string>TL3</string> <string>TL3</string>
</property> </property>
<property name="wordWrap" > <property name="wordWrap">
<bool>false</bool> <bool>false</bool>
</property> </property>
</widget> </widget>
@ -151,13 +144,13 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<layoutdefault spacing="6" margin="11" /> <layoutdefault spacing="6" margin="11"/>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction> <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets> <customwidgets>
<customwidget> <customwidget>
<class>SalomeApp_DoubleSpinBox</class> <class>SalomeApp_DoubleSpinBox</class>
<extends>QDoubleSpinBox</extends> <extends>QDoubleSpinBox</extends>
<header location="global" >SalomeApp_DoubleSpinBox.h</header> <header location="global">SalomeApp_DoubleSpinBox.h</header>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>

130
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -122,6 +122,7 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg( GeometryGUI* GUI, QWidget* parent,
topLayout->addWidget(GroupBox1); topLayout->addWidget(GroupBox1);
topLayout->addWidget( MainWidget ); topLayout->addWidget( MainWidget );
topLayout->setStretch( 1, 1);
GroupPt = new EntityGUI_Point( MainWidget->DestCnt ); GroupPt = new EntityGUI_Point( MainWidget->DestCnt );
@ -231,6 +232,7 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg( GeometryGUI* GUI, QWidget* parent,
SkeletonCntlayout->addWidget( Group2Spin, 0, 0 ); SkeletonCntlayout->addWidget( Group2Spin, 0, 0 );
SkeletonCntlayout->addWidget( Group3Spin, 0, 0 ); SkeletonCntlayout->addWidget( Group3Spin, 0, 0 );
SkeletonCntlayout->addWidget( Group4Spin, 0, 0 ); SkeletonCntlayout->addWidget( Group4Spin, 0, 0 );
//SkeletonCntlayout->setStretch( 0, 1);
/***************************************************************/ /***************************************************************/
QButtonGroup* ButtonGroup = new QButtonGroup( this ); QButtonGroup* ButtonGroup = new QButtonGroup( this );
@ -238,75 +240,75 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg( GeometryGUI* GUI, QWidget* parent,
ButtonGroup->addButton( MainWidget->RB_Dest2, 0 ); ButtonGroup->addButton( MainWidget->RB_Dest2, 0 );
/* signals and slots connections */ /* signals and slots connections */
connect( MainWidget->buttonEnd, SIGNAL( clicked() ), this, SLOT( ClickOnEnd() ) ); connect( MainWidget->buttonEnd, SIGNAL( clicked() ), this, SLOT( ClickOnEnd() ) );
connect( MainWidget->buttonClose, SIGNAL( clicked() ), this, SLOT( ClickOnEnd() ) ); connect( MainWidget->buttonClose, SIGNAL( clicked() ), this, SLOT( ClickOnEnd() ) );
connect( MainWidget->buttonCancel, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) ); connect( MainWidget->buttonCancel, SIGNAL( clicked() ), this, SLOT( ClickOnCancel() ) );
connect( MainWidget->buttonHelp, SIGNAL( clicked() ), this, SLOT( ClickOnHelp() ) ); connect( MainWidget->buttonHelp, SIGNAL( clicked() ), this, SLOT( ClickOnHelp() ) );
connect( Group1Sel->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); connect( Group1Sel->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( Group1Sel->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) ); connect( Group1Sel->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
connect( Group1Sel->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ); connect( Group1Sel->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
connect( Group2Sel->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); connect( Group2Sel->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( Group2Sel->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) ); connect( Group2Sel->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
connect( Group2Sel->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ); connect( Group2Sel->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
connect( Group1Sel1Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); connect( Group1Sel1Spin->buttonApply,SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( Group1Sel1Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) ); connect( Group1Sel1Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
connect( Group1Sel1Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ); connect( Group1Sel1Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
connect( Group1Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); connect( Group1Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( Group1Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) ); connect( Group1Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
connect( Group1Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ); connect( Group1Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
connect( Group2Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); connect( Group2Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( Group2Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) ); connect( Group2Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
connect( Group2Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ); connect( Group2Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
connect( Group3Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); connect( Group3Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( Group3Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) ); connect( Group3Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
connect( Group3Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ) ; connect( Group3Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ) ;
connect( Group4Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) ); connect( Group4Spin->buttonApply, SIGNAL( clicked() ), this, SLOT( ClickOnApply() ) );
connect( Group4Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) ); connect( Group4Spin->buttonUndo, SIGNAL( clicked() ), this, SLOT( ClickOnUndo() ) );
connect( Group4Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) ); connect( Group4Spin->buttonRedo, SIGNAL( clicked() ), this, SLOT( ClickOnRedo() ) );
connect( MainWidget->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( TypeClicked( int ) ) ); connect( MainWidget->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( TypeClicked( int ) ) );
connect( ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( DestClicked( int ) ) ); connect( ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( DestClicked( int ) ) );
connect( GroupPt->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( PointClicked( int ) ) ); connect( GroupPt->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( PointClicked( int ) ) );
connect( GroupPt2->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( Point2Clicked( int ) ) ); connect( GroupPt2->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( Point2Clicked( int ) ) );
connect( GroupD1->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( Dir1Clicked( int ) ) ); connect( GroupD1->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( Dir1Clicked( int ) ) );
connect( GroupD2->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( Dir2Clicked( int ) )); connect( GroupD2->ButtonGroup, SIGNAL( buttonClicked( int ) ), this, SLOT( Dir2Clicked( int ) ));
connect( Group1Sel->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); connect( Group1Sel->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
connect( Group1Sel->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group1Sel->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( Group2Sel->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); connect( Group2Sel->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
connect( Group2Sel->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); connect( Group2Sel->LineEdit2, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
connect( Group2Sel->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group2Sel->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( Group2Sel->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group2Sel->PushButton2, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( Group1Sel1Spin->LineEdit1, SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) ); connect( Group1Sel1Spin->LineEdit1,SIGNAL( returnPressed() ), this, SLOT( LineEditReturnPressed() ) );
connect( Group1Sel1Spin->PushButton1, SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) ); connect( Group1Sel1Spin->PushButton1,SIGNAL( clicked() ), this, SLOT( SetEditCurrentArgument() ) );
connect( Group1Sel1Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group1Sel1Spin->SpinBox_DX,SIGNAL( valueChanged( double ) ),this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group1Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group1Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group2Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group2Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group2Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group2Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group3Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group3Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group3Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group3Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group3Spin->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group3Spin->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group4Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group4Spin->SpinBox_DX, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group4Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group4Spin->SpinBox_DY, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group4Spin->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group4Spin->SpinBox_DZ, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group4Spin->SpinBox_DS, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) ); connect( Group4Spin->SpinBox_DS, SIGNAL( valueChanged( double ) ), this, SLOT( ValueChangedInSpinBox( double ) ) );
connect( Group3Spin->checkBox, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) ); connect( Group3Spin->checkBox, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) );
connect( Group4Spin->checkBox, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) ); connect( Group4Spin->checkBox, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) );
connect( Group2Sel->checkBox, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) ); connect( Group2Sel->checkBox, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) );
connect( Group1Sel1Spin->checkBox, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) ); connect( Group1Sel1Spin->checkBox, SIGNAL( stateChanged( int ) ), this, SLOT( CheckBoxClicked( int ) ) );
connect( ComboBox1, SIGNAL( activated( int ) ), this, SLOT( SelectionIntoArgument() ) ); connect( ComboBox1, SIGNAL( activated( int ) ), this, SLOT( SelectionIntoArgument() ) );
connect( planeButton, SIGNAL( clicked() ), this, SLOT( ActivateLocalCS() ) ); connect( planeButton, SIGNAL( clicked() ), this, SLOT( ActivateLocalCS() ) );
connect( myGeometryGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) ); connect( myGeometryGUI, SIGNAL( SignalDefaultStepValueChanged( double ) ), this, SLOT( SetDoubleSpinBoxStep( double ) ) );
connect( myGeometryGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) ); connect( myGeometryGUI, SIGNAL( SignalDeactivateActiveDialog() ), this, SLOT( DeactivateActiveDialog() ) );
connect( myGeometryGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) ); connect( myGeometryGUI, SIGNAL( SignalCloseAllDialogs() ), this, SLOT( ClickOnCancel() ) );
// install event filter on spin-boxes to provide Apply action on Return pressed // install event filter on spin-boxes to provide Apply action on Return pressed
Group1Spin->SpinBox_DX->installEventFilter(this); Group1Spin->SpinBox_DX->installEventFilter(this);
@ -505,6 +507,7 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
Group4Spin->checkBox->hide(); Group4Spin->checkBox->hide();
Dir1Clicked( 2 ); // Angle Dir1Clicked( 2 ); // Angle
} }
resize( minimumSizeHint() );
} }
//================================================================================= //=================================================================================
@ -513,6 +516,7 @@ void EntityGUI_SketcherDlg::DestClicked( int constructorId )
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::PointClicked( int constructorId ) void EntityGUI_SketcherDlg::PointClicked( int constructorId )
{ {
MESSAGE("PointClicked")
myConstructorPntId = constructorId; myConstructorPntId = constructorId;
GroupPt2->RB_Point1->setChecked( true ); GroupPt2->RB_Point1->setChecked( true );
GroupPt->RB_Point3->setEnabled( true ); GroupPt->RB_Point3->setEnabled( true );
@ -525,6 +529,7 @@ void EntityGUI_SketcherDlg::PointClicked( int constructorId )
//================================================================================= //=================================================================================
void EntityGUI_SketcherDlg::Point2Clicked( int constructorId ) void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
{ {
MESSAGE("Point2Clicked")
InitClick(); InitClick();
// Get setting of step value from file configuration // Get setting of step value from file configuration
@ -687,6 +692,7 @@ void EntityGUI_SketcherDlg::Point2Clicked( int constructorId )
} }
} }
resize( minimumSizeHint() );
connect( myGeometryGUI->getApp()->selectionMgr(), connect( myGeometryGUI->getApp()->selectionMgr(),
SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) ); SIGNAL( currentSelectionChanged() ), this, SLOT( SelectionIntoArgument() ) );
@ -890,7 +896,7 @@ void EntityGUI_SketcherDlg::Dir2Clicked( int constructorId )
} }
} }
} }
resize( minimumSizeHint() );
GEOMBase_Helper::displayPreview( true, false, true, true, myLineWidth ); GEOMBase_Helper::displayPreview( true, false, true, true, myLineWidth );
} }
@ -1969,13 +1975,13 @@ bool EntityGUI_SketcherDlg::execute( ObjectList& objects )
if ( mySketchType == PT_ABS_CENTER || if ( mySketchType == PT_ABS_CENTER ||
mySketchType == PT_REL_CENTER ){ mySketchType == PT_REL_CENTER ){
Group4Spin->label->show(); Group4Spin->label->show();
Group4Spin->label->setText(QString(aProfile2.ErrMsg().c_str())); Group4Spin->label->setText( tr( aProfile2.ErrMsg().c_str() ) );
} }
else else
Group4Spin->label->hide(); Group4Spin->label->hide();
if ( mySketchType == PT_SEL_CENTER ){ if ( mySketchType == PT_SEL_CENTER ){
Group2Sel->label->show(); Group2Sel->label->show();
Group2Sel->label->setText(QString(aProfile2.ErrMsg().c_str())); Group2Sel->label->setText( tr( aProfile2.ErrMsg().c_str() ) );
} }
else else
Group2Sel->label->hide(); Group2Sel->label->hide();