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

CoTech 32: Action 32.3: In GEOM, the function Import() renamed to ImportFile()

Browse Source
This commit is contained in:
jfa 2011-03-30 13:20:55 +00:00
parent e4ebb2bada
commit 9e31f81bd0
15 changed files with 146 additions and 128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/salome/gui/GEOM/input/tui_import_export.doc
View File

@ -24,7 +24,7 @@ print "UnitName2 = ", UnitName2
# import shapes # import shapes
Shape1 = geompy.ImportIGES(theFileName1) Shape1 = geompy.ImportIGES(theFileName1)
Shape2 = geompy.ImportIGES(theFileName2) 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) [Xmin1,Xmax1, Ymin1,Ymax1, Zmin1,Zmax1] = geompy.BoundingBox(Shape1)
[Xmin2,Xmax2, Ymin2,Ymax2, Zmin2,Zmax2] = geompy.BoundingBox(Shape2) [Xmin2,Xmax2, Ymin2,Ymax2, Zmin2,Zmax2] = geompy.BoundingBox(Shape2)
[Xmin3,Xmax3, Ymin3,Ymax3, Zmin3,Zmax3] = geompy.BoundingBox(Shape3) [Xmin3,Xmax3, Ymin3,Ymax3, Zmin3,Zmax3] = geompy.BoundingBox(Shape3)

2
idl/GEOM_Gen.idl
View File

@ -2939,7 +2939,7 @@ module GEOM
* set to 'meter' and result model will be scaled. * set to 'meter' and result model will be scaled.
* \return New GEOM_Object, containing the imported shape. * \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. * Get the supported import formats and corresponding patterns for File dialog.

2
idl/GEOM_Superv.idl
View File

@ -257,7 +257,7 @@ module GEOM
//-----------------------------------------------------------// //-----------------------------------------------------------//
GEOM_Object MakeCopy (in GEOM_Object theOriginal) ; GEOM_Object MakeCopy (in GEOM_Object theOriginal) ;
void Export (in GEOM_Object theObject, in string theFileName, in string theFormatName) ; 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, void ImportTranslators (out string_array theFormats,
out string_array thePatterns) ; out string_array thePatterns) ;
void ExportTranslators (out string_array theFormats, void ExportTranslators (out string_array theFormats,

56
src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui
View File

@ -31,28 +31,6 @@
<property name="spacing" > <property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="0" colspan="3" >
<widget class="QCheckBox" name="CheckButton1" >
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QPushButton" name="PushButton1" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="0" column="0" > <item row="0" column="0" >
<widget class="QLabel" name="TextLabel1" > <widget class="QLabel" name="TextLabel1" >
<property name="sizePolicy" > <property name="sizePolicy" >
@ -71,21 +49,24 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="1" >
<widget class="QLineEdit" name="LineEdit1" /> <widget class="QPushButton" name="PushButton1" >
</item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="ComboBox1" >
<property name="sizePolicy" > <property name="sizePolicy" >
<sizepolicy> <sizepolicy>
<hsizetype>7</hsizetype> <hsizetype>0</hsizetype>
<vsizetype>0</vsizetype> <vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="text" >
<string/>
</property>
</widget> </widget>
</item> </item>
<item row="0" column="2" >
<widget class="QLineEdit" name="LineEdit1" />
</item>
<item row="1" column="0" > <item row="1" column="0" >
<widget class="QLabel" name="TextLabel2" > <widget class="QLabel" name="TextLabel2" >
<property name="sizePolicy" > <property name="sizePolicy" >
@ -104,6 +85,25 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="ComboBox1" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" column="0" colspan="3" >
<widget class="QCheckBox" name="CheckButton1" >
<property name="text" >
<string/>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

56
src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui
View File

@ -72,53 +72,67 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" colspan="2" > <item row="0" column="2" >
<widget class="QLineEdit" name="LineEdit1" /> <widget class="QLineEdit" name="LineEdit1" />
</item> </item>
<item row="1" column="0" colspan="3" > <item row="1" column="0" >
<widget class="QLabel" name="TextLabel2" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>TL2</string>
</property>
<property name="wordWrap" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="1" column="1" colspan="2" >
<widget class="QComboBox" name="ComboBox1" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="2" rowspan="3" column="0" colspan="2" >
<widget class="QCheckBox" name="CheckButton1" > <widget class="QCheckBox" name="CheckButton1" >
<property name="text" > <property name="text" >
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3" > <item row="2" column="2" >
<widget class="QPushButton" name="PushButton2" > <widget class="QPushButton" name="PushButton2" >
<property name="text" > <property name="text" >
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item rowspan="3" row="2" column="0" colspan="3" > <item row="3" column="2" >
<widget class="QListWidget" name="ListView1" />
</item>
<item row="2" column="3" >
<widget class="QPushButton" name="PushButton3" > <widget class="QPushButton" name="PushButton3" >
<property name="text" > <property name="text" >
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="3" > <item row="4" column="2" >
<widget class="QPushButton" name="PushButton4" > <widget class="QPushButton" name="PushButton4" >
<property name="text" > <property name="text" >
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>

2
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
View File

@ -243,7 +243,7 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import
//Make a Python command //Make a Python command
if( theFormatName != "IGES_UNIT" ) { if( theFormatName != "IGES_UNIT" ) {
GEOM::TPythonDump(aFunction) << result << " = geompy.Import(\"" GEOM::TPythonDump(aFunction) << result << " = geompy.ImportFile(\""
<< theFileName.ToCString() << "\", \"" << theFormatName.ToCString() << "\")"; << theFileName.ToCString() << "\", \"" << theFormatName.ToCString() << "\")";
} }

4
src/GEOMToolsGUI/GEOMToolsGUI.cxx
View File

@ -634,7 +634,7 @@ bool GEOMToolsGUI::Import()
// skl 29.05.2009 // skl 29.05.2009
if ( aCurrentType == "IGES" ) { 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; bool needConvert = false;
TCollection_AsciiString aUnitName = aInsOp->GetErrorCode(); TCollection_AsciiString aUnitName = aInsOp->GetErrorCode();
if ( aUnitName.SubString( 1, 4 ) == "UNIT" ) if ( aUnitName.SubString( 1, 4 ) == "UNIT" )
@ -682,7 +682,7 @@ bool GEOMToolsGUI::Import()
} // if ( acisAnswer != YesToAll && acisAnswer != NoToAll ) } // if ( acisAnswer != YesToAll && acisAnswer != NoToAll )
} // else if ( aCurrentType == "ACIS" ) } // 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() ) { if ( !anObj->_is_nil() && aInsOp->IsDone() ) {
QString aPublishObjName = QString aPublishObjName =

11
src/GEOM_I/GEOM_IInsertOperations_i.cc
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifdef WNT #ifdef WNT
#pragma warning( disable:4786 ) #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* theFileName,
const char* theFormatName) 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, CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Long theHeight,
const SALOMEDS::TMPFile& theTexture) const SALOMEDS::TMPFile& theTexture)
{ {
GetOperations()->SetNotDone(); GetOperations()->SetNotDone();
Handle(TDataStd_HArray1OfByte) aTexture; Handle(TDataStd_HArray1OfByte) aTexture;
@ -238,8 +237,8 @@ CORBA::Long GEOM_IInsertOperations_i::AddTexture(CORBA::Long theWidth, CORBA::Lo
} }
SALOMEDS::TMPFile* GEOM_IInsertOperations_i::GetTexture(CORBA::Long theID, SALOMEDS::TMPFile* GEOM_IInsertOperations_i::GetTexture(CORBA::Long theID,
CORBA::Long& theWidth, CORBA::Long& theWidth,
CORBA::Long& theHeight) CORBA::Long& theHeight)
{ {
int aWidth, aHeight; int aWidth, aHeight;
Handle(TDataStd_HArray1OfByte) aTextureImpl = GetOperations()->GetTexture( theID, aWidth, aHeight ); Handle(TDataStd_HArray1OfByte) aTextureImpl = GetOperations()->GetTexture( theID, aWidth, aHeight );

21
src/GEOM_I/GEOM_IInsertOperations_i.hh
View File

@ -18,7 +18,6 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#ifndef _GEOM_IInsertOperations_i_HeaderFile #ifndef _GEOM_IInsertOperations_i_HeaderFile
#define _GEOM_IInsertOperations_i_HeaderFile #define _GEOM_IInsertOperations_i_HeaderFile
@ -40,30 +39,30 @@ class GEOM_I_EXPORT GEOM_IInsertOperations_i :
{ {
public: public:
GEOM_IInsertOperations_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine, GEOM_IInsertOperations_i (PortableServer::POA_ptr thePOA, GEOM::GEOM_Gen_ptr theEngine,
::GEOMImpl_IInsertOperations* theImpl); ::GEOMImpl_IInsertOperations* theImpl);
~GEOM_IInsertOperations_i(); ~GEOM_IInsertOperations_i();
GEOM::GEOM_Object_ptr MakeCopy (GEOM::GEOM_Object_ptr theOriginal); GEOM::GEOM_Object_ptr MakeCopy (GEOM::GEOM_Object_ptr theOriginal);
void Export (GEOM::GEOM_Object_ptr theOriginal, void Export (GEOM::GEOM_Object_ptr theOriginal,
const char* theFileName, const char* theFileName,
const char* theFormatName); const char* theFormatName);
GEOM::GEOM_Object_ptr Import (const char* theFileName, GEOM::GEOM_Object_ptr ImportFile (const char* theFileName,
const char* theFormatName); const char* theFormatName);
void ImportTranslators (GEOM::string_array_out theFormats, void ImportTranslators (GEOM::string_array_out theFormats,
GEOM::string_array_out thePatterns); GEOM::string_array_out thePatterns);
void ExportTranslators (GEOM::string_array_out theFormats, 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 LoadTexture(const char* theTextureFile);
CORBA::Long AddTexture(CORBA::Long theWidth, CORBA::Long theHeight, CORBA::Long AddTexture(CORBA::Long theWidth, CORBA::Long theHeight,
const SALOMEDS::TMPFile& theTexture); const SALOMEDS::TMPFile& theTexture);
SALOMEDS::TMPFile* GetTexture(CORBA::Long theID, SALOMEDS::TMPFile* GetTexture(CORBA::Long theID,
CORBA::Long& theWidth, CORBA::Long& theWidth,
CORBA::Long& theHeight); CORBA::Long& theHeight);
GEOM::ListOfLong* GetAllTextures(); GEOM::ListOfLong* GetAllTextures();

12
src/GEOM_I_Superv/GEOM_Superv_i.cc
View File

@ -1495,14 +1495,14 @@ void GEOM_Superv_i::Export (GEOM::GEOM_Object_ptr theObject,
//============================================================================= //=============================================================================
// Import: // Import:
//============================================================================= //=============================================================================
GEOM::GEOM_Object_ptr GEOM_Superv_i::Import (const char* theFileName, GEOM::GEOM_Object_ptr GEOM_Superv_i::ImportFile (const char* theFileName,
const char* theFormatName) const char* theFormatName)
{ {
beginService( " GEOM_Superv_i::Import" ); beginService( " GEOM_Superv_i::ImportFile" );
MESSAGE("GEOM_Superv_i::Import"); MESSAGE("GEOM_Superv_i::ImportFile");
getInsOp(); getInsOp();
GEOM::GEOM_Object_ptr anObj = myInsOp->Import(theFileName, theFormatName); GEOM::GEOM_Object_ptr anObj = myInsOp->ImportFile(theFileName, theFormatName);
endService( " GEOM_Superv_i::Import" ); endService( " GEOM_Superv_i::ImportFile" );
return anObj; return anObj;
} }

4
src/GEOM_I_Superv/GEOM_Superv_i.hh
View File

@ -347,8 +347,8 @@ public:
void Export (GEOM::GEOM_Object_ptr theObject, void Export (GEOM::GEOM_Object_ptr theObject,
const char* theFileName, const char* theFileName,
const char* theFormatName); const char* theFormatName);
GEOM::GEOM_Object_ptr Import (const char* theFileName, GEOM::GEOM_Object_ptr ImportFile (const char* theFileName,
const char* theFormatName); const char* theFormatName);
void ImportTranslators (GEOM::string_array_out theFormats, void ImportTranslators (GEOM::string_array_out theFormats,
GEOM::string_array_out thePatterns); GEOM::string_array_out thePatterns);
void ExportTranslators (GEOM::string_array_out theFormats, void ExportTranslators (GEOM::string_array_out theFormats,

2
src/GEOM_SWIG/GEOM_TestOthers.py
View File

@ -77,7 +77,7 @@ def TestExportImport (geompy, shape):
geompy.ExportSTEP(shape, fileExportImportSTEP) geompy.ExportSTEP(shape, fileExportImportSTEP)
# Import # Import
Import = geompy.Import(fileExportImport, "BREP") Import = geompy.ImportFile(fileExportImport, "BREP")
id_Import = geompy.addToStudy(Import, "Import") id_Import = geompy.addToStudy(Import, "Import")

25
src/GEOM_SWIG/geompyDC.py
View File

@ -3738,32 +3738,39 @@ class geompyDC(GEOM._objref_GEOM_Gen):
# @return New GEOM_Object, containing the imported shape. # @return New GEOM_Object, containing the imported shape.
# #
# @ref swig_Import_Export "Example" # @ref swig_Import_Export "Example"
def Import(self,theFileName, theFormatName): def ImportFile(self,theFileName, theFormatName):
# Example: see GEOM_TestOthers.py # Example: see GEOM_TestOthers.py
anObj = self.InsertOp.Import(theFileName, theFormatName) anObj = self.InsertOp.ImportFile(theFileName, theFormatName)
RaiseIfFailed("Import", self.InsertOp) RaiseIfFailed("Import", self.InsertOp)
return anObj return anObj
## Shortcut to Import() for BREP format ## 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 ImportFile() for BREP format
# #
# @ref swig_Import_Export "Example" # @ref swig_Import_Export "Example"
def ImportBREP(self,theFileName): def ImportBREP(self,theFileName):
# Example: see GEOM_TestOthers.py # 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" # @ref swig_Import_Export "Example"
def ImportIGES(self,theFileName): def ImportIGES(self,theFileName):
# Example: see GEOM_TestOthers.py # Example: see GEOM_TestOthers.py
return self.Import(theFileName, "IGES") return self.ImportFile(theFileName, "IGES")
## Return length unit from given IGES file ## Return length unit from given IGES file
# #
# @ref swig_Import_Export "Example" # @ref swig_Import_Export "Example"
def GetIGESUnit(self,theFileName): def GetIGESUnit(self,theFileName):
# Example: see GEOM_TestOthers.py # Example: see GEOM_TestOthers.py
anObj = self.InsertOp.Import(theFileName, "IGES_UNIT") anObj = self.InsertOp.ImportFile(theFileName, "IGES_UNIT")
#RaiseIfFailed("Import", self.InsertOp) #RaiseIfFailed("Import", self.InsertOp)
# recieve name using returned vertex # recieve name using returned vertex
UnitName = "M" UnitName = "M"
@ -3779,12 +3786,12 @@ class geompyDC(GEOM._objref_GEOM_Gen):
UnitName = "MM" UnitName = "MM"
return UnitName return UnitName
## Shortcut to Import() for STEP format ## Shortcut to ImportFile() for STEP format
# #
# @ref swig_Import_Export "Example" # @ref swig_Import_Export "Example"
def ImportSTEP(self,theFileName): def ImportSTEP(self,theFileName):
# Example: see GEOM_TestOthers.py # 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. ## Export the given shape into a file with given name.
# @param theObject Shape to be stored in the file. # @param theObject Shape to be stored in the file.

41
src/GroupGUI/GroupGUI_GroupDlg.cxx
View File

@ -18,12 +18,11 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// GEOM GEOMGUI : GUI for Geometry component // GEOM GEOMGUI : GUI for Geometry component
// File : GroupGUI_GroupDlg.cxx // File : GroupGUI_GroupDlg.cxx
// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com) // Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
//
#include "GroupGUI_GroupDlg.h" #include "GroupGUI_GroupDlg.h"
#include <DlgRef.h> #include <DlgRef.h>
@ -169,7 +168,7 @@ GroupGUI_GroupDlg::GroupGUI_GroupDlg (Mode mode, GeometryGUI* theGeometryGUI, QW
aMedLayout->addWidget(myAddBtn, 6, 3); aMedLayout->addWidget(myAddBtn, 6, 3);
aMedLayout->addWidget(myRemBtn, 7, 3); aMedLayout->addWidget(myRemBtn, 7, 3);
aMedLayout->setColumnStretch( 2, 5 ); aMedLayout->setColumnStretch(2, 5);
aMedLayout->setRowStretch(5, 5); aMedLayout->setRowStretch(5, 5);
aMedLayout->setRowStretch(8, 5); aMedLayout->setRowStretch(8, 5);
@ -214,9 +213,9 @@ void GroupGUI_GroupDlg::Init()
if (aSelList.Extent()) { if (aSelList.Extent()) {
GEOM::GEOM_Object_var anObj = 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; myGroup = anObj;
mainFrame()->ResultName->setText(GEOMBase::GetName(myGroup)); mainFrame()->ResultName->setText(GEOMBase::GetName(myGroup));
@ -287,7 +286,7 @@ void GroupGUI_GroupDlg::closeEvent(QCloseEvent* e)
//================================================================================= //=================================================================================
void GroupGUI_GroupDlg::ClickOnOk() void GroupGUI_GroupDlg::ClickOnOk()
{ {
setIsApplyAndClose( true ); setIsApplyAndClose(true);
if (ClickOnApply()) if (ClickOnApply())
ClickOnCancel(); ClickOnCancel();
} }
@ -377,8 +376,8 @@ void GroupGUI_GroupDlg::onGetInPlace()
return; return;
GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object_var anObj =
GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); GEOMBase::ConvertIOinGEOMObject(aSelList.First());
if ( GEOMBase::IsShape(anObj) ) { if (GEOMBase::IsShape(anObj)) {
if (!anObj->_is_equivalent(myMainObj) && !anObj->_is_equivalent(myGroup)) { if (!anObj->_is_equivalent(myMainObj) && !anObj->_is_equivalent(myGroup)) {
SUIT_OverrideCursor wc; SUIT_OverrideCursor wc;
myEditCurrentArgument->setText(GEOMBase::GetName(anObj)); myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
@ -455,9 +454,9 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
if (nbSel == 1) { if (nbSel == 1) {
GEOM::GEOM_Object_var anObj = GEOM::GEOM_Object_var anObj =
GEOMBase::ConvertIOinGEOMObject( aSelList.First() ); GEOMBase::ConvertIOinGEOMObject(aSelList.First());
if ( GEOMBase::IsShape(anObj) ) { if (GEOMBase::IsShape(anObj)) {
myMainObj = anObj; myMainObj = anObj;
myEditCurrentArgument->setText(GEOMBase::GetName(anObj)); myEditCurrentArgument->setText(GEOMBase::GetName(anObj));
// activate subshapes selection by default // activate subshapes selection by default
@ -471,7 +470,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
} }
} }
else { // an attempt to synchronize list box selection with 3d viewer else { // an attempt to synchronize list box selection with 3d viewer
if ( myBusy || myMainObj->_is_nil() ) { if (myBusy || myMainObj->_is_nil()) {
return; return;
} }
@ -494,7 +493,7 @@ void GroupGUI_GroupDlg::SelectionIntoArgument()
highlight = true; highlight = true;
} }
} }
if ( highlight ) if (highlight)
highlightSubShapes(); highlightSubShapes();
} }
myIdList->blockSignals(isBlocked); myIdList->blockSignals(isBlocked);
@ -615,7 +614,7 @@ int GroupGUI_GroupDlg::getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMap
theMapIndex.Clear(); theMapIndex.Clear();
SalomeApp_Application* app = myGeomGUI->getApp(); SalomeApp_Application* app = myGeomGUI->getApp();
if ( !app || myMainObj->_is_nil() ) if (!app || myMainObj->_is_nil())
return 0; return 0;
LightApp_SelectionMgr* aSelMgr = app->selectionMgr(); LightApp_SelectionMgr* aSelMgr = app->selectionMgr();
@ -851,7 +850,7 @@ void GroupGUI_GroupDlg::updateState (bool isAdd)
myRestrictGroupBox->setEnabled(!CORBA::is_nil(myMainObj)); myRestrictGroupBox->setEnabled(!CORBA::is_nil(myMainObj));
mySelAllBtn->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); myShape2Name->setEnabled(subSelectionWay() != ALL_SUBSHAPES);
if (subSelectionWay() == ALL_SUBSHAPES) if (subSelectionWay() == ALL_SUBSHAPES)
setInPlaceObj(GEOM::GEOM_Object::_nil()); setInPlaceObj(GEOM::GEOM_Object::_nil());
@ -930,10 +929,10 @@ void GroupGUI_GroupDlg::highlightSubShapes()
CORBA::String_var aMainEntry = myMainObj->GetStudyEntry(); CORBA::String_var aMainEntry = myMainObj->GetStudyEntry();
QString anEntry = aMainEntry.in(); QString anEntry = aMainEntry.in();
_PTR(SObject) aSObj (aStudy->FindObjectID(anEntry.toLatin1().constData())); _PTR(SObject) aSObj (aStudy->FindObjectID(anEntry.toLatin1().constData()));
_PTR(ChildIterator) anIt ( aStudy->NewChildIterator( aSObj ) ); _PTR(ChildIterator) anIt (aStudy->NewChildIterator(aSObj));
for ( anIt->InitEx( true ); anIt->More(); anIt->Next() ) { for (anIt->InitEx(true); anIt->More(); anIt->Next()) {
GEOM::GEOM_Object_var aChild = GEOM::GEOM_Object::_narrow(GeometryGUI::ClientSObjectToObject(anIt->Value())); 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); int index = aLocOp->GetSubShapeIndex(myMainObj, aChild);
CORBA::String_var aChildEntry = aChild->GetStudyEntry(); CORBA::String_var aChildEntry = aChild->GetStudyEntry();
QString anEntry = aChildEntry.in(); QString anEntry = aChildEntry.in();
@ -952,10 +951,10 @@ void GroupGUI_GroupDlg::highlightSubShapes()
int index = anEntry.lastIndexOf("_"); int index = anEntry.lastIndexOf("_");
anEntry.remove(0, index+1); anEntry.remove(0, index+1);
int anIndex = anEntry.toInt(); int anIndex = anEntry.toInt();
if ( anIds.Contains(anIndex) ) { if (anIds.Contains(anIndex)) {
aSelList.Append(anIO); aSelList.Append(anIO);
if ( childsMap.contains ( anIndex )) { if (childsMap.contains (anIndex)) {
Handle(SALOME_InteractiveObject) tmpIO = new SALOME_InteractiveObject( childsMap.value(anIndex).toLatin1().constData(), "GEOM", "TEMP_IO" ); Handle(SALOME_InteractiveObject) tmpIO = new SALOME_InteractiveObject(childsMap.value(anIndex).toLatin1().constData(), "GEOM", "TEMP_IO");
aSelList.Append(tmpIO); aSelList.Append(tmpIO);
} }
} }
@ -1075,7 +1074,7 @@ bool GroupGUI_GroupDlg::execute(ObjectList& objects)
//================================================================ //================================================================
// Function : getFather // Function : getFather
// Purpose : Get father object for object to be added in study // 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) GEOM::GEOM_Object_ptr GroupGUI_GroupDlg::getFather(GEOM::GEOM_Object_ptr theObj)
{ {

24
src/GroupGUI/GroupGUI_GroupDlg.h
View File

@ -18,12 +18,11 @@
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA // Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
// //
// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
// GEOM GEOMGUI : GUI for Geometry component // GEOM GEOMGUI : GUI for Geometry component
// File : GroupGUI_GroupDlg.h // File : GroupGUI_GroupDlg.h
// Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com) // Author : Sergey ANIKIN, Open CASCADE S.A.S. (sergey.anikin@opencascade.com)
//
#ifndef GROUPGUI_GROUPDLG_H #ifndef GROUPGUI_GROUPDLG_H
#define GROUPGUI_GROUPDLG_H #define GROUPGUI_GROUPDLG_H
@ -52,17 +51,17 @@ public:
EditGroup EditGroup
} Mode; } Mode;
GroupGUI_GroupDlg( Mode mode, GeometryGUI*, QWidget* parent = 0 ); GroupGUI_GroupDlg (Mode mode, GeometryGUI*, QWidget* parent = 0);
~GroupGUI_GroupDlg(); ~GroupGUI_GroupDlg();
protected: protected:
// redefined from GEOMBase_Helper // redefined from GEOMBase_Helper
virtual GEOM::GEOM_IOperations_ptr createOperation(); virtual GEOM::GEOM_IOperations_ptr createOperation();
virtual bool isValid( QString& ); virtual bool isValid (QString&);
virtual bool execute( ObjectList& ); virtual bool execute (ObjectList&);
virtual GEOM::GEOM_Object_ptr getFather( GEOM::GEOM_Object_ptr ); virtual GEOM::GEOM_Object_ptr getFather (GEOM::GEOM_Object_ptr);
void closeEvent( QCloseEvent* ); void closeEvent (QCloseEvent*);
private slots: private slots:
void ClickOnOk(); void ClickOnOk();
@ -70,7 +69,7 @@ private slots:
void ActivateThisDialog(); void ActivateThisDialog();
void SelectionIntoArgument(); void SelectionIntoArgument();
void SetEditCurrentArgument(); void SetEditCurrentArgument();
void ConstructorsClicked( int ); void ConstructorsClicked(int);
void selectAllSubShapes(); void selectAllSubShapes();
void add(); void add();
@ -80,15 +79,16 @@ private slots:
private: private:
void Init(); void Init();
void enterEvent( QEvent* ); void enterEvent (QEvent*);
int subSelectionWay() const; int subSelectionWay() const;
TopAbs_ShapeEnum getShapeType() const; TopAbs_ShapeEnum getShapeType() const;
void setShapeType( const TopAbs_ShapeEnum ); void setShapeType (const TopAbs_ShapeEnum);
void activateSelection(); void activateSelection();
void updateState(bool isAdd = false); void updateState (bool isAdd = false);
void highlightSubShapes(); void highlightSubShapes();
void onGetInPlace(); 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); int getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex);
private: private: