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

diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.cxx b/src/DlgRef/DlgRef_Skeleton_QTD.cxx
index dddb3e08729486b330af5085dacf29c6445a3eb8..0e2b081bcc8182aa612344220525399339a9fc42 100644 (file)
--- a/src/DlgRef/DlgRef_Skeleton_QTD.cxx
+++ b/src/DlgRef/DlgRef_Skeleton_QTD.cxx
@@ -20,7 +20,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** 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"); 
 
-    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->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)7, (QSizePolicy::SizeType)0, 0, 0, GroupButtons->sizePolicy().hasHeightForWidth() ) );
     GroupButtons->setColumnLayout(0, Qt::Vertical );
@@ -155,19 +150,5 @@ DlgRef_Skeleton_QTD::~DlgRef_Skeleton_QTD()
  */
 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" ) );
 }
 

diff --git a/src/DlgRef/DlgRef_Skeleton_QTD.h b/src/DlgRef/DlgRef_Skeleton_QTD.h
index 107b316a073836ff46058e0945d27156533ce139..4148024d954136b83c3246956b61a6209d20d2d9 100644 (file)
--- a/src/DlgRef/DlgRef_Skeleton_QTD.h
+++ b/src/DlgRef/DlgRef_Skeleton_QTD.h
@@ -20,7 +20,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** 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();
 
-    QGroupBox* GroupMedium;
     QGroupBox* GroupButtons;
     QPushButton* buttonOk;
     QPushButton* buttonApply;

diff --git a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
index b675f277cecd81f5ee133e0c29f8beee8b7bbc84..8979116e8844322aee96f0303fc173a54ed19149 100644 (file)
--- a/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
+++ b/src/DlgRef/UIFiles/DlgRef_Skeleton_QTD.ui
@@ -20,9 +20,6 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="caption">
-        <string>DlgRef_Skeleton_QTD</string>
-    </property>
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
@@ -50,22 +47,6 @@
                 <property name="spacing">
                     <number>6</number>
                 </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">
                     <property name="name">
                         <cstring>GroupButtons</cstring>
@@ -78,9 +59,6 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="title">
-                        <string></string>
-                    </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -109,17 +87,11 @@
                                     <property name="name">
                                         <cstring>buttonOk</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>&amp;Ok</string>
-                                    </property>
                                 </widget>
                                 <widget class="QPushButton">
                                     <property name="name">
                                         <cstring>buttonApply</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>&amp;Apply</string>
-                                    </property>
                                 </widget>
                                 <spacer>
                                     <property name="name">
@@ -142,17 +114,11 @@
                                     <property name="name">
                                         <cstring>buttonCancel</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>&amp;Cancel</string>
-                                    </property>
                                 </widget>
                                <widget class="QPushButton">
                                     <property name="name">
                                         <cstring>buttonHelp</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>&amp;Help</string>
-                                    </property>
                                 </widget>
                             </hbox>
                         </widget>
@@ -170,9 +136,6 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="title">
-                        <string></string>
-                    </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -201,33 +164,21 @@
                                     <property name="name">
                                         <cstring>RadioButton1</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
                                 </widget>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton2</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
                                 </widget>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton3</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
                                 </widget>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton4</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
                                 </widget>
                             </hbox>
                         </widget>
@@ -237,9 +188,6 @@
                     <property name="name">
                         <cstring>GroupBoxName</cstring>
                     </property>
-                    <property name="title">
-                        <string>Result name</string>
-                    </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -273,9 +221,6 @@
                                     <property name="name">
                                         <cstring>NameLabel</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>Name</string>
-                                    </property>
                                 </widget>
                             </grid>
                         </widget>

diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx b/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx
index 863f45fe98e0ec09ea8c8d28c92fc9ce7daf1818..302635f39d01d728f5294383223dab45a98b933f 100644 (file)
--- a/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx
+++ b/src/EntityGUI/EntityGUI_Skeleton_QTD.cxx
@@ -20,7 +20,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -30,9 +30,9 @@
 
 #include <qvariant.h>
 #include <qpushbutton.h>
-#include <qgroupbox.h>
 #include <qbuttongroup.h>
 #include <qradiobutton.h>
+#include <qgroupbox.h>
 #include <qlayout.h>
 #include <qtooltip.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"); 
 
-    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->setSizePolicy( QSizePolicy( (QSizePolicy::SizeType)5, (QSizePolicy::SizeType)0, 0, 0, GroupConstructors->sizePolicy().hasHeightForWidth() ) );
     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 );
 
