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

Fix bug 14119: SIGSEGV on Geometry activating in next study.

Browse Source
This commit is contained in:
jfa 2007-06-21 13:27:04 +00:00
parent 45ac6d194d
commit e3a1162344
15 changed files with 29 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/DlgRef/DlgRef_Skeleton_QTD.cxx
View File

@ -20,7 +20,7 @@
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui' ** Form implementation generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
** **
** Created: Fri Mar 17 11:18:06 2006 ** Created: Tue Mar 13 14:40:34 2007
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -57,11 +57,6 @@ DlgRef_Skeleton_QTD::DlgRef_Skeleton_QTD( QWidget* parent, const char* name, boo
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
GroupMedium = new QGroupBox( this, "GroupMedium" );
GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) );
Layout1->addWidget( GroupMedium, 2, 0 );
GroupButtons = new QGroupBox( this, "GroupButtons" ); GroupButtons = new QGroupBox( this, "GroupButtons" );
GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) ); GroupButtons->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
GroupButtons->setColumnLayout(0, Qt::Vertical ); GroupButtons->setColumnLayout(0, Qt::Vertical );
@ -155,19 +150,5 @@ DlgRef_Skeleton_QTD::~DlgRef_Skeleton_QTD()
*/ */
void DlgRef_Skeleton_QTD::languageChange() void DlgRef_Skeleton_QTD::languageChange()
{ {
setCaption( tr( "DlgRef_Skeleton_QTD" ) );
GroupMedium->setTitle( QString::null );
GroupButtons->setTitle( QString::null );
buttonOk->setText( tr( "&Ok" ) );
buttonApply->setText( tr( "&Apply" ) );
buttonCancel->setText( tr( "&Cancel" ) );
buttonHelp->setText( tr( "&Help" ) );
GroupConstructors->setTitle( QString::null );
RadioButton1->setText( QString::null );
RadioButton2->setText( QString::null );
RadioButton3->setText( QString::null );
RadioButton4->setText( QString::null );
GroupBoxName->setTitle( tr( "Result name" ) );
NameLabel->setText( tr( "Name" ) );
} }

3
src/DlgRef/DlgRef_Skeleton_QTD.h
View File

