From 368a824418911593e34c47ec49d03260eea4f911 Mon Sep 17 00:00:00 2001
From: jfa <jfa@opencascade.com>
Date: Thu, 1 Nov 2012 08:24:37 +0000
Subject: [PATCH] Mantis issue 0021511: EDF 2153 GEOM: Choose to take units
 into account or not when importing a STEP file

---
 doc/salome/gui/GEOM/images/iges_unit.png    | Bin 6488 -> 10444 bytes
 doc/salome/gui/GEOM/input/import_export.doc |   8 +--
 idl/GEOM_Gen.idl                            |   5 +-
 src/GEOMImpl/GEOMImpl_IInsertOperations.cxx |  23 ++++--
 src/GEOMToolsGUI/GEOMToolsGUI.cxx           |   2 +-
 src/GEOM_SWIG/GEOM_TestOthers.py            |  17 +++--
 src/GEOM_SWIG/geompyDC.py                   |  76 ++++++++++++--------
 src/IGESImport/IGESImport.cxx               |   8 +--
 src/STEPImport/STEPImport.cxx               |   8 +--
 9 files changed, 95 insertions(+), 52 deletions(-)

diff --git a/doc/salome/gui/GEOM/images/iges_unit.png b/doc/salome/gui/GEOM/images/iges_unit.png
index 60aba603ad83270687dedd20473e3b4036efca92..cb74fb319fb952aabef33c434e827b0b76a211e5 100644
GIT binary patch
literal 10444
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
LQkJY1HwpPaWbivn

literal 6488
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

diff --git a/doc/salome/gui/GEOM/input/import_export.doc b/doc/salome/gui/GEOM/input/import_export.doc
index 70537f934..7946987aa 100644
--- a/doc/salome/gui/GEOM/input/import_export.doc
+++ b/doc/salome/gui/GEOM/input/import_export.doc
@@ -22,10 +22,10 @@ Select the required file and click \b Open. Your file will be imported in
 the module and its contents (geometrical object) will be displayed in
 the <b>Object Browser</b>.
 
-\note If the selected file is in IGES format and the length is not
-expressed in meters, it will be suggested to scale the model into the
-metric system (see the picture below). This feature can be helpful if
-some wrong units have been written to the IGES file by a
+\note If the selected file is in IGES or in STEP format and the length
+is not expressed in meters, it will be asked to take or not these
+units into account (see the picture below). This feature can be
+helpful if some wrong units have been written to the IGES file by a
 3rd-party software.
 
 \image html iges_unit.png
diff --git a/idl/GEOM_Gen.idl b/idl/GEOM_Gen.idl
index 9c6896aad..4a05f783b 100644
--- a/idl/GEOM_Gen.idl
+++ b/idl/GEOM_Gen.idl
@@ -3289,8 +3289,9 @@ module GEOM
      *  \param theFileName The file, containing the shape.
      *  \param theFormatName Specify format for the file reading.
      *         Available formats can be obtained with <VAR>ImportTranslators()</VAR> method.
-     *         If format 'IGES_SCALE' is used instead 'IGES' length unit will be
-     *         set to 'meter' and result model will be scaled.
+     *         If format 'IGES_SCALE' is used instead of 'IGES' or
+     *            format 'STEP_SCALE' is used instead of 'STEP',
+     *            file length unit will be ignored (set to 'meter') and result model will be scaled.
      *  \return New GEOM_Object, containing the imported shape.
      */
     GEOM_Object ImportFile (in string theFileName, in string theFormatName);
diff --git a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
index 6aca179a1..4fecfbca9 100644
--- a/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
+++ b/src/GEOMImpl/GEOMImpl_IInsertOperations.cxx
@@ -246,9 +246,22 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import
   }
 
   //Make a Python command
