From 8da64e25180e7bcea8c2cc9379727b5a6344b221 Mon Sep 17 00:00:00 2001 From: rnc Date: Fri, 16 Mar 2012 15:59:29 +0000 Subject: [PATCH] tiny modifications --- .../OperationGUI_ExtrudedFeatureDlg.cxx | 35 +++++++------------ 1 file changed, 12 insertions(+), 23 deletions(-) diff --git a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx index 44e8c46d7..c6ae8d783 100644 --- a/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx +++ b/src/OperationGUI/OperationGUI_ExtrudedFeatureDlg.cxx @@ -39,13 +39,6 @@ #include // OCCT Includes -// #include -// #include -// #include -// #include -// #include -// #include -// #include #include #include @@ -75,12 +68,12 @@ OperationGUI_ExtrudedFeatureDlg::OperationGUI_ExtrudedFeatureDlg(const int theOp { case OperationGUI::BOSS: image0 = QPixmap(aResMgr->loadPixmap("GEOM", tr("ICO_EXTRUDED_BOSS"))); - aTitle = tr("GEOM_EXTRUDED_BOSS"); + aTitle = tr("GEOM_EXTRUDED_BOSS_TITLE"); setHelpFileName("extruded_boss_operation_page.html"); break; case OperationGUI::CUT: image0 = QPixmap( aResMgr->loadPixmap("GEOM", tr("ICO_EXTRUDED_CUT"))); - aTitle = tr("GEOM_EXTRUDED_CUT"); + aTitle = tr("GEOM_EXTRUDED_CUT_TITLE"); setHelpFileName("extruded_cut_operation_page.html"); break; } @@ -168,11 +161,19 @@ void OperationGUI_ExtrudedFeatureDlg::Init() connect(((SalomeApp_Application*)(SUIT_Session::session()->activeApplication()))->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); - initName(mainFrame()->GroupConstructors->title()); + switch (myOperation) + { + case OperationGUI::BOSS: + initName(tr("GEOM_EXTRUDED_BOSS")); + break; + case OperationGUI::CUT: + initName(tr("GEOM_EXTRUDED_CUT")); + break; + } mainFrame()->RadioButton1->setFocus(); - globalSelection(GEOM_ALLSHAPES); //TODO à changer + globalSelection(GEOM_ALLSHAPES); myGroup->PushButton1->click(); SelectionIntoArgument(); @@ -219,24 +220,12 @@ void OperationGUI_ExtrudedFeatureDlg::SetEditCurrentArgument() myGroup->PushButton2->setDown(false); myGroup->LineEdit2->setEnabled(false); - -// globalSelection(); // close local selection } else if (send == myGroup->PushButton2) { myEditCurrentArgument = myGroup->LineEdit2; myGroup->PushButton1->setDown(false); myGroup->LineEdit1->setEnabled(false); - -// globalSelection(); // close local selection to clear it - -// // localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); -// if (myObject1) -// { -// localSelection( myObject1.get(), TopAbs_FACE ); -// // localSelection( myObject1.get(), TopAbs_EDGE ); -// } -// /* localSelection( GEOM::GEOM_Object::_nil(), TopAbs_EDGE ); */ } // enable line edit -- 2.39.2