@ -20,7 +20,7 @@
/**************************************************************************** /****************************************************************************
** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui' ** Form interface generated from reading ui file 'DlgRef_Skeleton_QTD.ui'
** **
** Created: Fri Mar 17 11:18:06 2006 ** Created: Tue Mar 13 14:40:29 2007
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -51,7 +51,6 @@ public:
DlgRef_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); DlgRef_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~DlgRef_Skeleton_QTD(); ~DlgRef_Skeleton_QTD();
QGroupBox* GroupMedium;
QGroupBox* GroupButtons; QGroupBox* GroupButtons;
QPushButton* buttonOk; QPushButton* buttonOk;
QPushButton* buttonApply; QPushButton* buttonApply;

55
src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
View File

@ -20,9 +20,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="caption">
<string>DlgRef_Skeleton_QTD</string>
</property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -50,22 +47,6 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QGroupBox" row="2" column="0">
<property name="name">
<cstring>GroupMedium</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string></string>
</property>
</widget>
<widget class="QGroupBox" row="3" column="0"> <widget class="QGroupBox" row="3" column="0">
<property name="name"> <property name="name">
<cstring>GroupButtons</cstring> <cstring>GroupButtons</cstring>
@ -78,9 +59,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string></string>
</property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -109,17 +87,11 @@
<property name="name"> <property name="name">
<cstring>buttonOk</cstring> <cstring>buttonOk</cstring>
</property> </property>
<property name="text">
<string>&amp;Ok</string>
</property>
</widget> </widget>
<widget class="QPushButton"> <widget class="QPushButton">
<property name="name"> <property name="name">
<cstring>buttonApply</cstring> <cstring>buttonApply</cstring>
</property> </property>
<property name="text">
<string>&amp;Apply</string>
</property>
</widget> </widget>
<spacer> <spacer>
<property name="name"> <property name="name">
@ -142,17 +114,11 @@
<property name="name"> <property name="name">
<cstring>buttonCancel</cstring> <cstring>buttonCancel</cstring>
</property> </property>
<property name="text">
<string>&amp;Cancel</string>
</property>
</widget> </widget>
<widget class="QPushButton"> <widget class="QPushButton">
<property name="name"> <property name="name">
<cstring>buttonHelp</cstring> <cstring>buttonHelp</cstring>
</property> </property>
<property name="text">
<string>&amp;Help</string>
</property>
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
@ -170,9 +136,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string></string>
</property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -201,33 +164,21 @@
<property name="name"> <property name="name">
<cstring>RadioButton1</cstring> <cstring>RadioButton1</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="QRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton2</cstring> <cstring>RadioButton2</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="QRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton3</cstring> <cstring>RadioButton3</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="QRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton4</cstring> <cstring>RadioButton4</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
@ -237,9 +188,6 @@
<property name="name"> <property name="name">
<cstring>GroupBoxName</cstring> <cstring>GroupBoxName</cstring>
</property> </property>
<property name="title">
<string>Result name</string>
</property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -273,9 +221,6 @@
<property name="name"> <property name="name">
<cstring>NameLabel</cstring> <cstring>NameLabel</cstring>
</property> </property>
<property name="text">
<string>Name</string>
</property>
</widget> </widget>
</grid> </grid>
</widget> </widget>

45
src/EntityGUI/EntityGUI_Skeleton_QTD.cxx
View File

@ -20,7 +20,7 @@
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file 'EntityGUI_Skeleton_QTD.ui' ** Form implementation generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
** **
** Created: Fri Mar 17 15:47:14 2006 ** Created: Tue Mar 13 14:04:48 2007
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -30,9 +30,9 @@
#include <qvariant.h> #include <qvariant.h>
#include <qpushbutton.h> #include <qpushbutton.h>
#include <qgroupbox.h>
#include <qbuttongroup.h> #include <qbuttongroup.h>
#include <qradiobutton.h> #include <qradiobutton.h>
#include <qgroupbox.h>
#include <qlayout.h> #include <qlayout.h>
#include <qtooltip.h> #include <qtooltip.h>
#include <qwhatsthis.h> #include <qwhatsthis.h>
@ -54,11 +54,6 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* nam
Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1"); Layout1 = new QGridLayout( 0, 1, 1, 0, 6, "Layout1");
GroupVal = new QGroupBox( this, "GroupVal" );
GroupVal->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupVal->sizePolicy().hasHeightForWidth() ) );
Layout1->addWidget( GroupVal, 2, 0 );
GroupConstructors = new QButtonGroup( this, "GroupConstructors" ); GroupConstructors = new QButtonGroup( this, "GroupConstructors" );
GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) ); GroupConstructors->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
GroupConstructors->setColumnLayout(0, Qt::Vertical ); GroupConstructors->setColumnLayout(0, Qt::Vertical );
@ -111,26 +106,6 @@ EntityGUI_Skeleton_QTD::EntityGUI_Skeleton_QTD( QWidget* parent, const char* nam
Layout5->addMultiCellWidget( GroupDest1, 0, 0, 0, 1 ); Layout5->addMultiCellWidget( GroupDest1, 0, 0, 0, 1 );
GroupDest2 = new QButtonGroup( GroupDest, "GroupDest2" );
GroupDest2->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest2->sizePolicy().hasHeightForWidth() ) );
GroupDest2->setColumnLayout(0, Qt::Vertical );
GroupDest2->layout()->setSpacing( 6 );
GroupDest2->layout()->setMargin( 11 );
GroupDest2Layout = new QGridLayout( GroupDest2->layout() );
GroupDest2Layout->setAlignment( Qt::AlignTop );
Layout5->addWidget( GroupDest2, 1, 0 );
GroupDest3 = new QButtonGroup( GroupDest, "GroupDest3" );
GroupDest3->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupDest3->sizePolicy().hasHeightForWidth() ) );
GroupDest3->setColumnLayout(0, Qt::Vertical );
GroupDest3->layout()->setSpacing( 6 );
GroupDest3->layout()->setMargin( 11 );
GroupDest3Layout = new QGridLayout( GroupDest3->layout() );
GroupDest3Layout->setAlignment( Qt::AlignTop );
Layout5->addWidget( GroupDest3, 1, 1 );
GroupDestLayout->addLayout( Layout5, 0, 0 ); GroupDestLayout->addLayout( Layout5, 0, 0 );
Layout1->addWidget( GroupDest, 1, 0 ); Layout1->addWidget( GroupDest, 1, 0 );
@ -190,21 +165,5 @@ EntityGUI_Skeleton_QTD::~EntityGUI_Skeleton_QTD()
*/ */
void EntityGUI_Skeleton_QTD::languageChange() void EntityGUI_Skeleton_QTD::languageChange()
{ {
setCaption( tr( "EntityGUI_Skeleton_QTD" ) );
GroupVal->setTitle( QString::null );
GroupConstructors->setTitle( tr( "Element Type" ) );
RadioButton1->setText( tr( "Segment" ) );
RadioButton2->setText( tr( "Arc" ) );
GroupDest->setTitle( tr( "Destination" ) );
GroupDest1->setTitle( tr( "Type" ) );
RB_Dest2->setText( tr( "Direction" ) );
RB_Dest1->setText( tr( "Point" ) );
GroupDest2->setTitle( QString::null );
GroupDest3->setTitle( QString::null );
GroupButtons->setTitle( QString::null );
buttonEnd->setText( tr( "End Sketch" ) );
buttonClose->setText( tr( "Close Sketch" ) );
buttonCancel->setText( tr( "&Cancel" ) );
buttonHelp->setText( tr( "&Help" ) );
} }