-  if( theFormatName != "IGES_UNIT" ) {
-    GEOM::TPythonDump(aFunction) << result << " = geompy.ImportFile(\""
-      << theFileName.ToCString() << "\", \"" << theFormatName.ToCString() << "\")";
+  if (theFormatName != "IGES_UNIT") {
+    GEOM::TPythonDump pd (aFunction);
+    if (theFormatName == "BREP")
+      pd << result << " = geompy.ImportBREP(\"" << theFileName.ToCString() << "\")";
+    else if (theFormatName == "IGES")
+      pd << result << " = geompy.ImportIGES(\"" << theFileName.ToCString() << "\")";
+    else if (theFormatName == "IGES_SCALE")
+      pd << result << " = geompy.ImportIGES(\"" << theFileName.ToCString() << "\", True)";
+    else if (theFormatName == "STEP")
+      pd << result << " = geompy.ImportSTEP(\"" << theFileName.ToCString() << "\")";
+    else if (theFormatName == "STEP_SCALE")
+      pd << result << " = geompy.ImportSTEP(\"" << theFileName.ToCString() << "\", True)";
+    else {
+      pd << result << " = geompy.ImportFile(\""
+         << theFileName.ToCString() << "\", \"" << theFormatName.ToCString() << "\")";
+    }
   }
 
   SetErrorCode(OK);
@@ -260,9 +273,9 @@ Handle(GEOM_Object) GEOMImpl_IInsertOperations::Import
     gp_Pnt P = BRep_Tool::Pnt(V);
     double scale = P.X();
     TCollection_AsciiString aUnitName = "UNIT_M";
-    if( fabs(scale-0.01) < 1.e-6 )
+    if (fabs(scale-0.01) < 1.e-6)
       aUnitName = "UNIT_CM";
-    else if( fabs(scale-0.001) < 1.e-6 )
+    else if (fabs(scale-0.001) < 1.e-6)
       aUnitName = "UNIT_MM";
     //cout<<"IIO: aUnitName = "<<aUnitName.ToCString()<<endl;
     SetErrorCode(aUnitName);
diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index e83523ea4..ab7c57662 100644
--- a/src/GEOMToolsGUI/GEOMToolsGUI.cxx
+++ b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
@@ -651,7 +651,7 @@ bool GEOMToolsGUI::Import()
       CORBA::String_var aUnits = aInsOp->ReadValue(fileN, fileT, "LEN_UNITS");
       TCollection_AsciiString aUnitsStr (aUnits.in());
       bool needConvert = true;
-      if (aUnitsStr.IsEmpty() || aUnitsStr == "UNIT_M")
+      if (aUnitsStr.IsEmpty() || aUnitsStr == "M")
         needConvert = false;
 
       if (needConvert) {
diff --git a/src/GEOM_SWIG/GEOM_TestOthers.py b/src/GEOM_SWIG/GEOM_TestOthers.py
index 4db5841a0..4f85d8183 100644
--- a/src/GEOM_SWIG/GEOM_TestOthers.py
+++ b/src/GEOM_SWIG/GEOM_TestOthers.py
@@ -78,16 +78,25 @@ def TestExportImport (geompy, shape):
   # Import
   Import = geompy.ImportFile(fileExportImport, "BREP")
 
-  id_Import = geompy.addToStudy(Import, "Import")
+  geompy.addToStudy(Import, "Import")
 
   # ImportBREP, ImportIGES, ImportSTEP
   ImportBREP = geompy.ImportBREP(fileExportImportBREP)
   ImportIGES = geompy.ImportIGES(fileExportImportIGES)
   ImportSTEP = geompy.ImportSTEP(fileExportImportSTEP)
 
-  id_ImportBREP = geompy.addToStudy(ImportBREP, "ImportBREP")
-  id_ImportIGES = geompy.addToStudy(ImportIGES, "ImportIGES")
-  id_ImportSTEP = geompy.addToStudy(ImportSTEP, "ImportSTEP")
+  geompy.addToStudy(ImportBREP, "ImportBREP")
+  geompy.addToStudy(ImportIGES, "ImportIGES")
+  geompy.addToStudy(ImportSTEP, "ImportSTEP")
+
+  # GetIGESUnit and GetSTEPUnit
+  if geompy.GetIGESUnit(fileExportImportIGES) != "M":
+    ImportIGES_scaled = geompy.ImportIGES(fileExportImportIGES, True)
+    geompy.addToStudy(ImportIGES_scaled, "ImportIGES_scaled")
+
+  if geompy.GetSTEPUnit(fileExportImportSTEP) != "M":
+    ImportSTEP_scaled = geompy.ImportSTEP(fileExportImportSTEP, True)
+    geompy.addToStudy(ImportSTEP_scaled, "ImportSTEP_scaled")
 
   # Remove files for Export/Import testing
   os.remove(fileExportImport)
diff --git a/src/GEOM_SWIG/geompyDC.py b/src/GEOM_SWIG/geompyDC.py
index 8833a4de9..1fb5f2560 100644
--- a/src/GEOM_SWIG/geompyDC.py
+++ b/src/GEOM_SWIG/geompyDC.py
@@ -7321,12 +7321,13 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #  @param theFileName The file, containing the shape.
         #  @param theFormatName Specify format for the file reading.
         #         Available formats can be obtained with InsertOp.ImportTranslators() method.
-        #         If format 'IGES_SCALE' is used instead 'IGES' length unit will be
-        #         set to 'meter' and result model will be scaled.
+        #         If format 'IGES_SCALE' is used instead of 'IGES' or
+        #            format 'STEP_SCALE' is used instead of 'STEP',
+        #            length unit will be set to 'meter' and result model will be scaled.
         #  @return New GEOM.GEOM_Object, containing the imported shape.
         #
         #  @ref swig_Import_Export "Example"
-        def ImportFile(self,theFileName, theFormatName):
+        def ImportFile(self, theFileName, theFormatName):
             """
             Import a shape from the BREP or IGES or STEP file
             (depends on given format) with given name.
@@ -7334,9 +7335,10 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             Parameters: 
                 theFileName The file, containing the shape.
                 theFormatName Specify format for the file reading.
-                              Available formats can be obtained with geompy.InsertOp.ImportTranslators() method.
-                              If format 'IGES_SCALE' is used instead 'IGES' length unit will be
-                              set to 'meter' and result model will be scaled.
+                    Available formats can be obtained with geompy.InsertOp.ImportTranslators() method.
+                    If format 'IGES_SCALE' is used instead of 'IGES' or
+                       format 'STEP_SCALE' is used instead of 'STEP',
+                       length unit will be set to 'meter' and result model will be scaled.
 
             Returns:
                 New GEOM.GEOM_Object, containing the imported shape.
@@ -7347,7 +7349,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             return anObj
 
         ## Deprecated analog of ImportFile()
-        def Import(self,theFileName, theFormatName):
+        def Import(self, theFileName, theFormatName):
             """
             Deprecated analog of geompy.ImportFile
             """
@@ -7359,7 +7361,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         ## Shortcut to ImportFile() for BREP format
         #
         #  @ref swig_Import_Export "Example"
-        def ImportBREP(self,theFileName):
+        def ImportBREP(self, theFileName):
             """
             geompy.ImportFile(...) function for BREP format
             """
@@ -7367,49 +7369,67 @@ class geompyDC(GEOM._objref_GEOM_Gen):
             return self.ImportFile(theFileName, "BREP")
 
         ## Shortcut to ImportFile() for IGES format
+        #  @param doScale If True, file length units will be ignored (set to 'meter')
+        #                 and result model will be scaled.
+        #                 If False (default), file length units will be taken into account.
         #
         #  @ref swig_Import_Export "Example"
-        def ImportIGES(self,theFileName):
+        def ImportIGES(self, theFileName, doScale = False):
             """
             geompy.ImportFile(...) function for IGES format
+
+            Parameters: 
+                doScale If True, file length units will be ignored (set to 'meter')
+                        and result model will be scaled.
+                        If False (default), file length units will be taken into account.
             """
             # Example: see GEOM_TestOthers.py
+            if doScale:
+                return self.ImportFile(theFileName, "IGES_SCALE")
             return self.ImportFile(theFileName, "IGES")
 
         ## Return length unit from given IGES file
+        #  @param doScale If True, file length units will be ignored (set to 'meter')
+        #                 and result model will be scaled.
+        #                 If False (default), file length units will be taken into account.
         #
         #  @ref swig_Import_Export "Example"
-        def GetIGESUnit(self,theFileName):
+        def GetIGESUnit(self, theFileName, doScale = False):
             """
-            Return length unit from given IGES file
+            Return length units from given IGES file
             """
             # Example: see GEOM_TestOthers.py
-            anObj = self.InsertOp.ImportFile(theFileName, "IGES_UNIT")
-            #RaiseIfFailed("Import", self.InsertOp)
-            # recieve name using returned vertex
-            UnitName = "M"
-            if anObj.GetShapeType() == GEOM.VERTEX:
-                vertices = [anObj]
-            else:
-                vertices = self.SubShapeAll(anObj,ShapeType["VERTEX"])
-            if len(vertices)>0:
-                p = self.PointCoordinates(vertices[0])
-                if abs(p[0]-0.01) < 1.e-6:
-                    UnitName = "CM"
-                elif abs(p[0]-0.001) < 1.e-6:
-                    UnitName = "MM"
-            return UnitName
+            aUnitName = self.InsertOp.ReadValue(theFileName, "IGES", "LEN_UNITS")
+            return aUnitName
 
         ## Shortcut to ImportFile() for STEP format
         #
         #  @ref swig_Import_Export "Example"
-        def ImportSTEP(self,theFileName):
+        def ImportSTEP(self, theFileName, doScale = False):
             """
             geompy.ImportFile(...) function for STEP format
+
+            Parameters: 
+                doScale If True, file length units will be ignored (set to 'meter')
+                        and result model will be scaled.
+                        If False (default), file length units will be taken into account.
             """
             # Example: see GEOM_TestOthers.py
+            if doScale:
+                return self.ImportFile(theFileName, "STEP_SCALE")
             return self.ImportFile(theFileName, "STEP")
 
+        ## Return length unit from given IGES or STEP file
+        #
+        #  @ref swig_Import_Export "Example"
+        def GetSTEPUnit(self, theFileName):
+            """
+            Return length units from given STEP file
+            """
+            # Example: see GEOM_TestOthers.py
+            aUnitName = self.InsertOp.ReadValue(theFileName, "STEP", "LEN_UNITS")
+            return aUnitName
+
         ## Read a shape from the binary stream, containing its bounding representation (BRep).
         #  @note This method will not be dumped to the python script by DumpStudy functionality.
         #  @note GEOM.GEOM_Object.GetShapeStream() method can be used to obtain the shape's BRep stream.
@@ -7442,7 +7462,7 @@ class geompyDC(GEOM._objref_GEOM_Gen):
         #         Available formats can be obtained with InsertOp.ImportTranslators() method.
         #
         #  @ref swig_Import_Export "Example"
-        def Export(self,theObject, theFileName, theFormatName):
+        def Export(self, theObject, theFileName, theFormatName):
             """
             Export the given shape into a file with given name.
 
diff --git a/src/IGESImport/IGESImport.cxx b/src/IGESImport/IGESImport.cxx
index e9c73ac4a..3eba47108 100644
--- a/src/IGESImport/IGESImport.cxx
+++ b/src/IGESImport/IGESImport.cxx
@@ -108,10 +108,10 @@ extern "C"
         if (!aModel.IsNull()) {
           aValue = aModel->GlobalSection().UnitName();
 
-          if (!aValue.IsNull()) {
-            Handle(TCollection_HAsciiString) aPrefix = new TCollection_HAsciiString ("UNIT_");
-            aValue->Prepend(aPrefix);
-          }
+          //if (!aValue.IsNull()) {
+          //  Handle(TCollection_HAsciiString) aPrefix = new TCollection_HAsciiString ("UNIT_");
+          //  aValue->Prepend(aPrefix);
+          //}
         }
       }
       else {
diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index 8a4015043..9b5f1e996 100644
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@@ -124,13 +124,13 @@ extern "C"
         if (anUnitLengthNames.Length() > 0) {
           TCollection_AsciiString aLenUnits = anUnitLengthNames.First();
           if (aLenUnits == "millimetre")
-            aValue = new TCollection_HAsciiString ("UNIT_MM");
+            aValue = new TCollection_HAsciiString ("MM");
           else if (aLenUnits == "centimetre")
-            aValue = new TCollection_HAsciiString ("UNIT_CM");
+            aValue = new TCollection_HAsciiString ("CM");
           else if (aLenUnits == "metre")
-            aValue = new TCollection_HAsciiString ("UNIT_M");
+            aValue = new TCollection_HAsciiString ("M");
           else if (aLenUnits == "INCH")
-            aValue = new TCollection_HAsciiString ("UNIT_INCH");
+            aValue = new TCollection_HAsciiString ("INCH");
           // TODO
           //else if (aLenUnits == "")
           //  aValue = new TCollection_HAsciiString ("");
-- 
2.39.2