Salome HOME
CoTech 32: Action 32.3: In GEOM, the function Import() renamed to ImportFile()
authorjfa <jfa@opencascade.com>
Wed, 30 Mar 2011 13:20:55 +0000 (13:20 +0000)
committerjfa <jfa@opencascade.com>
Wed, 30 Mar 2011 13:20:55 +0000 (13:20 +0000)
15 files changed:
doc/salome/gui/GEOM/input/tui_import_export.doc
idl/GEOM_Gen.idl
idl/GEOM_Superv.idl
src/DlgRef/DlgRef_1Sel1Check1List_QTD.ui
src/DlgRef/DlgRef_1Sel1List1Check3Btn_QTD.ui
src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
src/GEOMToolsGUI/GEOMToolsGUI.cxx
src/GEOM_I/GEOM_IInsertOperations_i.cc
src/GEOM_I/GEOM_IInsertOperations_i.hh
src/GEOM_I_Superv/GEOM_Superv_i.cc
src/GEOM_I_Superv/GEOM_Superv_i.hh
src/GEOM_SWIG/GEOM_TestOthers.py
src/GEOM_SWIG/geompyDC.py
src/GroupGUI/GroupGUI_GroupDlg.cxx
src/GroupGUI/GroupGUI_GroupDlg.h

index b423ea3fd8e10f7c12d6c911d7ec7993caefc831..cdd8c4ea0bc4eb4280bc4c4eeeac923908d62b0e 100644 (file)
@@ -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)
index 006cf9b45818c9c37206494da097f0a2bd2fa1f3..05e030217ac6eec6a0a2c75840c0ee9bee891900 100644 (file)
@@ -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.
index bef0ecdf42cd4124c99ae5952003961c5d66d49c..0eb9b049ddc1e803e1d29b06804c0190e2ec9499 100644 (file)
@@ -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,
index 67e158a1b53887eda6ca3afe0a43edddea52bf5a..a1d5853cad116911679f1d06c7b61f883618f320 100644 (file)
       <property name="spacing" >
        <number>6</number>
       </property>
-      <item row="2" column="0" colspan="3" >
-       <widget class="QCheckBox" name="CheckButton1" >
+      <item row="0" column="0" >
+       <widget class="QLabel" name="TextLabel1" >
+        <property name="sizePolicy" >
+         <sizepolicy>
+          <hsizetype>0</hsizetype>
+          <vsizetype>0</vsizetype>
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
         <property name="text" >
-         <string/>
+         <string>TL1</string>
+        </property>
+        <property name="wordWrap" >
+         <bool>false</bool>
         </property>
        </widget>
       </item>
         </property>
        </widget>
       </item>
-      <item row="0" column="0" >
-       <widget class="QLabel" name="TextLabel1" >
+      <item row="0" column="2" >
+       <widget class="QLineEdit" name="LineEdit1" />
+      </item>
+      <item row="1" column="0" >
+       <widget class="QLabel" name="TextLabel2" >
         <property name="sizePolicy" >
          <sizepolicy>
           <hsizetype>0</hsizetype>
          </sizepolicy>
         </property>
         <property name="text" >
-         <string>TL1</string>
+         <string>TL2</string>
         </property>
         <property name="wordWrap" >
          <bool>false</bool>
         </property>
        </widget>
       </item>
-      <item row="0" column="2" >
-       <widget class="QLineEdit" name="LineEdit1" />
-      </item>
       <item row="1" column="1" colspan="2" >
        <widget class="QComboBox" name="ComboBox1" >
         <property name="sizePolicy" >
         </property>
        </widget>
       </item>
-      <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>
+      <item row="2" column="0" colspan="3" >
+       <widget class="QCheckBox" name="CheckButton1" >
         <property name="text" >
-         <string>TL2</string>
-        </property>
-        <property name="wordWrap" >
-         <bool>false</bool>
+         <string/>
         </property>
        </widget>
       </item>
index 366d2d6ee422aa3c694ca155db54c77db95391dc..562f2cef89832a9bdfec2c700b42310a9912b345 100644 (file)
         </property>
        </widget>
       </item>
-      <item row="0" column="2" colspan="2" >
+      <item row="0" column="2" >
        <widget class="QLineEdit" name="LineEdit1" />
       </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" >
         <property name="text" >
          <string/>
         </property>
        </widget>
       </item>
-      <item row="1" column="3" >
+      <item row="2" column="2" >
        <widget class="QPushButton" name="PushButton2" >
         <property name="text" >
          <string/>
         </property>
        </widget>
       </item>
-      <item rowspan="3" row="2" column="0" colspan="3" >
-       <widget class="QListWidget" name="ListView1" />
-      </item>
-      <item row="2" column="3" >
+      <item row="3" column="2" >
        <widget class="QPushButton" name="PushButton3" >
         <property name="text" >
          <string/>
         </property>
        </widget>
       </item>
-      <item row="3" column="3" >
+      <item row="4" column="2" >
        <widget class="QPushButton" name="PushButton4" >
         <property name="text" >
          <string/>
         </property>
        </widget>
       </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>
     </widget>
    </item>
index efb8255fa11b2e6e157c705ffe7817e0fd29dd60..02b601a32449a75beb8959ffecdc9ba026f4da31 100644 (file)
@@ -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() << "\")";
   }
 
index b53b5a5386e9a8ee55216dc7e1ec8e321b834405..5f8442776fe9224e244dba174a3f55034203abd2 100644 (file)
@@ -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 = 
index 382465d83750c3a7ce3010c51199d37ecfa1b01a..c3941407ae7a4cf369e2b33b80091bd213ffe44c 100644 (file)
@@ -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 );
index 34532a3055ccdb21302fd3ee084c004ccd772a6d..b921dbad50fc589e3e52aa03a780fe768c68a015 100644 (file)
@@ -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
 
 #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();
 
index e0ab44df4db10eee44af52a6fdb001f04dbe4053..dda0a3bcd3fa98482a146c59e178e55d1b23e92e 100644 (file)
@@ -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;
 }
 
index 5f99b246599b6d954bcc2d7946e9c8f60ca892e6..81517c037628cd1457998434f0bf78e7b15e6ce0 100644 (file)
@@ -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,
index 1b09785d08b805a6d3cc180a542c01a0ed9d5668..673046b08214dec786d569ded08f2974eed1bcd4 100644 (file)
@@ -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")
 
index c3d4ddf7744204d6c3edbf9939e115eb6d7ac42f..80ef991cf1319c276b15258b1943e1d570ff34cf 100644 (file)
@@ -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.
index fc31bb34c213d763c50201544f31f2552b825b4d..9c300905917485dbe0b3eb9e105f90c998e9ca9e 100644 (file)
 //  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 <DlgRef.h>
@@ -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)
 {
index d33bb51439178275151c1076ae7b640f65c96f6d..4cf3081c47e5098e4d1d2966252b67cbab330dba 100644 (file)
 //  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                                setInPlaceObjGEOM::GEOM_Object_var, const bool isVisible=1);
+  void                                setInPlaceObj (GEOM::GEOM_Object_var, const bool isVisible=1);
   int                                 getSelectedSubshapes (TColStd_IndexedMapOfInteger& theMapIndex);
 
 private: