Refactoring code and translation

diff --git a/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.cpp b/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.cpp
index a0067e55d5f1eeb32d150ea39aeadcf166147f30..0a380678e7a506e05054268538fa7b0a6a841c39 100644 (file)
--- a/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.cpp
+++ b/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.cpp
@@ -39,7 +39,7 @@ std::list<double> getBasicProperties(const std::shared_ptr<ModelAPI_Document>& t
       aPointCoodFeat->attribute(FeaturesPlugin_GeometryCalculation::RESULT_VALUES_ID()));
 
   for (int i : {0, 1, 2})
-    res.push_back( aResult->value(i));
+    res.push_back(aResult->value(i));
 
   return res;
 }

diff --git a/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.h b/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.h
index 8b912eaa73cc90313cc3bc0c77637095e6ee4a32..64e0f87c9317eb0eb7c941b8911aa56b8b4ece77 100644 (file)
--- a/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.h
+++ b/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.h
@@ -29,7 +29,7 @@ class ModelAPI_Document;
 class ModelHighAPI_Selection;
 
 /// \ingroup CPPHighAPI
-/// \brief get the basic properties (lenght, Surface area, volume)
+/// \brief get the basic properties (length, Surface area, volume)
 FEATURESAPI_EXPORT
 std::list<double> getBasicProperties(const std::shared_ptr<ModelAPI_Document>& thePart,
                                      const ModelHighAPI_Selection& theObject);

diff --git a/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.cpp b/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.cpp
index fb74e5f8a635f27a9101731ff5a4564aa23ee007..0b928f24a6bee8f27f52ed8950309b2dc3a1ecf4 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.cpp
@@ -46,7 +46,7 @@ void FeaturesPlugin_GeometryCalculation::initAttributes()
   // attribute for point selected
   data()->addAttribute(OBJECT_SELECTED_ID(), ModelAPI_AttributeSelection::typeId());
   // attributes for result message and values
-  data()->addAttribute(LENGHT_ID(), ModelAPI_AttributeString::typeId());
+  data()->addAttribute(LENGTH_ID(), ModelAPI_AttributeString::typeId());
   data()->addAttribute(AREA_ID(), ModelAPI_AttributeString::typeId());
   data()->addAttribute(VOLUME_ID(), ModelAPI_AttributeString::typeId());
 
@@ -100,7 +100,7 @@ void FeaturesPlugin_GeometryCalculation::attributeChanged(const std::string& the
       aValues->setValue(2, aVolume);
     }
 
-    string(LENGHT_ID())->setValue("Lenght = " +  streamL.str());
+    string(LENGTH_ID())->setValue("Length = " +  streamL.str());
     string(AREA_ID())->setValue("Area = " +  streamA.str());
     string(VOLUME_ID())->setValue("Volume = " +  streamV.str());
   }

diff --git a/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.h b/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.h
index 0eaeaa13410535b48f24eb2131c1808e2601e23f..bd90966f88fe5a2bff8b3b31cd900b326a3be160 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.h
@@ -52,11 +52,11 @@ public:
     return MY_OBJECT_SELECTED_ID;
   }
 
-  /// Attribute name for lenght
-  inline static const std::string& LENGHT_ID()
+  /// Attribute name for length
+  inline static const std::string& LENGTH_ID()
   {
-    static const std::string MY_LENGHT_ID("lenght");
-    return MY_LENGHT_ID;
+    static const std::string MY_LENGTH_ID("length");
+    return MY_LENGTH_ID;
   }
 
   /// Attribute name for area

diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
index 6f821a2e2fa1c59eadfbf68ab80c4f2e9fbd427a..2762a5519f2e0211c7e8356fc6a4ea9c9fe5a8bb 100644 (file)
--- a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
+++ b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
@@ -115,6 +115,10 @@
       <source>Angular Copy</source>
       <translation>Copie angulaire</translation>
     </message>
+    <message>
+      <source>Geometry calculation</source>
+      <translation>Calcul géométrique</translation>
+    </message>
     <message>
       <source>Linear copy</source>
       <translation>Copie linéaire</translation>
@@ -4454,7 +4458,31 @@
       <translation>Deuxième direction</translation>
     </message>
   </context>
-
+  
+  <!-- Geometry calculation -->
+  <context>
+    <name>GeometryCalculation</name>
+    <message>
+      <source>Geometry calculation</source>
+      <translation>Calcul géométrique</translation>
+    </message>
+    <message>
+      <source>GeometryCalculation:Object</source>
+      <translation>Objet</translation>
+    </message>
+    <message>
+      <source>GeometryCalculation:Length</source>
+      <translation>Longueur</translation>
+    </message>
+    <message>
+      <source>GeometryCalculation:Area</source>
+      <translation>Surface</translation>
+    </message>
+    <message>
+      <source>GeometryCalculation:Volume</source>
+      <translation>Volume</translation>
+    </message>
+  </context>
   <!-- Measurement -->
   <context>
     <name>Measurement</name>