9
src/EntityGUI/EntityGUI_Skeleton_QTD.h
View File

@ -20,7 +20,7 @@
/**************************************************************************** /****************************************************************************
** Form interface generated from reading ui file 'EntityGUI_Skeleton_QTD.ui' ** Form interface generated from reading ui file 'EntityGUI_Skeleton_QTD.ui'
** **
** Created: Fri Mar 17 15:47:13 2006 ** Created: Tue Mar 13 14:04:42 2007
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -36,9 +36,9 @@ class QVBoxLayout;
class QHBoxLayout; class QHBoxLayout;
class QGridLayout; class QGridLayout;
class QSpacerItem; class QSpacerItem;
class QGroupBox;
class QButtonGroup; class QButtonGroup;
class QRadioButton; class QRadioButton;
class QGroupBox;
class QPushButton; class QPushButton;
class EntityGUI_Skeleton_QTD : public QDialog class EntityGUI_Skeleton_QTD : public QDialog
@ -49,7 +49,6 @@ public:
EntityGUI_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); EntityGUI_Skeleton_QTD( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
~EntityGUI_Skeleton_QTD(); ~EntityGUI_Skeleton_QTD();
QGroupBox* GroupVal;
QButtonGroup* GroupConstructors; QButtonGroup* GroupConstructors;
QRadioButton* RadioButton1; QRadioButton* RadioButton1;
QRadioButton* RadioButton2; QRadioButton* RadioButton2;
@ -57,8 +56,6 @@ public:
QButtonGroup* GroupDest1; QButtonGroup* GroupDest1;
QRadioButton* RB_Dest2; QRadioButton* RB_Dest2;
QRadioButton* RB_Dest1; QRadioButton* RB_Dest1;
QButtonGroup* GroupDest2;
QButtonGroup* GroupDest3;
QGroupBox* GroupButtons; QGroupBox* GroupButtons;
QPushButton* buttonEnd; QPushButton* buttonEnd;
QPushButton* buttonClose; QPushButton* buttonClose;
@ -74,8 +71,6 @@ protected:
QGridLayout* Layout5; QGridLayout* Layout5;
QGridLayout* GroupDest1Layout; QGridLayout* GroupDest1Layout;
QGridLayout* Layout4; QGridLayout* Layout4;
QGridLayout* GroupDest2Layout;
QGridLayout* GroupDest3Layout;
QHBoxLayout* GroupButtonsLayout; QHBoxLayout* GroupButtonsLayout;
QHBoxLayout* Layout3; QHBoxLayout* Layout3;
QSpacerItem* Spacer1; QSpacerItem* Spacer1;

4
src/EntityGUI/EntityGUI_SketcherDlg.cxx
View File

@ -82,10 +82,6 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
buttonClose->setText(tr("GEOM_BUT_CLOSE_SKETCH")); buttonClose->setText(tr("GEOM_BUT_CLOSE_SKETCH"));
buttonHelp->setText(tr("GEOM_BUT_HELP")); buttonHelp->setText(tr("GEOM_BUT_HELP"));
GroupVal->close(TRUE);
GroupDest2->close(TRUE);
GroupDest3->close(TRUE);
QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT"))); QPixmap image0(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_SELECT")));
QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_UNDO"))); QPixmap image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_UNDO")));
QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REDO"))); QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REDO")));

109
src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui
View File

@ -20,9 +20,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="caption">
<string>EntityGUI_Skeleton_QTD</string>
</property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -47,22 +44,6 @@
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<widget class="QGroupBox" row="2" column="0">
<property name="name">
<cstring>GroupVal</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string></string>
</property>
</widget>
<widget class="QButtonGroup" row="0" column="0"> <widget class="QButtonGroup" row="0" column="0">
<property name="name"> <property name="name">
<cstring>GroupConstructors</cstring> <cstring>GroupConstructors</cstring>
@ -75,9 +56,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string>Element Type</string>
</property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -106,17 +84,11 @@
<property name="name"> <property name="name">
<cstring>RadioButton1</cstring> <cstring>RadioButton1</cstring>
</property> </property>
<property name="text">
<string>Segment</string>
</property>
</widget> </widget>
<widget class="QRadioButton"> <widget class="QRadioButton">
<property name="name"> <property name="name">
<cstring>RadioButton2</cstring> <cstring>RadioButton2</cstring>
</property> </property>
<property name="text">
<string>Arc</string>
</property>
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
@ -134,9 +106,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string>Destination</string>
</property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -173,9 +142,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string>Type</string>
</property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -204,76 +170,16 @@
<property name="name"> <property name="name">
<cstring>RB_Dest2</cstring> <cstring>RB_Dest2</cstring>
</property> </property>
<property name="text">
<string>Direction</string>
</property>
</widget> </widget>
<widget class="QRadioButton" row="0" column="0"> <widget class="QRadioButton" row="0" column="0">
<property name="name"> <property name="name">
<cstring>RB_Dest1</cstring> <cstring>RB_Dest1</cstring>
</property> </property>
<property name="text">
<string>Point</string>
</property>
</widget> </widget>
</grid> </grid>
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QButtonGroup" row="1" column="0">
<property name="name">
<cstring>GroupDest2</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string></string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="margin">
<number>11</number>
</property>
<property name="spacing">
<number>6</number>
</property>
</grid>
</widget>
<widget class="QButtonGroup" row="1" column="1">
<property name="name">
<cstring>GroupDest3</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string></string>
</property>
<grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
<property name="margin">
<number>11</number>
</property>
<property name="spacing">
<number>6</number>
</property>
</grid>
</widget>
</grid> </grid>
</widget> </widget>
</grid> </grid>
@ -290,9 +196,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string></string>
</property>
<hbox> <hbox>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -321,17 +224,11 @@
<property name="name"> <property name="name">
<cstring>buttonEnd</cstring> <cstring>buttonEnd</cstring>
</property> </property>
<property name="text">
<string>End Sketch</string>
</property>
</widget> </widget>
<widget class="QPushButton"> <widget class="QPushButton">
<property name="name"> <property name="name">
<cstring>buttonClose</cstring> <cstring>buttonClose</cstring>
</property> </property>
<property name="text">
<string>Close Sketch</string>
</property>
</widget> </widget>
<spacer> <spacer>
<property name="name"> <property name="name">
@ -354,17 +251,11 @@
<property name="name"> <property name="name">
<cstring>buttonCancel</cstring> <cstring>buttonCancel</cstring>
</property> </property>
<property name="text">
<string>&amp;Cancel</string>
</property>
</widget> </widget>
<widget class="QPushButton"> <widget class="QPushButton">
<property name="name"> <property name="name">
<cstring>buttonHelp</cstring> <cstring>buttonHelp</cstring>
</property> </property>
<property name="text">
<string>&amp;Help</string>
</property>
</widget> </widget>
</hbox> </hbox>
</widget> </widget>

5
src/GEOMBase/GEOMBase_Skeleton.cxx
View File

@ -36,6 +36,7 @@
#include "SUIT_Session.h" #include "SUIT_Session.h"
#include "SUIT_MessageBox.h" #include "SUIT_MessageBox.h"
#include <qlabel.h>
#include <qpushbutton.h> #include <qpushbutton.h>
using namespace std; using namespace std;
@ -57,12 +58,14 @@ GEOMBase_Skeleton::GEOMBase_Skeleton(GeometryGUI* theGeometryGUI, QWidget* paren
if (!name) if (!name)
setName("GEOMBase_Skeleton"); setName("GEOMBase_Skeleton");
GroupBoxName->setTitle(tr("GEOM_RESULT_NAME_GRP"));
NameLabel->setText(tr("GEOM_RESULT_NAME_LBL"));
buttonCancel->setText(tr("GEOM_BUT_CLOSE")); buttonCancel->setText(tr("GEOM_BUT_CLOSE"));
buttonOk->setText(tr("GEOM_BUT_OK")); buttonOk->setText(tr("GEOM_BUT_OK"));
buttonApply->setText(tr("GEOM_BUT_APPLY")); buttonApply->setText(tr("GEOM_BUT_APPLY"));
buttonHelp->setText(tr("GEOM_BUT_HELP")); buttonHelp->setText(tr("GEOM_BUT_HELP"));
GroupMedium->close(TRUE);
resize(0, 0); resize(0, 0);
Init(); Init();

14
src/GEOMGUI/GEOMGUI_Selection.cxx
View File

@ -205,14 +205,14 @@ GEOM::GEOM_Object_ptr GEOMGUI_Selection::getObject( const int index ) const
return GEOM::GEOM_Object::_nil(); return GEOM::GEOM_Object::_nil();
} }
QString GEOMGUI_Selection:: selectionMode() const QString GEOMGUI_Selection::selectionMode() const
{ {
SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication()); SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication());
if (app) { if (app) {
GeometryGUI* aGeomGUI = dynamic_cast<GeometryGUI*>( app->module( "Geometry" ) ); GeometryGUI* aGeomGUI = dynamic_cast<GeometryGUI*>( app->module( "Geometry" ) );
if(aGeomGUI) if (aGeomGUI) {
switch(aGeomGUI->getLocalSelectionMode()) switch (aGeomGUI->getLocalSelectionMode())
{ {
case GEOM_POINT : return "VERTEX"; case GEOM_POINT : return "VERTEX";
case GEOM_EDGE : return "EDGE"; case GEOM_EDGE : return "EDGE";
case GEOM_WIRE : return "WIRE"; case GEOM_WIRE : return "WIRE";
@ -222,6 +222,8 @@ QString GEOMGUI_Selection:: selectionMode() const
case GEOM_COMPOUND : return "COMPOUND"; case GEOM_COMPOUND : return "COMPOUND";
case GEOM_ALLOBJECTS : return "ALL"; case GEOM_ALLOBJECTS : return "ALL";
default: return ""; default: return "";
} }
}
} }
return "";
} }

6
src/GEOMGUI/GEOM_msg_en.po
View File

@ -2942,6 +2942,12 @@ msgstr "Rename"
msgid "NAME_LBL" msgid "NAME_LBL"
msgstr "Name: " msgstr "Name: "
msgid "GEOM_RESULT_NAME_GRP"
msgstr "Result name"
msgid "GEOM_RESULT_NAME_LBL"
msgstr "Name"
msgid "GEOM_ERR_GET_ENGINE" msgid "GEOM_ERR_GET_ENGINE"
msgstr "Failed to obtain GEOM Engine component. Reload Geometry module and try again." msgstr "Failed to obtain GEOM Engine component. Reload Geometry module and try again."

2
src/GroupGUI/GroupGUI_GroupDlg.h
View File

@ -32,6 +32,7 @@
#include <TopAbs_ShapeEnum.hxx> #include <TopAbs_ShapeEnum.hxx>
class QGroupBox;
class QLineEdit; class QLineEdit;
class QListBox; class QListBox;
@ -89,6 +90,7 @@ private:
GEOM::GEOM_Object_var myMainObj; GEOM::GEOM_Object_var myMainObj;
GEOM::GEOM_Object_var myGroup; GEOM::GEOM_Object_var myGroup;
QGroupBox* GroupMedium;
QPushButton* mySelBtn; QPushButton* mySelBtn;
QLineEdit* myMainName; QLineEdit* myMainName;
QPushButton* mySelSubBtn; QPushButton* mySelSubBtn;

4
src/MeasureGUI/MeasureGUI_Skeleton.cxx
View File

@ -61,12 +61,11 @@ MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI* GUI,
GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ), GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
myGeomGUI( GUI ) myGeomGUI( GUI )
{ {
mySelBtn = 0; mySelBtn = 0;
mySelEdit = 0; mySelEdit = 0;
myDisplayer = 0; myDisplayer = 0;
myHelpFileName = ""; myHelpFileName = "";
if ( !name ) if ( !name )
setName( "MeasureGUI_Skeleton" ); setName( "MeasureGUI_Skeleton" );
@ -75,7 +74,6 @@ MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI* GUI,
buttonClose->setAutoDefault( false ); buttonClose->setAutoDefault( false );
GroupMedium->close( TRUE );
resize( 350, 0 ); resize( 350, 0 );
} }

14
src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx
View File

@ -20,7 +20,7 @@
/**************************************************************************** /****************************************************************************
** Form implementation generated from reading ui file 'MeasureGUI_Skeleton_QTD.ui' ** Form implementation generated from reading ui file 'MeasureGUI_Skeleton_QTD.ui'
** **
** Created: Tue Mar 21 10:10:08 2006 ** Created: Tue Mar 13 14:20:24 2007
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -96,11 +96,6 @@ MeasureGUI_Skeleton_QTD::MeasureGUI_Skeleton_QTD( QWidget* parent, const char* n
Layout1->addWidget( GroupConstructors, 0, 0 ); Layout1->addWidget( GroupConstructors, 0, 0 );
GroupMedium = new QGroupBox( this, "GroupMedium" );
GroupMedium->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)7, 0, 0, GroupMedium->sizePolicy().hasHeightForWidth() ) );
Layout1->addWidget( GroupMedium, 1, 0 );
MeasureGUI_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 ); MeasureGUI_Skeleton_QTDLayout->addLayout( Layout1, 0, 0 );
languageChange(); languageChange();
resize( QSize(228, 266).expandedTo(minimumSizeHint()) ); resize( QSize(228, 266).expandedTo(minimumSizeHint()) );
@ -121,12 +116,5 @@ MeasureGUI_Skeleton_QTD::~MeasureGUI_Skeleton_QTD()
*/ */
void MeasureGUI_Skeleton_QTD::languageChange() void MeasureGUI_Skeleton_QTD::languageChange()
{ {
setCaption( tr( "MeasureGUI_Skeleton_QTD" ) );
GroupButtons->setTitle( QString::null );
buttonClose->setText( tr( "&Close" ) );
buttonHelp->setText( tr( "&Help" ) );
GroupConstructors->setTitle( QString::null );
RadioButton1->setText( QString::null );
GroupMedium->setTitle( QString::null );
} }

