0021511: EDF 2153 GEOM: Choose to take units into account or not when importing a...

- Additional change: return native units as they are read from the STEP file

diff --git a/src/GEOMToolsGUI/GEOMToolsGUI.cxx b/src/GEOMToolsGUI/GEOMToolsGUI.cxx
index ceca9830c43ff0f07c4403fb0e19c26c9e02c772..01f2c182f63289704f0f28c68f863313d689af99 100644 (file)
--- 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");
       QString aUnitsStr (aUnits.in());
       bool needConvert = true;
-      if (aUnitsStr.isEmpty() || aUnitsStr == "M")
+      if (aUnitsStr.isEmpty() || aUnitsStr == "M" || aUnitsStr.toLower() == "metre")
         needConvert = false;
 
       if (needConvert) {

diff --git a/src/STEPImport/STEPImport.cxx b/src/STEPImport/STEPImport.cxx
index b82765339ce7a7557f70f1fae80689de56e8c106..7ad82583345fe7c232e73a1601b3d22e7f1a1910 100644 (file)
--- a/src/STEPImport/STEPImport.cxx
+++ b/src/STEPImport/STEPImport.cxx
@@ -122,6 +122,8 @@ extern "C"
         TColStd_SequenceOfAsciiString anUnitSolidAngleNames;
         aReader.FileUnits(anUnitLengthNames, anUnitAngleNames, anUnitSolidAngleNames);
         if (anUnitLengthNames.Length() > 0) {
+         aValue = new TCollection_HAsciiString( anUnitLengthNames.First() );
+         /*
           TCollection_AsciiString aLenUnits = anUnitLengthNames.First();
           if (aLenUnits == "millimetre")
             aValue = new TCollection_HAsciiString ("MM");
@@ -141,6 +143,7 @@ extern "C"
           //  std::cout << ", " << anUnitLengthNames.Value(ii);
           //std::cout << std::endl;
           // tmp end
+         */
         }
       }
       else {
@@ -207,7 +210,7 @@ extern "C"
             }
             // TODO (for other units than mm, cm, m or inch)
             //else if (aLenUnits == "")
-            //  Interface_Static::SetCVal("xstep.cascade.unit", "");
+            //  Interface_Static::SetCVal("xstep.cascade.unit", "???");
           }
         }
         else {