Rename length unit to linear unit.

Author: kovacsv

dist/occt-import-js.wasm

@@ -372,20 +372,20 @@ Importer::Result ImporterXcaf::LoadFile (const std::vector<std::uint8_t>& fileCo
     document = new TDocStd_Document ("XmlXCAF");
 
     UnitsMethods_LengthUnit lengthUnit = UnitsMethods_LengthUnit_Millimeter;
-    switch (params.lengthUnit) {
-        case ImportParams::LengthUnit::Millimeter:
+    switch (params.linearUnit) {
+        case ImportParams::LinearUnit::Millimeter:
             lengthUnit = UnitsMethods_LengthUnit_Millimeter;
             break;
-        case ImportParams::LengthUnit::Centimeter:
+        case ImportParams::LinearUnit::Centimeter:
             lengthUnit = UnitsMethods_LengthUnit_Centimeter;
             break;
-        case ImportParams::LengthUnit::Meter:
+        case ImportParams::LinearUnit::Meter:
             lengthUnit = UnitsMethods_LengthUnit_Meter;
             break;
-        case ImportParams::LengthUnit::Inch:
+        case ImportParams::LinearUnit::Inch:
             lengthUnit = UnitsMethods_LengthUnit_Inch;
             break;
-        case ImportParams::LengthUnit::Foot:
+        case ImportParams::LinearUnit::Foot:
             lengthUnit = UnitsMethods_LengthUnit_Foot;
             break;
         default:

occt-import-js/src/importer-xcaf.cpp

@@ -49,7 +49,7 @@ Node::~Node ()
 }
 
 ImportParams::ImportParams () :
-    lengthUnit (LengthUnit::Millimeter),
+    linearUnit (LinearUnit::Millimeter),
     linearDeflectionType (LinearDeflectionType::BoundingBoxRatio),
     linearDeflection (0.001),
     angularDeflection (0.5)

occt-import-js/src/importer.cpp

@@ -62,13 +62,7 @@ class Node
 class ImportParams
 {
 public:
-    enum class LinearDeflectionType
-    {
-        BoundingBoxRatio,
-        AbsoluteValue
-    };
-
-    enum class LengthUnit
+    enum class LinearUnit
     {
         Millimeter,
         Centimeter,
@@ -77,9 +71,15 @@ class ImportParams
         Foot
     };
 
+    enum class LinearDeflectionType
+    {
+        BoundingBoxRatio,
+        AbsoluteValue
+    };
+
     ImportParams ();
 
-    LengthUnit lengthUnit;
+    LinearUnit linearUnit;
     LinearDeflectionType linearDeflectionType;
     double linearDeflection;
     double angularDeflection;

occt-import-js/src/importer.hpp

@@ -176,19 +176,19 @@ static ImportParams GetImportParams (const emscripten::val& paramsVal)
         return params;
     }
 
-    if (paramsVal.hasOwnProperty ("lengthUnit")) {
-        emscripten::val lengthUnit = paramsVal["lengthUnit"];
-        std::string lengthUnitStr = lengthUnit.as<std::string> ();
-        if (lengthUnitStr == "millimeter") {
-            params.lengthUnit = ImportParams::LengthUnit::Millimeter;
-        } else if (lengthUnitStr == "centimeter") {
-            params.lengthUnit = ImportParams::LengthUnit::Centimeter;
-        } else if (lengthUnitStr == "meter") {
-            params.lengthUnit = ImportParams::LengthUnit::Meter;
-        } else if (lengthUnitStr == "inch") {
-            params.lengthUnit = ImportParams::LengthUnit::Inch;
-        } else if (lengthUnitStr == "foot") {
-            params.lengthUnit = ImportParams::LengthUnit::Foot;
+    if (paramsVal.hasOwnProperty ("linearUnit")) {
+        emscripten::val linearUnit = paramsVal["linearUnit"];
+        std::string linearUnitStr = linearUnit.as<std::string> ();
+        if (linearUnitStr == "millimeter") {
+            params.linearUnit = ImportParams::LinearUnit::Millimeter;
+        } else if (linearUnitStr == "centimeter") {
+            params.linearUnit = ImportParams::LinearUnit::Centimeter;
+        } else if (linearUnitStr == "meter") {
+            params.linearUnit = ImportParams::LinearUnit::Meter;
+        } else if (linearUnitStr == "inch") {
+            params.linearUnit = ImportParams::LinearUnit::Inch;
+        } else if (linearUnitStr == "foot") {
+            params.linearUnit = ImportParams::LinearUnit::Foot;
         }
     }
 

occt-import-js/src/js-interface.cpp

@@ -292,8 +292,8 @@ it ('Manual deflection with absolute value', function () {
 });
 
 it ('Manual deflection with absolute value and units', function () {
-    CheckVertexParamCount ({ lengthUnit : 'millimeter', linearDeflectionType : 'absolute_value', linearDeflection : 10 }, 162);
-	CheckVertexParamCount ({ lengthUnit : 'meter', linearDeflectionType : 'absolute_value', linearDeflection : 0.01 }, 162);
+    CheckVertexParamCount ({ linearUnit : 'millimeter', linearDeflectionType : 'absolute_value', linearDeflection : 10 }, 162);
+	CheckVertexParamCount ({ linearUnit : 'meter', linearDeflectionType : 'absolute_value', linearDeflection : 0.01 }, 162);
 });
 
 });
@@ -322,17 +322,17 @@ it ('Default unit is mm', function () {
 });
 
 it ('Convert to m', function () {
-	CheckXSize ({ lengthUnit : 'meter' }, 'cube-m.step', 1.0);
-	CheckXSize ({ lengthUnit : 'meter' }, 'cube-mm.step', 1.0);
-	CheckXSize ({ lengthUnit : 'meter' }, 'cube-in.step', 1.0);
+	CheckXSize ({ linearUnit : 'meter' }, 'cube-m.step', 1.0);
+	CheckXSize ({ linearUnit : 'meter' }, 'cube-mm.step', 1.0);
+	CheckXSize ({ linearUnit : 'meter' }, 'cube-in.step', 1.0);
 });
 
 it ('Convert to other units', function () {
-	CheckXSize ({ lengthUnit : 'millimeter' }, 'cube-m.step', 1000.0);
-	CheckXSize ({ lengthUnit : 'centimeter' }, 'cube-m.step', 100.0);
-	CheckXSize ({ lengthUnit : 'meter' }, 'cube-m.step', 1.0);
-	CheckXSize ({ lengthUnit : 'inch' }, 'cube-m.step', 39.37007);
-	CheckXSize ({ lengthUnit : 'foot' }, 'cube-m.step', 3.28084);
+	CheckXSize ({ linearUnit : 'millimeter' }, 'cube-m.step', 1000.0);
+	CheckXSize ({ linearUnit : 'centimeter' }, 'cube-m.step', 100.0);
+	CheckXSize ({ linearUnit : 'meter' }, 'cube-m.step', 1.0);
+	CheckXSize ({ linearUnit : 'inch' }, 'cube-m.step', 39.37007);
+	CheckXSize ({ linearUnit : 'foot' }, 'cube-m.step', 3.28084);
 });
 
 });