3
src/MeasureGUI/MeasureGUI_Skeleton_QTD.h
View File

@ -20,7 +20,7 @@
/**************************************************************************** /****************************************************************************
** Form interface generated from reading ui file 'MeasureGUI_Skeleton_QTD.ui' ** Form interface generated from reading ui file 'MeasureGUI_Skeleton_QTD.ui'
** **
** Created: Tue Mar 21 10:10:08 2006 ** Created: Tue Mar 13 14:20:20 2007
** by: The User Interface Compiler ($Id$) ** by: The User Interface Compiler ($Id$)
** **
** WARNING! All changes made in this file will be lost! ** WARNING! All changes made in this file will be lost!
@ -54,7 +54,6 @@ public:
QPushButton* buttonHelp; QPushButton* buttonHelp;
QButtonGroup* GroupConstructors; QButtonGroup* GroupConstructors;
QRadioButton* RadioButton1; QRadioButton* RadioButton1;
QGroupBox* GroupMedium;
protected: protected:
QGridLayout* MeasureGUI_Skeleton_QTDLayout; QGridLayout* MeasureGUI_Skeleton_QTDLayout;

34
src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui
View File

@ -20,9 +20,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="caption">
<string>MeasureGUI_Skeleton_QTD</string>
</property>
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
@ -62,9 +59,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string></string>
</property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -110,17 +104,11 @@
<property name="name"> <property name="name">
<cstring>buttonClose</cstring> <cstring>buttonClose</cstring>
</property> </property>
<property name="text">
<string>&amp;Close</string>
</property>
</widget> </widget>
<widget class="QPushButton" row="0" column="2"> <widget class="QPushButton" row="0" column="2">
<property name="name"> <property name="name">
<cstring>buttonHelp</cstring> <cstring>buttonHelp</cstring>
</property> </property>
<property name="text">
<string>&amp;Help</string>
</property>
</widget> </widget>
</grid> </grid>
</widget> </widget>
@ -138,9 +126,6 @@
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="title">
<string></string>
</property>
<grid> <grid>
<property name="name"> <property name="name">
<cstring>unnamed</cstring> <cstring>unnamed</cstring>
@ -169,30 +154,11 @@
<property name="name"> <property name="name">
<cstring>RadioButton1</cstring> <cstring>RadioButton1</cstring>
</property> </property>
<property name="text">
<string></string>
</property>
</widget> </widget>
</hbox> </hbox>
</widget> </widget>
</grid> </grid>
</widget> </widget>
<widget class="QGroupBox" row="1" column="0">
<property name="name">
<cstring>GroupMedium</cstring>
</property>
<property name="sizePolicy">
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string></string>
</property>
</widget>
</grid> </grid>
</widget> </widget>
</grid> </grid>