-    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 );
 
     Layout1->addWidget( GroupDest, 1, 0 );
@@ -190,21 +165,5 @@ EntityGUI_Skeleton_QTD::~EntityGUI_Skeleton_QTD()
  */
 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" ) );
 }
 

diff --git a/src/EntityGUI/EntityGUI_Skeleton_QTD.h b/src/EntityGUI/EntityGUI_Skeleton_QTD.h
index ca95dc439ccb3ea4fda617cdb7fb7597bc712826..8c68a30bd52d6c33805a3b238532c2d3029ff344 100644 (file)
--- a/src/EntityGUI/EntityGUI_Skeleton_QTD.h
+++ b/src/EntityGUI/EntityGUI_Skeleton_QTD.h
@@ -20,7 +20,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -36,9 +36,9 @@ class QVBoxLayout;
 class QHBoxLayout;
 class QGridLayout;
 class QSpacerItem;
-class QGroupBox;
 class QButtonGroup;
 class QRadioButton;
+class QGroupBox;
 class QPushButton;
 
 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();
 
-    QGroupBox* GroupVal;
     QButtonGroup* GroupConstructors;
     QRadioButton* RadioButton1;
     QRadioButton* RadioButton2;
@@ -57,8 +56,6 @@ public:
     QButtonGroup* GroupDest1;
     QRadioButton* RB_Dest2;
     QRadioButton* RB_Dest1;
-    QButtonGroup* GroupDest2;
-    QButtonGroup* GroupDest3;
     QGroupBox* GroupButtons;
     QPushButton* buttonEnd;
     QPushButton* buttonClose;
@@ -74,8 +71,6 @@ protected:
     QGridLayout* Layout5;
     QGridLayout* GroupDest1Layout;
     QGridLayout* Layout4;
-    QGridLayout* GroupDest2Layout;
-    QGridLayout* GroupDest3Layout;
     QHBoxLayout* GroupButtonsLayout;
     QHBoxLayout* Layout3;
     QSpacerItem* Spacer1;

diff --git a/src/EntityGUI/EntityGUI_SketcherDlg.cxx b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
index 1e6343cd24b1c6df600aad500e33e2e4fbea5888..c435a3dd1239309378cbc16af2a1319ea7eac054 100644 (file)
--- a/src/EntityGUI/EntityGUI_SketcherDlg.cxx
+++ b/src/EntityGUI/EntityGUI_SketcherDlg.cxx
@@ -82,10 +82,6 @@ EntityGUI_SketcherDlg::EntityGUI_SketcherDlg(GeometryGUI* GUI, QWidget* parent,
   buttonClose->setText(tr("GEOM_BUT_CLOSE_SKETCH"));
   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 image1(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_UNDO")));
   QPixmap image2(SUIT_Session::session()->resourceMgr()->loadPixmap("GEOM",tr("ICON_DLG_REDO")));

diff --git a/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui b/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui
index c257a8086550a369caca1dabd8a24e64b50abc51..cdcd86400ae51d578b113f3f4331dbfa814ee1d2 100644 (file)
--- a/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui
+++ b/src/EntityGUI/UIFiles/EntityGUI_Skeleton_QTD.ui
@@ -20,9 +20,6 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="caption">
-        <string>EntityGUI_Skeleton_QTD</string>
-    </property>
     <grid>
         <property name="name">
             <cstring>unnamed</cstring>
@@ -47,22 +44,6 @@
                 <property name="spacing">
                     <number>6</number>
                 </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">
                     <property name="name">
                         <cstring>GroupConstructors</cstring>
@@ -75,9 +56,6 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="title">
-                        <string>Element Type</string>
-                    </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -106,17 +84,11 @@
                                     <property name="name">
                                         <cstring>RadioButton1</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>Segment</string>
-                                    </property>
                                 </widget>
                                 <widget class="QRadioButton">
                                     <property name="name">
                                         <cstring>RadioButton2</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>Arc</string>
-                                    </property>
                                 </widget>
                             </hbox>
                         </widget>
@@ -134,9 +106,6 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="title">
-                        <string>Destination</string>
-                    </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -173,9 +142,6 @@
                                             <verstretch>0</verstretch>
                                         </sizepolicy>
                                     </property>
-                                    <property name="title">
-                                        <string>Type</string>
-                                    </property>
                                     <grid>
                                         <property name="name">
                                             <cstring>unnamed</cstring>
@@ -204,76 +170,16 @@
                                                     <property name="name">
                                                         <cstring>RB_Dest2</cstring>
                                                     </property>
-                                                    <property name="text">
-                                                        <string>Direction</string>
-                                                    </property>
                                                 </widget>
                                                 <widget class="QRadioButton" row="0" column="0">
                                                     <property name="name">
                                                         <cstring>RB_Dest1</cstring>
                                                     </property>
-                                                    <property name="text">
-                                                        <string>Point</string>
-                                                    </property>
                                                 </widget>
                                             </grid>
                                         </widget>
                                     </grid>
                                 </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>
                         </widget>
                     </grid>
@@ -290,9 +196,6 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="title">
-                        <string></string>
-                    </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -321,17 +224,11 @@
                                     <property name="name">
                                         <cstring>buttonEnd</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>End Sketch</string>
-                                    </property>
                                 </widget>
                                 <widget class="QPushButton">
                                     <property name="name">
                                         <cstring>buttonClose</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>Close Sketch</string>
-                                    </property>
                                 </widget>
                                 <spacer>
                                     <property name="name">
@@ -354,17 +251,11 @@
                                     <property name="name">
                                         <cstring>buttonCancel</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>&amp;Cancel</string>
-                                    </property>
                                 </widget>
                                <widget class="QPushButton">
                                     <property name="name">
                                         <cstring>buttonHelp</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>&amp;Help</string>
-                                    </property>
                                 </widget>
                             </hbox>
                         </widget>

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

diff --git a/src/GEOMGUI/GEOMGUI_Selection.cxx b/src/GEOMGUI/GEOMGUI_Selection.cxx
index 7af013b20b3ebd1c29c335a75a03ba837e148131..029e8922a080e14c14e832cd475b2a8af7a81f99 100644 (file)
--- a/src/GEOMGUI/GEOMGUI_Selection.cxx
+++ b/src/GEOMGUI/GEOMGUI_Selection.cxx
@@ -205,14 +205,14 @@ GEOM::GEOM_Object_ptr GEOMGUI_Selection::getObject( const int index ) const
   return GEOM::GEOM_Object::_nil();
 }
 
-QString GEOMGUI_Selection:: selectionMode() const
-{ 
+QString GEOMGUI_Selection::selectionMode() const
+{
   SalomeApp_Application* app = (SalomeApp_Application*)(SUIT_Session::session()->activeApplication());
   if (app) {
     GeometryGUI* aGeomGUI = dynamic_cast<GeometryGUI*>( app->module( "Geometry" ) );
-    if(aGeomGUI)
-      switch(aGeomGUI->getLocalSelectionMode())
-       {
+    if (aGeomGUI) {
+      switch (aGeomGUI->getLocalSelectionMode())
+      {
        case GEOM_POINT      : return "VERTEX";
        case GEOM_EDGE       : return "EDGE";
        case GEOM_WIRE       : return "WIRE";
@@ -222,6 +222,8 @@ QString GEOMGUI_Selection:: selectionMode() const
        case GEOM_COMPOUND   : return "COMPOUND";
        case GEOM_ALLOBJECTS : return "ALL";
        default: return "";
-       }
+      }
+    }
   }
+  return "";
 }

diff --git a/src/GEOMGUI/GEOM_msg_en.po b/src/GEOMGUI/GEOM_msg_en.po
index b3be4b2f2a418ebd85047c56ae444cfc55bb9641..3a2e2c94daef49e87d1c8291dfe7cef1a76ba451 100644 (file)
--- a/src/GEOMGUI/GEOM_msg_en.po
+++ b/src/GEOMGUI/GEOM_msg_en.po
@@ -2942,6 +2942,12 @@ msgstr "Rename"
 msgid "NAME_LBL"
 msgstr "Name: "
 
+msgid "GEOM_RESULT_NAME_GRP"
+msgstr "Result name"
+
+msgid "GEOM_RESULT_NAME_LBL"
+msgstr "Name"
+
 msgid "GEOM_ERR_GET_ENGINE"
 msgstr "Failed to obtain GEOM Engine component.  Reload Geometry module and try again."
 

diff --git a/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h
index a42fad91e6ec2aadc953f77ff7b60afce66de64f..3e9f34618b6766a1fb9b8341de9c8b2bc0b463c1 100644 (file)
--- a/src/GroupGUI/GroupGUI_GroupDlg.h
+++ b/src/GroupGUI/GroupGUI_GroupDlg.h
@@ -32,6 +32,7 @@
 
 #include <TopAbs_ShapeEnum.hxx>
 
+class QGroupBox;
 class QLineEdit;
 class QListBox;
 
@@ -89,6 +90,7 @@ private:
     GEOM::GEOM_Object_var myMainObj;
     GEOM::GEOM_Object_var myGroup;
 
+    QGroupBox*            GroupMedium;
     QPushButton*          mySelBtn;
     QLineEdit*            myMainName;
     QPushButton*          mySelSubBtn;

diff --git a/src/MeasureGUI/MeasureGUI_Skeleton.cxx b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
index 1c7684c144fcbb5a24c19780cf53f14f659f7838..abcdf63a7be55bdeb327ddd5e6d374267098beae 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_Skeleton.cxx
+++ b/src/MeasureGUI/MeasureGUI_Skeleton.cxx
@@ -61,12 +61,11 @@ MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI*      GUI,
   GEOMBase_Helper( dynamic_cast<SUIT_Desktop*>( parent ) ),
   myGeomGUI( GUI )
 {
-
   mySelBtn = 0;
   mySelEdit = 0;
   myDisplayer = 0;
   myHelpFileName = "";
-  
+
   if ( !name )
     setName( "MeasureGUI_Skeleton" );
 
@@ -75,7 +74,6 @@ MeasureGUI_Skeleton::MeasureGUI_Skeleton( GeometryGUI*      GUI,
 
   buttonClose->setAutoDefault( false );
 
-  GroupMedium->close( TRUE );
   resize( 350, 0 );
 }
 

diff --git a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx
index cc518f461b6c78a6d1af10a84f3cbc994cfd7d1a..5a01f5818d4ac7dc6d0679a5f539dda56f37d1dc 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx
+++ b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.cxx
@@ -20,7 +20,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** 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 );
 
-    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 );
     languageChange();
     resize( QSize(228, 266).expandedTo(minimumSizeHint()) );
@@ -121,12 +116,5 @@ MeasureGUI_Skeleton_QTD::~MeasureGUI_Skeleton_QTD()
  */
 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 );
 }
 

