From 84055170e9875a17b2bff9ad5b41dc42c6dbcbbc Mon Sep 17 00:00:00 2001 From: skv Date: Fri, 10 Oct 2014 11:17:09 +0400 Subject: [PATCH] Change in name generation + behavior of apply buttons --- doc/salome/gui/GEOM/images/repair10.png | Bin 11569 -> 12380 bytes src/GEOMGUI/GEOM_msg_en.ts | 2 +- src/RepairGUI/RepairGUI_FreeFacesDlg.cxx | 34 +++++++++++++++-------- src/RepairGUI/RepairGUI_FreeFacesDlg.h | 3 +- 4 files changed, 24 insertions(+), 15 deletions(-) diff --git a/doc/salome/gui/GEOM/images/repair10.png b/doc/salome/gui/GEOM/images/repair10.png index 5db64674207bdfdc68fd8aed87bb9af4615924c0..9c67419a585812dadf59ce6a9cf5893769481ce7 100755 GIT binary patch literal 12380 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 literal 11569 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 CnAhC^ diff --git a/src/GEOMGUI/GEOM_msg_en.ts b/src/GEOMGUI/GEOM_msg_en.ts index 75ef896f8..bd50af4ce 100644 --- a/src/GEOMGUI/GEOM_msg_en.ts +++ b/src/GEOMGUI/GEOM_msg_en.ts @@ -838,7 +838,7 @@ Please, select face, shell or solid and try again GEOM_FREE_FACES_NAME - Free_face_%1 + Free_face GEOM_FREE_FACES_TITLE diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx index 8cc5a6560..00e08c13a 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx +++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.cxx @@ -143,6 +143,9 @@ void RepairGUI_FreeFacesDlg::Init() connect(myGeomGUI->getApp()->selectionMgr(), SIGNAL(currentSelectionChanged()), this, SLOT(SelectionIntoArgument())); + initName(tr("GEOM_FREE_FACES_NAME")); + buttonOk()->setEnabled(false); + buttonApply()->setEnabled(false); activateSelection(); SelectionIntoArgument(); } @@ -165,6 +168,8 @@ bool RepairGUI_FreeFacesDlg::ClickOnApply() { if (!onAccept()) return false; + + initName(); return true; } @@ -208,6 +213,8 @@ void RepairGUI_FreeFacesDlg::SelectionIntoArgument() aSelMgr->selectedObjects(aSelList); if ( aSelList.Extent() != 1 ) { + buttonOk()->setEnabled(false); + buttonApply()->setEnabled(false); return; } @@ -215,6 +222,8 @@ void RepairGUI_FreeFacesDlg::SelectionIntoArgument() GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); if ( !GEOMBase::IsShape( anObj ) ) { + buttonOk()->setEnabled(false); + buttonApply()->setEnabled(false); return; } else { myObj = anObj; @@ -265,11 +274,15 @@ bool RepairGUI_FreeFacesDlg::execute( ObjectList& objects ) TopoDS_Shape aSelShape; TopoDS_Shape aFace; TopTools_IndexedMapOfShape anIndices; + int aNbObj = 0; + if ( !myObj->_is_nil() && GEOMBase::GetShape( myObj, aSelShape ) ) { myEdit->setText( GEOMBase::GetName( myObj ) ); QString aMess; if ( !isValid( aMess ) ) { erasePreview( true ); + buttonOk()->setEnabled(false); + buttonApply()->setEnabled(false); return false; } @@ -315,6 +328,8 @@ bool RepairGUI_FreeFacesDlg::execute( ObjectList& objects ) catch( const SALOME::SALOME_Exception& e ) { SalomeApp_Tools::QtCatchCorbaException( e ); + buttonOk()->setEnabled(false); + buttonApply()->setEnabled(false); return false; } } @@ -322,12 +337,18 @@ bool RepairGUI_FreeFacesDlg::execute( ObjectList& objects ) // Create sub-objects GEOM::ListOfGO_var aList = anOper->MakeSubShapes(myObj, aFaceLst); - for (i = 0, n = aList->length(); i < n; i++) { + aNbObj = aList->length(); + + for (i = 0; i < aNbObj; i++) { objects.push_back(GEOM::GEOM_Object::_duplicate(aList[i])); } aResult = true; } + + buttonOk()->setEnabled(aNbObj > 0); + buttonApply()->setEnabled(aNbObj > 0); + return aResult; } @@ -342,17 +363,6 @@ GEOM_Displayer* RepairGUI_FreeFacesDlg::getDisplayer() return myDisplayer; } -//================================================================ -// Function : getNewObjectName -// Purpose : Redefine this method to return proper name for a new object -//================================================================ -QString RepairGUI_FreeFacesDlg::getNewObjectName (int currObj) const -{ - QString aName = tr("GEOM_FREE_FACES_NAME").arg(currObj); - - return aName; -} - //================================================================ // Function : getFather // Purpose : Get father object for object to be added in study diff --git a/src/RepairGUI/RepairGUI_FreeFacesDlg.h b/src/RepairGUI/RepairGUI_FreeFacesDlg.h index 2fa420285..2e3f12f7f 100644 --- a/src/RepairGUI/RepairGUI_FreeFacesDlg.h +++ b/src/RepairGUI/RepairGUI_FreeFacesDlg.h @@ -50,8 +50,7 @@ protected: virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual bool isValid( QString& ); virtual bool execute( ObjectList& ); - virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); - virtual QString getNewObjectName (int CurrObj = -1) const; + virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); private: void Init();