diff --git a/src/FeaturesPlugin/doc/examples/basic_properties.py b/src/FeaturesPlugin/doc/examples/basic_properties.py
index 68a1949e1c8925999909de4e72ba2f2d3253800a..ab4284810f580293f21ac3ad90a202a916a2fde1 100644 (file)
--- a/src/FeaturesPlugin/doc/examples/basic_properties.py
+++ b/src/FeaturesPlugin/doc/examples/basic_properties.py
@@ -7,7 +7,7 @@ Part_1 = model.addPart(partSet)
 Part_1_doc = Part_1.document()
 Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
 properties = model.getBasicProperties(Part_1_doc,model.selection("SOLID", "Box_1_1"))
-print(" lenght: ", properties[0])
+print(" length: ", properties[0])
 print(" area: ", properties[1])
 print(" volume: ", properties[2]) 
 model.end()
\ No newline at end of file

diff --git a/src/FeaturesPlugin/doc/geometryCalculationFeature.rst b/src/FeaturesPlugin/doc/geometryCalculationFeature.rst
index 4018f219de6c5368ae96de9974be6c6b4179875a..1b0dea0bd5c75367b2f0dc9a2ab85412a990248f 100644 (file)
--- a/src/FeaturesPlugin/doc/geometryCalculationFeature.rst
+++ b/src/FeaturesPlugin/doc/geometryCalculationFeature.rst
@@ -5,7 +5,7 @@ Geometry calculation
 
 The **Geometry calculation** feature displays basic properties of sub-elements of a geometrical object (shape).
 
-The basic properties displayed in the property panel are lenght, area and volume.
+The basic properties displayed in the property panel are length, area and volume.
 
 **Apply** button does not generate any result and has the same effect as **Cancel** for this feature.  
 
@@ -33,6 +33,6 @@ The basic properties displayed can be selected.
 
     :param part: The current part object.
     :param object: A shape in format *model.selection("type", shape)*.
-    :return: list containing lenght, area and volume.
+    :return: list containing length, area and volume.
 
 **See Also** a sample TUI Script of :ref:`tui_basic_properties` operation.
\ No newline at end of file

diff --git a/src/FeaturesPlugin/geometry_calculation_widget.xml b/src/FeaturesPlugin/geometry_calculation_widget.xml
index da30ff1766bfcdeef3604e39765b5164880f0374..73c6bcc07ae0547b13ed3f92b0540aebbaf55f39 100644 (file)
--- a/src/FeaturesPlugin/geometry_calculation_widget.xml
+++ b/src/FeaturesPlugin/geometry_calculation_widget.xml
@@ -7,7 +7,7 @@
                   geometrical_selection="true">
     <validator id="GeomValidators_ShapeType" parameters="line,edge,wire,face,shell,solid,compsolid,compound"/>
   </shape_selector>
-  <label id="lenght" isSelectable = "true"/>
+  <label id="length" isSelectable = "true"/>
   <label id="area" isSelectable = "true"/>
   <label id="volume" isSelectable = "true"/>
 </source>

diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index 343c77567b99c013ce1543acc8b7add3f4e1b8e2..18f26315dfd3f79fc2c8e9e47a79d8a01aba1501 100644 (file)
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -173,7 +173,7 @@
   </workbench>
   <workbench id="Inspection">
     <group id="Calculation">
-      <feature id="GeometryCalculation" title="Geometry Calculation" tooltip="Calculate properties of objects"
+      <feature id="GeometryCalculation" title="Geometry calculation" tooltip="Calculate properties of objects"
                icon="icons/Features/basicproperties.png" helpfile="geometryCalculationFeature.html" abort_confirmation="false">
         <source path="geometry_calculation_widget.xml"/>
       </feature>

diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.h b/src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.h
index 4db5dc4f22799f79dab1e22bea9334f7056c6912..6ad8974c6c9c030ac81e54f7c84b7748f929f6a0 100644 (file)
--- a/src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.h
@@ -27,7 +27,7 @@
 /// Run chamfer operation with two distances or with a distance and an angle .
   /// \param theShape      the shape
   /// \param theTolerance  tolerance desirated
-  /// \param theLength     lenght calculated
+  /// \param theLength     length calculated
   /// \param theSurfArea   Surface Area calculated
   /// \param theVolume     Volume calculated
   /// \param theError      error