diff --git a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h
index aefba01300097668e46c5cf8a80d1ac697560d36..0551ff942caed0c91f6927b5421f0cffdb4a6db8 100644 (file)
--- a/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h
+++ b/src/MeasureGUI/MeasureGUI_Skeleton_QTD.h
@@ -20,7 +20,7 @@
 /****************************************************************************
 ** 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$)
 **
 ** WARNING! All changes made in this file will be lost!
@@ -54,7 +54,6 @@ public:
     QPushButton* buttonHelp;
     QButtonGroup* GroupConstructors;
     QRadioButton* RadioButton1;
-    QGroupBox* GroupMedium;
 
 protected:
     QGridLayout* MeasureGUI_Skeleton_QTDLayout;

diff --git a/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui b/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui
index 07f94c80d9a417af775c64aa8824d44b560da4e3..fa012c20391a681f54b5edb3f54608f743c70d8c 100644 (file)
--- a/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui
+++ b/src/MeasureGUI/UIFiles/MeasureGUI_Skeleton_QTD.ui
@@ -20,9 +20,6 @@
             <verstretch>0</verstretch>
         </sizepolicy>
     </property>
-    <property name="caption">
-        <string>MeasureGUI_Skeleton_QTD</string>
-    </property>
     <property name="sizeGripEnabled">
         <bool>true</bool>
     </property>
@@ -62,9 +59,6 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="title">
-                        <string></string>
-                    </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -110,17 +104,11 @@
                                     <property name="name">
                                         <cstring>buttonClose</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>&amp;Close</string>
-                                    </property>
                                 </widget>
                                <widget class="QPushButton" row="0" column="2">
                                     <property name="name">
                                         <cstring>buttonHelp</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string>&amp;Help</string>
-                                    </property>
                                 </widget>
                             </grid>
                         </widget>
@@ -138,9 +126,6 @@
                             <verstretch>0</verstretch>
                         </sizepolicy>
                     </property>
-                    <property name="title">
-                        <string></string>
-                    </property>
                     <grid>
                         <property name="name">
                             <cstring>unnamed</cstring>
@@ -169,30 +154,11 @@
                                     <property name="name">
                                         <cstring>RadioButton1</cstring>
                                     </property>
-                                    <property name="text">
-                                        <string></string>
-                                    </property>
                                 </widget>
                             </hbox>
                         </widget>
                     </grid>
                 </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>
         </widget>
     </grid>