From: jfa Date: Wed, 30 Mar 2011 13:20:55 +0000 (+0000) Subject: CoTech 32: Action 32.3: In GEOM, the function Import() renamed to ImportFile() X-Git-Tag: Start_BR_19998_21191~8 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9e31f81bd01bd5b327b61de1fa28dd1d7ef82ca5;p=modules%2Fgeom.git CoTech 32: Action 32.3: In GEOM, the function Import() renamed to ImportFile() --- diff --git a/doc/salome/gui/GEOM/input/tui_import_export.doc b/doc/salome/gui/GEOM/input/tui_import_export.doc index b423ea3fd..cdd8c4ea0 100644 --- a/doc/salome/gui/GEOM/input/tui_import_export.doc +++ b/doc/salome/gui/GEOM/input/tui_import_export.doc @@ -24,7 +24,7 @@ print "UnitName2 = ", UnitName2 # import shapes Shape1 = geompy.ImportIGES(theFileName1) Shape2 = geompy.ImportIGES(theFileName2) -Shape3 = geompy.Import(theFileName2,"IGES_SCALE") +Shape3 = geompy.ImportFile(theFileName2,"IGES_SCALE") [Xmin1,Xmax1, Ymin1,Ymax1, Zmin1,Zmax1] = geompy.BoundingBox(Shape1) [Xmin2,Xmax2, Ymin2,Ymax2, Zmin2,Zmax2] = geompy.BoundingBox(Shape2) [Xmin3,Xmax3, Ymin3,Ymax3, Zmin3,Zmax3] = geompy.BoundingBox(Shape3) diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl index 006cf9b45..05e030217 100644 --- a/idl/GEOM_Gen.idl +++ b/idl/GEOM_Gen.idl @@ -2939,7 +2939,7 @@ module GEOM * set to 'meter' and result model will be scaled. * \return New GEOM_Object, containing the imported shape. */ - GEOM_Object Import (in string theFileName, in string theFormatName); + GEOM_Object ImportFile (in string theFileName, in string theFormatName); /*! * Get the supported import formats and corresponding patterns for File dialog. diff --git a/idl/GEOM_Superv.idl b/idl/GEOM_Superv.idl index bef0ecdf4..0eb9b049d 100644 --- a/idl/GEOM_Superv.idl +++ b/idl/GEOM_Superv.idl @@ -257,7 +257,7 @@ module GEOM //-----------------------------------------------------------// GEOM_Object MakeCopy (in GEOM_Object theOriginal) ; void Export (in GEOM_Object theObject, in string theFileName, in string theFormatName) ; - GEOM_Object Import (in string theFileName, in string theFormatName) ; + GEOM_Object ImportFile (in string theFileName, in string theFormatName) ; void ImportTranslators (out string_array theFormats, out string_array thePatterns) ; void ExportTranslators (out string_array theFormats, diff --git a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui index 67e158a1b..a1d5853ca 100644 --- a/src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui +++ b/src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui @@ -31,10 +31,21 @@ 6 - - + + + + + 0 + 0 + 0 + 0 + + - + TL1 + + + false @@ -53,8 +64,11 @@ - - + + + + + 0 @@ -64,16 +78,13 @@ - TL1 + TL2 false - - - @@ -86,21 +97,10 @@ - - - - - 0 - 0 - 0 - 0 - - + + - TL2 - - - false + diff --git a/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui b/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui index 366d2d6ee..562f2cef8 100644 --- a/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui +++ b/src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui @@ -72,53 +72,67 @@ - + - + + + + + 0 + 0 + 0 + 0 + + + + TL2 + + + false + + + + + + + + 7 + 0 + 0 + 0 + + + + + - + - - - - + - + - - - - Qt::Vertical - - - - 20 - 21 - - - - diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx index efb8255fa..02b601a32 100644 --- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx +++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx @@ -243,7 +243,7 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import //Make a Python command if( theFormatName != "IGES_UNIT" ) { - GEOM::TPythonDump(aFunction) << result << " = geompy.Import(\"" + GEOM::TPythonDump(aFunction) << result << " = geompy.ImportFile(\"" << theFileName.ToCString() << "\", \"" << theFormatName.ToCString() << "\")"; } diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx index b53b5a538..5f8442776 100644 --- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx +++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx @@ -634,7 +634,7 @@ bool GEOMToolsGUI::Import() // skl 29.05.2009 if ( aCurrentType == "IGES" ) { - GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, "IGES_UNIT" ); + GEOM::GEOM_Object_var anObj = aInsOp->ImportFile( fileN, "IGES_UNIT" ); bool needConvert = false; TCollection_AsciiString aUnitName = aInsOp->GetErrorCode(); if ( aUnitName.SubString( 1, 4 ) == "UNIT" ) @@ -682,7 +682,7 @@ bool GEOMToolsGUI::Import() } // if ( acisAnswer != YesToAll && acisAnswer != NoToAll ) } // else if ( aCurrentType == "ACIS" ) - GEOM::GEOM_Object_var anObj = aInsOp->Import( fileN, fileT ); + GEOM::GEOM_Object_var anObj = aInsOp->ImportFile( fileN, fileT ); if ( !anObj->_is_nil() && aInsOp->IsDone() ) { QString aPublishObjName = diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.cc b/src/GEOM_I/GEOM_IInsertOperations_i.cc index 382465d83..c3941407a 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.cc +++ b/src/GEOM_I/GEOM_IInsertOperations_i.cc @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #ifdef WNT #pragma warning( disable:4786 ) @@ -115,10 +114,10 @@ void GEOM_IInsertOperations_i::Export //============================================================================= /*! - * Import + * ImportFile */ //============================================================================= -GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::Import +GEOM::GEOM_Object_ptr GEOM_IInsertOperations_i::ImportFile (const char* theFileName, const char* theFormatName) { @@ -225,7 +224,7 @@ CORBA::Long GEOM_IInsertOperations_i::LoadTexture(const char* theTextureFile) } CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Long theHeight, - const SALOMEDS::TMPFile& theTexture) + const SALOMEDS::TMPFile& theTexture) { GetOperations()->SetNotDone(); Handle(TDataStd_HArray1OfByte) aTexture; @@ -237,9 +236,9 @@ CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Lo return GetOperations()->AddTexture( theWidth, theHeight, aTexture ); } -SALOMEDS::TMPFile* GEOM_IInsertOperations_i::GetTexture(CORBA::Long theID, - CORBA::Long& theWidth, - CORBA::Long& theHeight) +SALOMEDS::TMPFile* GEOM_IInsertOperations_i::GetTexture(CORBA::Long theID, + CORBA::Long& theWidth, + CORBA::Long& theHeight) { int aWidth, aHeight; Handle(TDataStd_HArray1OfByte) aTextureImpl = GetOperations()->GetTexture( theID, aWidth, aHeight ); diff --git a/src/GEOM_I/GEOM_IInsertOperations_i.hh b/src/GEOM_I/GEOM_IInsertOperations_i.hh index 34532a305..b921dbad5 100644 --- a/src/GEOM_I/GEOM_IInsertOperations_i.hh +++ b/src/GEOM_I/GEOM_IInsertOperations_i.hh @@ -18,7 +18,6 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// #ifndef _GEOM_IInsertOperations_i_HeaderFile #define _GEOM_IInsertOperations_i_HeaderFile @@ -34,36 +33,36 @@ #include "GEOMImpl_IInsertOperations.hxx" -class GEOM_I_EXPORT GEOM_IInsertOperations_i : +class GEOM_I_EXPORT GEOM_IInsertOperations_i : public virtual POA_GEOM::GEOM_IInsertOperations, public virtual GEOM_IOperations_i { public: GEOM_IInsertOperations_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, - ::GEOMImpl_IInsertOperations* theImpl); + ::GEOMImpl_IInsertOperations* theImpl); ~GEOM_IInsertOperations_i(); GEOM::GEOM_Object_ptr MakeCopy (GEOM::GEOM_Object_ptr theOriginal); void Export (GEOM::GEOM_Object_ptr theOriginal, - const char* theFileName, - const char* theFormatName); + const char* theFileName, + const char* theFormatName); - GEOM::GEOM_Object_ptr Import (const char* theFileName, - const char* theFormatName); + GEOM::GEOM_Object_ptr ImportFile (const char* theFileName, + const char* theFormatName); void ImportTranslators (GEOM::string_array_out theFormats, - GEOM::string_array_out thePatterns); + GEOM::string_array_out thePatterns); void ExportTranslators (GEOM::string_array_out theFormats, - GEOM::string_array_out thePatterns); + GEOM::string_array_out thePatterns); CORBA::Long LoadTexture(const char* theTextureFile); - CORBA::Long AddTexture(CORBA::Long theWidth, CORBA::Long theHeight, - const SALOMEDS::TMPFile& theTexture); - SALOMEDS::TMPFile* GetTexture(CORBA::Long theID, - CORBA::Long& theWidth, - CORBA::Long& theHeight); + CORBA::Long AddTexture(CORBA::Long theWidth, CORBA::Long theHeight, + const SALOMEDS::TMPFile& theTexture); + SALOMEDS::TMPFile* GetTexture(CORBA::Long theID, + CORBA::Long& theWidth, + CORBA::Long& theHeight); GEOM::ListOfLong* GetAllTextures(); diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.cc b/src/GEOM_I_Superv/GEOM_Superv_i.cc index e0ab44df4..dda0a3bcd 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.cc +++ b/src/GEOM_I_Superv/GEOM_Superv_i.cc @@ -1495,14 +1495,14 @@ void GEOM_Superv_i::Export (GEOM::GEOM_Object_ptr theObject, //============================================================================= // Import: //============================================================================= -GEOM::GEOM_Object_ptr GEOM_Superv_i::Import (const char* theFileName, - const char* theFormatName) +GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportFile (const char* theFileName, + const char* theFormatName) { - beginService( " GEOM_Superv_i::Import" ); - MESSAGE("GEOM_Superv_i::Import"); + beginService( " GEOM_Superv_i::ImportFile" ); + MESSAGE("GEOM_Superv_i::ImportFile"); getInsOp(); - GEOM::GEOM_Object_ptr anObj = myInsOp->Import(theFileName, theFormatName); - endService( " GEOM_Superv_i::Import" ); + GEOM::GEOM_Object_ptr anObj = myInsOp->ImportFile(theFileName, theFormatName); + endService( " GEOM_Superv_i::ImportFile" ); return anObj; } diff --git a/src/GEOM_I_Superv/GEOM_Superv_i.hh b/src/GEOM_I_Superv/GEOM_Superv_i.hh index 5f99b2465..81517c037 100644 --- a/src/GEOM_I_Superv/GEOM_Superv_i.hh +++ b/src/GEOM_I_Superv/GEOM_Superv_i.hh @@ -347,8 +347,8 @@ public: void Export (GEOM::GEOM_Object_ptr theObject, const char* theFileName, const char* theFormatName); - GEOM::GEOM_Object_ptr Import (const char* theFileName, - const char* theFormatName); + GEOM::GEOM_Object_ptr ImportFile (const char* theFileName, + const char* theFormatName); void ImportTranslators (GEOM::string_array_out theFormats, GEOM::string_array_out thePatterns); void ExportTranslators (GEOM::string_array_out theFormats, diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py index 1b09785d0..673046b08 100644 --- a/src/GEOM_SWIG/GEOM_TestOthers.py +++ b/src/GEOM_SWIG/GEOM_TestOthers.py @@ -77,7 +77,7 @@ def TestExportImport (geompy, shape): geompy.ExportSTEP(shape, fileExportImportSTEP) # Import - Import = geompy.Import(fileExportImport, "BREP") + Import = geompy.ImportFile(fileExportImport, "BREP") id_Import = geompy.addToStudy(Import, "Import") diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py index c3d4ddf77..80ef991cf 100644 --- a/src/GEOM_SWIG/geompyDC.py +++ b/src/GEOM_SWIG/geompyDC.py @@ -3738,32 +3738,39 @@ class geompyDC(GEOM._objref_GEOM_Gen): # @return New GEOM_Object, containing the imported shape. # # @ref swig_Import_Export "Example" - def Import(self,theFileName, theFormatName): + def ImportFile(self,theFileName, theFormatName): # Example: see GEOM_TestOthers.py - anObj = self.InsertOp.Import(theFileName, theFormatName) + anObj = self.InsertOp.ImportFile(theFileName, theFormatName) + RaiseIfFailed("Import", self.InsertOp) + return anObj + + ## Deprecated analog of ImportFile + def Import(self,theFileName, theFormatName): + print "WARNING: Function Import is deprecated, use ImportFile instead" + anObj = self.InsertOp.ImportFile(theFileName, theFormatName) RaiseIfFailed("Import", self.InsertOp) return anObj - ## Shortcut to Import() for BREP format + ## Shortcut to ImportFile() for BREP format # # @ref swig_Import_Export "Example" def ImportBREP(self,theFileName): # Example: see GEOM_TestOthers.py - return self.Import(theFileName, "BREP") + return self.ImportFile(theFileName, "BREP") - ## Shortcut to Import() for IGES format + ## Shortcut to ImportFile() for IGES format # # @ref swig_Import_Export "Example" def ImportIGES(self,theFileName): # Example: see GEOM_TestOthers.py - return self.Import(theFileName, "IGES") + return self.ImportFile(theFileName, "IGES") ## Return length unit from given IGES file # # @ref swig_Import_Export "Example" def GetIGESUnit(self,theFileName): # Example: see GEOM_TestOthers.py - anObj = self.InsertOp.Import(theFileName, "IGES_UNIT") + anObj = self.InsertOp.ImportFile(theFileName, "IGES_UNIT") #RaiseIfFailed("Import", self.InsertOp) # recieve name using returned vertex UnitName = "M" @@ -3779,12 +3786,12 @@ class geompyDC(GEOM._objref_GEOM_Gen): UnitName = "MM" return UnitName - ## Shortcut to Import() for STEP format + ## Shortcut to ImportFile() for STEP format # # @ref swig_Import_Export "Example" def ImportSTEP(self,theFileName): # Example: see GEOM_TestOthers.py - return self.Import(theFileName, "STEP") + return self.ImportFile(theFileName, "STEP") ## Export the given shape into a file with given name. # @param theObject Shape to be stored in the file. diff --git a/src/GroupGUI/GroupGUI_GroupDlg.cxx b/src/GroupGUI/GroupGUI_GroupDlg.cxx index fc31bb34c..9c3009059 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.cxx +++ b/src/GroupGUI/GroupGUI_GroupDlg.cxx @@ -18,12 +18,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// // GEOM GEOMGUI : GUI for Geometry component // File : GroupGUI_GroupDlg.cxx // Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com) -// + #include "GroupGUI_GroupDlg.h" #include @@ -169,7 +168,7 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg (Mode mode, GeometryGUI* theGeometryGUI, QW aMedLayout->addWidget(myAddBtn, 6, 3); aMedLayout->addWidget(myRemBtn, 7, 3); - aMedLayout->setColumnStretch( 2, 5 ); + aMedLayout->setColumnStretch(2, 5); aMedLayout->setRowStretch(5, 5); aMedLayout->setRowStretch(8, 5); @@ -214,9 +213,9 @@ void GroupGUI_GroupDlg::Init() if (aSelList.Extent()) { GEOM::GEOM_Object_var anObj = - GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); + GEOMBase::ConvertIOinGEOMObject(aSelList.First()); - if ( !CORBA::is_nil(anObj) && anObj->GetType() == GEOM_GROUP ) { + if (!CORBA::is_nil(anObj) && anObj->GetType() == GEOM_GROUP) { myGroup = anObj; mainFrame()->ResultName->setText(GEOMBase::GetName(myGroup)); @@ -287,7 +286,7 @@ void GroupGUI_GroupDlg::closeEvent(QCloseEvent* e) //================================================================================= void GroupGUI_GroupDlg::ClickOnOk() { - setIsApplyAndClose( true ); + setIsApplyAndClose(true); if (ClickOnApply()) ClickOnCancel(); } @@ -377,8 +376,8 @@ void GroupGUI_GroupDlg::onGetInPlace() return; GEOM::GEOM_Object_var anObj = - GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); - if ( GEOMBase::IsShape(anObj) ) { + GEOMBase::ConvertIOinGEOMObject(aSelList.First()); + if (GEOMBase::IsShape(anObj)) { if (!anObj->_is_equivalent(myMainObj) && !anObj->_is_equivalent(myGroup)) { SUIT_OverrideCursor wc; myEditCurrentArgument->setText(GEOMBase::GetName(anObj)); @@ -455,9 +454,9 @@ void GroupGUI_GroupDlg::SelectionIntoArgument() if (nbSel == 1) { GEOM::GEOM_Object_var anObj = - GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); + GEOMBase::ConvertIOinGEOMObject(aSelList.First()); - if ( GEOMBase::IsShape(anObj) ) { + if (GEOMBase::IsShape(anObj)) { myMainObj = anObj; myEditCurrentArgument->setText(GEOMBase::GetName(anObj)); // activate subshapes selection by default @@ -471,7 +470,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument() } } else { // an attempt to synchronize list box selection with 3d viewer - if ( myBusy || myMainObj->_is_nil() ) { + if (myBusy || myMainObj->_is_nil()) { return; } @@ -494,7 +493,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument() highlight = true; } } - if ( highlight ) + if (highlight) highlightSubShapes(); } myIdList->blockSignals(isBlocked); @@ -615,7 +614,7 @@ int GroupGUI_GroupDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMap theMapIndex.Clear(); SalomeApp_Application* app = myGeomGUI->getApp(); - if ( !app || myMainObj->_is_nil() ) + if (!app || myMainObj->_is_nil()) return 0; LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); @@ -851,7 +850,7 @@ void GroupGUI_GroupDlg::updateState (bool isAdd) myRestrictGroupBox->setEnabled(!CORBA::is_nil(myMainObj)); mySelAllBtn->setEnabled(!CORBA::is_nil(myMainObj)); - mySelBtn2->setEnabled( subSelectionWay() != ALL_SUBSHAPES); + mySelBtn2->setEnabled(subSelectionWay() != ALL_SUBSHAPES); myShape2Name->setEnabled(subSelectionWay() != ALL_SUBSHAPES); if (subSelectionWay() == ALL_SUBSHAPES) setInPlaceObj(GEOM::GEOM_Object::_nil()); @@ -930,10 +929,10 @@ void GroupGUI_GroupDlg::highlightSubShapes() CORBA::String_var aMainEntry = myMainObj->GetStudyEntry(); QString anEntry = aMainEntry.in(); _PTR(SObject) aSObj (aStudy->FindObjectID(anEntry.toLatin1().constData())); - _PTR(ChildIterator) anIt ( aStudy->NewChildIterator( aSObj ) ); - for ( anIt->InitEx( true ); anIt->More(); anIt->Next() ) { + _PTR(ChildIterator) anIt (aStudy->NewChildIterator(aSObj)); + for (anIt->InitEx(true); anIt->More(); anIt->Next()) { GEOM::GEOM_Object_var aChild = GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(anIt->Value())); - if ( !CORBA::is_nil( aChild ) ) { + if (!CORBA::is_nil(aChild)) { int index = aLocOp->GetSubShapeIndex(myMainObj, aChild); CORBA::String_var aChildEntry = aChild->GetStudyEntry(); QString anEntry = aChildEntry.in(); @@ -952,13 +951,13 @@ void GroupGUI_GroupDlg::highlightSubShapes() int index = anEntry.lastIndexOf("_"); anEntry.remove(0, index+1); int anIndex = anEntry.toInt(); - if ( anIds.Contains(anIndex) ) { + if (anIds.Contains(anIndex)) { aSelList.Append(anIO); - if ( childsMap.contains ( anIndex )) { - Handle(SALOME_InteractiveObject) tmpIO = new SALOME_InteractiveObject( childsMap.value(anIndex).toLatin1().constData(), "GEOM", "TEMP_IO" ); + if (childsMap.contains (anIndex)) { + Handle(SALOME_InteractiveObject) tmpIO = new SALOME_InteractiveObject(childsMap.value(anIndex).toLatin1().constData(), "GEOM", "TEMP_IO"); aSelList.Append(tmpIO); } - } + } } } } @@ -1075,7 +1074,7 @@ bool GroupGUI_GroupDlg::execute(ObjectList& objects) //================================================================ // Function : getFather // Purpose : Get father object for object to be added in study -// ( called with addInStudy method ) +// (called with addInStudy method) //================================================================ GEOM::GEOM_Object_ptr GroupGUI_GroupDlg::getFather(GEOM::GEOM_Object_ptr theObj) { diff --git a/src/GroupGUI/GroupGUI_GroupDlg.h b/src/GroupGUI/GroupGUI_GroupDlg.h index d33bb5143..4cf3081c4 100644 --- a/src/GroupGUI/GroupGUI_GroupDlg.h +++ b/src/GroupGUI/GroupGUI_GroupDlg.h @@ -18,12 +18,11 @@ // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -// // GEOM GEOMGUI : GUI for Geometry component // File : GroupGUI_GroupDlg.h // Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com) -// + #ifndef GROUPGUI_GROUPDLG_H #define GROUPGUI_GROUPDLG_H @@ -52,17 +51,17 @@ public: EditGroup } Mode; - GroupGUI_GroupDlg( Mode mode, GeometryGUI*, QWidget* parent = 0 ); + GroupGUI_GroupDlg (Mode mode, GeometryGUI*, QWidget* parent = 0); ~GroupGUI_GroupDlg(); protected: // redefined from GEOMBase_Helper 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 bool isValid (QString&); + virtual bool execute (ObjectList&); + virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr); - void closeEvent( QCloseEvent* ); + void closeEvent (QCloseEvent*); private slots: void ClickOnOk(); @@ -70,7 +69,7 @@ private slots: void ActivateThisDialog(); void SelectionIntoArgument(); void SetEditCurrentArgument(); - void ConstructorsClicked( int ); + void ConstructorsClicked(int); void selectAllSubShapes(); void add(); @@ -80,15 +79,16 @@ private slots: private: void Init(); - void enterEvent( QEvent* ); + void enterEvent (QEvent*); + int subSelectionWay() const; TopAbs_ShapeEnum getShapeType() const; - void setShapeType( const TopAbs_ShapeEnum ); + void setShapeType (const TopAbs_ShapeEnum); void activateSelection(); - void updateState(bool isAdd = false); + void updateState (bool isAdd = false); void highlightSubShapes(); void onGetInPlace(); - void setInPlaceObj( GEOM::GEOM_Object_var, const bool isVisible=1); + void setInPlaceObj (GEOM::GEOM_Object_var, const bool isVisible=1); int getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex); private: