From 833a89695f2b643fcd417c2ff9126444b14cc121 Mon Sep 17 00:00:00 2001
From: lucasjerome <jerome.lucas@cegsenslab.fr>
Date: Wed, 23 Dec 2020 12:38:23 +0100
Subject: [PATCH] #20500 : Update Geometry calculation and fix translation

---
 .../FeaturesAPI_GeometryCalculation.cpp       |   9 +-
 .../FeaturesAPI_GeometryCalculation.h         |   6 +-
 src/FeaturesPlugin/Bounding_Box_widget.xml    |   2 +-
 src/FeaturesPlugin/CMakeLists.txt             |   3 +-
 .../Create_Bounding_Box_widget.xml            |   2 +-
 .../FeaturesPlugin_BoundingBox.cpp            |   5 +-
 .../FeaturesPlugin_BoundingBox.h              |   2 +-
 .../FeaturesPlugin_CreateBoundingBox.cpp      |   2 +-
 .../FeaturesPlugin_CreateBoundingBox.h        |   2 +-
 .../FeaturesPlugin_GeometryCalculation.cpp    |  31 +++---
 .../FeaturesPlugin_GeometryCalculation.h      |  12 +--
 src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts   |  99 +++++++++++++++++-
 src/FeaturesPlugin/Test/TestBoundingBox.py    |   2 +-
 .../Test/TestGeometryCalculation.py           |  80 ++++++++++++++
 src/FeaturesPlugin/doc/FeaturesPlugin.rst     |   1 +
 .../doc/TUI_geometry_calculation.rst          |  12 +++
 .../doc/examples/geometry_calculation.py      |  13 +++
 .../doc/geometryCalculationFeature.rst        |  38 +++++++
 .../doc/images/geometryCalculation.png        | Bin 0 -> 809 bytes
 .../geometryCalculationPropertyPanel.png      | Bin 0 -> 11752 bytes
 .../geometry_calculation_widget.xml           |  13 +++
 .../icons/geometryCalculation.png             | Bin 0 -> 809 bytes
 src/FeaturesPlugin/plugin-Features.xml        |   6 +-
 src/GeomAlgoAPI/CMakeLists.txt                |   4 +-
 ...pp => GeomAlgoAPI_GeometryCalculation.cpp} |  36 +++----
 ...es.h => GeomAlgoAPI_GeometryCalculation.h} |  18 ++--
 src/ModuleBase/ModuleBase_WidgetLabel.cpp     |   9 +-
 src/ModuleBase/ModuleBase_WidgetLabel.h       |   2 +
 src/PythonAPI/model/features/__init__.py      |   2 +-
 29 files changed, 339 insertions(+), 72 deletions(-)
 create mode 100644 src/FeaturesPlugin/Test/TestGeometryCalculation.py
 create mode 100644 src/FeaturesPlugin/doc/TUI_geometry_calculation.rst
 create mode 100644 src/FeaturesPlugin/doc/examples/geometry_calculation.py
 create mode 100644 src/FeaturesPlugin/doc/geometryCalculationFeature.rst
 create mode 100644 src/FeaturesPlugin/doc/images/geometryCalculation.png
 create mode 100644 src/FeaturesPlugin/doc/images/geometryCalculationPropertyPanel.png
 create mode 100644 src/FeaturesPlugin/geometry_calculation_widget.xml
 create mode 100644 src/FeaturesPlugin/icons/geometryCalculation.png
 rename src/GeomAlgoAPI/{GeomAlgoAPI_BasicProperties.cpp => GeomAlgoAPI_GeometryCalculation.cpp} (61%)
 rename src/GeomAlgoAPI/{GeomAlgoAPI_BasicProperties.h => GeomAlgoAPI_GeometryCalculation.h} (72%)

diff --git a/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.cpp b/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.cpp
index 9bf0ae406..666489e0a 100644
--- a/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.cpp
+++ b/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.cpp
@@ -24,8 +24,9 @@
 #include <ModelHighAPI_Services.h>
 #include <ModelHighAPI_Tools.h>
 
-std::list<double>  getBasicProperties(const std::shared_ptr<ModelAPI_Document>& thePart,
-                                      const ModelHighAPI_Selection& theObject)
+//=================================================================================================
+std::list<double> getGeometryCalculation(const std::shared_ptr<ModelAPI_Document>& thePart,
+                                         const ModelHighAPI_Selection& theObject)
 {
   FeaturePtr aPointCoodFeat = thePart->addFeature(FeaturesPlugin_GeometryCalculation::ID());
 
@@ -37,8 +38,8 @@ std::list<double>  getBasicProperties(const std::shared_ptr<ModelAPI_Document>&
   AttributeDoubleArrayPtr aResult = std::dynamic_pointer_cast<ModelAPI_AttributeDoubleArray>(
       aPointCoodFeat->attribute(FeaturesPlugin_GeometryCalculation::RESULT_VALUES_ID()));
 
-  for ( int i : {0, 1, 2})
-    res.push_back( aResult->value(i));
+  for (int i : {0, 1, 2})
+    res.push_back(aResult->value(i));
 
   return res;
 }
diff --git a/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.h b/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.h
index abed69276..b1b6cb312 100644
--- a/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.h
+++ b/src/FeaturesAPI/FeaturesAPI_GeometryCalculation.h
@@ -29,9 +29,9 @@ class ModelAPI_Document;
 class ModelHighAPI_Selection;
 
 /// \ingroup CPPHighAPI
-/// \brief get the basic properties (lenght, Surface area, volume)
+/// \brief get the geometry calculation (length, Surface area, volume)
 FEATURESAPI_EXPORT
-std::list<double>  getBasicProperties(const std::shared_ptr<ModelAPI_Document>& thePart,
-                                      const ModelHighAPI_Selection& theObject);
+std::list<double> getGeometryCalculation(const std::shared_ptr<ModelAPI_Document>& thePart,
+                                         const ModelHighAPI_Selection& theObject);
 
 #endif // FeaturesAPI_GeometryCalculation_H_
\ No newline at end of file
diff --git a/src/FeaturesPlugin/Bounding_Box_widget.xml b/src/FeaturesPlugin/Bounding_Box_widget.xml
index 0dc8a0d12..b9a5e6f5a 100644
--- a/src/FeaturesPlugin/Bounding_Box_widget.xml
+++ b/src/FeaturesPlugin/Bounding_Box_widget.xml
@@ -1,5 +1,5 @@
 <source>
-  <shape_selector id="main_objects"
+  <shape_selector id="main_object"
                   label="Object"
                   tooltip="Select a object"
                   shape_types="vertex edge face solid compsolid compound object"
diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index 446b32b9d..ea702997e 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -162,7 +162,7 @@ SET(XML_RESOURCES
   fillet_widget.xml
   fillet1d_widget.xml
   measurement_widget.xml
-  GeometryCalculation_widget.xml
+  geometry_calculation_widget.xml
   Bounding_Box_widget.xml
   Create_Bounding_Box_widget.xml
   fusion_faces_widget.xml
@@ -708,5 +708,6 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestFillet1D_Wire_3.py
                TestFillet1D_Wire_4.py
                TestFillet1D_Wire_5.py
+               TestGeometryCalculation.py
                TestBoundingBox.py
 )
diff --git a/src/FeaturesPlugin/Create_Bounding_Box_widget.xml b/src/FeaturesPlugin/Create_Bounding_Box_widget.xml
index 02cb6484e..a59ecfb63 100644
--- a/src/FeaturesPlugin/Create_Bounding_Box_widget.xml
+++ b/src/FeaturesPlugin/Create_Bounding_Box_widget.xml
@@ -1,5 +1,5 @@
 <source>
-  <shape_selector id="main_objects"
+  <shape_selector id="main_object"
                   label="Object"
                   tooltip="Select a object"
                   shape_types="vertex edge face solid compsolid compound object"
diff --git a/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.cpp b/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.cpp
index b2a3c1580..323c6fa9c 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.cpp
@@ -177,9 +177,10 @@ void FeaturesPlugin_BoundingBox::updateBox()
     myCreateFeature->selection(FeaturesPlugin_CreateBoundingBox::OBJECTS_LIST_ID())
                           ->setValue( selection(OBJECTS_LIST_ID())->context(),
                                       selection(OBJECTS_LIST_ID())->value() );
-    
+
     AttributeDoubleArrayPtr aValuesFeatures =
-      std::dynamic_pointer_cast<ModelAPI_AttributeDoubleArray>(myCreateFeature->attribute(RESULT_VALUES_ID()));
+      std::dynamic_pointer_cast<ModelAPI_AttributeDoubleArray>
+                                (myCreateFeature->attribute(RESULT_VALUES_ID()));
     AttributeDoubleArrayPtr aValues =
       std::dynamic_pointer_cast<ModelAPI_AttributeDoubleArray>(attribute(RESULT_VALUES_ID()));
     for (int anI=0; anI < 6; anI++)
diff --git a/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.h b/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.h
index cb1f1aacd..509df64e6 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_BoundingBox.h
@@ -44,7 +44,7 @@ public:
   /// Attribute name for object selected.
   inline static const std::string& OBJECTS_LIST_ID()
   {
-    static const std::string MY_OBJECTS_LIST_ID("main_objects");
+    static const std::string MY_OBJECTS_LIST_ID("main_object");
     return MY_OBJECTS_LIST_ID;
   }
 
diff --git a/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.cpp b/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.cpp
index fc5f5cf64..9baee5543 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.cpp
@@ -106,7 +106,7 @@ void FeaturesPlugin_CreateBoundingBox::updateValues()
     if (!anIsCompute->value()) {
       myShape = aShape;
       anIsCompute->setValue(true);
-    } 
+    }
 
     if (aShape && !aShape->isEqual(myShape)) {
       double aXmin, aXmax, aYmin,aYmax,aZmin,aZmax;
diff --git a/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.h b/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.h
index cac4347ea..fd942b9f4 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_CreateBoundingBox.h
@@ -44,7 +44,7 @@ public:
   /// Attribute name for object selected.
   inline static const std::string& OBJECTS_LIST_ID()
   {
-    static const std::string MY_OBJECTS_LIST_ID("main_objects");
+    static const std::string MY_OBJECTS_LIST_ID("main_object");
     return MY_OBJECTS_LIST_ID;
   }
 
diff --git a/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.cpp b/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.cpp
index c16bc78a3..6a349920b 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.cpp
@@ -29,37 +29,38 @@
 #include <Config_PropManager.h>
 
 #include <GeomAPI_Shape.h>
-#include <GeomAPI_Pnt.h>
-#include <GeomAPI_Vertex.h>
-#include <GeomAlgoAPI_BasicProperties.h>
+#include <GeomAlgoAPI_GeometryCalculation.h>
 
 
 #include <iomanip>
 #include <sstream>
 
+//=================================================================================================
 FeaturesPlugin_GeometryCalculation::FeaturesPlugin_GeometryCalculation()
 {
 }
 
+//=================================================================================================
 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());
 
   data()->addAttribute(RESULT_VALUES_ID(), ModelAPI_AttributeDoubleArray::typeId());
-
   data()->realArray(RESULT_VALUES_ID())->setSize(3);
 
 }
 
+//=================================================================================================
 void FeaturesPlugin_GeometryCalculation::execute()
 {
 }
 
+//=================================================================================================
 void FeaturesPlugin_GeometryCalculation::attributeChanged(const std::string& theID)
 {
   if (theID == OBJECT_SELECTED_ID()) {
@@ -77,18 +78,18 @@ void FeaturesPlugin_GeometryCalculation::attributeChanged(const std::string& the
       if (!aShape && aSelection->context())
         aShape = aSelection->context()->shape();
     }
-    if (aShape){
+    if (aShape) {
       double aTolerance = 0.0001;
       double aLength;
       double aSurfArea;
       double aVolume;
       std::string aError;
-      if( !GetBasicProperties( aShape,
-                              aTolerance,
-                              aLength,
-                              aSurfArea,
-                              aVolume,
-                              aError) )
+      if (!getGeometryCalculation(aShape,
+                                  aTolerance,
+                                  aLength,
+                                  aSurfArea,
+                                  aVolume,
+                                  aError))
          setError("Error in Geometry calculation :" +  aError);
 
       streamL << std::setprecision(14) << aLength;
@@ -99,9 +100,9 @@ void FeaturesPlugin_GeometryCalculation::attributeChanged(const std::string& the
       aValues->setValue(2, aVolume);
     }
 
-    string(LENGHT_ID() )->setValue( "Lenght = " +  streamL.str() );
-    string(AREA_ID() )->setValue( "Area = " +  streamA.str() );
-    string(VOLUME_ID() )->setValue( "Volume = " +  streamV.str() );
+    string(LENGTH_ID())->setValue(streamL.str());
+    string(AREA_ID())->setValue(streamA.str());
+    string(VOLUME_ID())->setValue(streamV.str());
   }
 }
 
diff --git a/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.h b/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.h
index a41e85365..bd90966f8 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.h
+++ b/src/FeaturesPlugin/FeaturesPlugin_GeometryCalculation.h
@@ -33,7 +33,7 @@
 class FeaturesPlugin_GeometryCalculation : public ModelAPI_Feature
 {
 public:
-   inline static const std::string& ID()
+  inline static const std::string& ID()
   {
     static const std::string MY_ID("GeometryCalculation");
     return MY_ID;
@@ -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
@@ -73,7 +73,7 @@ public:
     return MY_VOLUME_ID;
   }
 
-   /// Attribute name for values of result.
+  /// Attribute name for values of result.
   inline static const std::string& RESULT_VALUES_ID()
   {
     static const std::string MY_RESULT_VALUES_ID("result_values");
diff --git a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
index 6f821a2e2..46fd40148 100644
--- a/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
+++ b/src/FeaturesPlugin/FeaturesPlugin_msg_fr.ts
@@ -115,6 +115,14 @@
       <source>Angular Copy</source>
       <translation>Copie angulaire</translation>
     </message>
+    <message>
+      <source>Bounding box</source>
+      <translation>Boite englobante</translation>
+    </message>
+    <message>
+      <source>Geometry calculation</source>
+      <translation>Calcul de la géométrie</translation>
+    </message>
     <message>
       <source>Linear copy</source>
       <translation>Copie linéaire</translation>
@@ -140,7 +148,30 @@
       <translation>Translation</translation>
     </message>
   </context>
-
+  
+  <!-- Bounding Box -->
+  <context>
+    <name>BoundingBox</name>
+    <message>
+      <source>BoundingBox</source>
+      <translation>Boite englobante</translation>
+    </message>
+    <message>
+      <source>Create box</source>
+      <translation>Créer la boite</translation>
+    </message>
+  </context>
+  <context>
+    <name>BoundingBoxMacro</name>
+    <message>
+      <source>BoundingBox</source>
+      <translation>Boite englobante</translation>
+    </message>
+    <message>
+      <source>Create box</source>
+      <translation>Créer la boite</translation>
+    </message>
+  </context>
   <!-- Chamfer -->
   <context>
     <name>Chamfer</name>
@@ -4327,7 +4358,73 @@
       <translation>Pas pour la direction angulaire</translation>
     </message>
   </context>
+  <!--Bounding box-->
+  <context>
+    <name>BoundingBoxMacro</name>
+    <message>
+      <source>Bounding box</source>
+      <translation>Boîte englobante</translation>
+    </message>
+  </context>
+  <context>
+    <name>BoundingBoxMacro:main_object</name>
+    <message>
+      <source>Object</source>
+      <translation>Objet</translation>
+    </message>
+  </context>
+  <context>
+  <name>BoundingBoxMacro:createbox</name>
+    <message>
+      <source>Create box</source>
+      <translation>Créer la boite</translation>
+    </message>
+  </context>
+  <context>
+    <name>BoundingBox</name>
+    <message>
+      <source>Bounding box</source>
+      <translation>Boîte englobante</translation>
+    </message>
+  </context>
+  <context>
+    <name>BoundingBox:main_object</name>
+    <message>
+      <source>Object</source>
+      <translation>Objet</translation>
+    </message>
+  </context>
 
+  <!--Geometry calculation-->
+  <context>
+    <name>GeometryCalculation</name>
+    <message>
+      <source>Geometry calculation</source>
+      <translation>Calcul de la géometrie</translation>
+    </message>
+  </context>
+  <context>
+    <name>GeometryCalculation:main_object</name>
+    <message>
+      <source>Object</source>
+      <translation>Objet</translation>
+    </message>
+  </context>
+  <context>
+  <name>GeometryCalculation</name>
+    <message>
+      <source>Length = </source>
+      <translation>Longueur = </translation>
+    </message>
+    <message>
+      <source>Area = </source>
+      <translation>Surface = </translation>
+    </message>
+    <message>
+      <source>Volume = </source>
+      <translation>Volume = </translation>
+    </message>
+  </context>
   <!-- LinearCopy -->
   <context>
     <name>LinearCopy</name>
diff --git a/src/FeaturesPlugin/Test/TestBoundingBox.py b/src/FeaturesPlugin/Test/TestBoundingBox.py
index 426a6df16..673445e86 100644
--- a/src/FeaturesPlugin/Test/TestBoundingBox.py
+++ b/src/FeaturesPlugin/Test/TestBoundingBox.py
@@ -52,7 +52,7 @@ def test_Bounding_Box():
     model.end()
 
     myDelta = 1e-6
-    Props = model.getBasicProperties(Part_1_doc,model.selection("SOLID", "BoundingBox_1_1"))
+    Props = model.getGeometryCalculation(Part_1_doc,model.selection("SOLID", "BoundingBox_1_1"))
 
     print(" Basic Properties:")
     print(" Wires length: ", Props[0])
diff --git a/src/FeaturesPlugin/Test/TestGeometryCalculation.py b/src/FeaturesPlugin/Test/TestGeometryCalculation.py
new file mode 100644
index 000000000..a3e1f1ec2
--- /dev/null
+++ b/src/FeaturesPlugin/Test/TestGeometryCalculation.py
@@ -0,0 +1,80 @@
+# Copyright (C) 2014-2020  CEA/DEN, EDF R&D
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+"""
+      Unit test of ...
+"""
+#=========================================================================
+# Initialization of the test
+#=========================================================================
+
+import salome
+
+import os
+import math
+
+from ModelAPI import *
+from salome.shaper import model
+
+
+
+__updated__ = "2020-11-12"
+
+
+#=========================================================================
+# test Geometry calculation
+#=========================================================================
+def test_Geometry_Calculation():
+
+    model.begin()
+    file_path = os.path.join(os.getenv("DATA_DIR"),"Shapes","Brep","box1.brep")
+    partSet = model.moduleDocument()
+    Part_1 = model.addPart(partSet)
+    Part_1_doc = Part_1.document()
+    Import_1 = model.addImport(Part_1_doc,file_path)
+    model.do()
+    
+    myDelta = 1e-6
+    Props = model.getGeometryCalculation(Part_1_doc,model.selection("SOLID", "box1_1"))
+
+    print(" Geometry calculation:")
+    print(" Wires length: ", Props[0])
+    print(" Surface area: ", Props[1])
+    print(" Volume      : ", Props[2]) 
+    
+    aReflength = 2400
+    aReslength = Props[0]
+    assert (math.fabs(aReslength - aReflength) < myDelta), "The surface is wrong: expected = {0}, real = {1}".format(aReflength, aReslength)
+
+    aRefSurface = 240000
+    aResSurface = Props[1]
+    assert (math.fabs(aResSurface - aRefSurface) < myDelta), "The surface is wrong: expected = {0}, real = {1}".format(aRefSurface, aResSurface)
+
+    aRefVolume = 8000000
+    aResVolume = Props[2]
+    assert (math.fabs(aResVolume - aRefVolume) < myDelta), "The volume is wrong: expected = {0}, real = {1}".format(aRefVolume, aResVolume)
+
+    
+if __name__ == '__main__':
+
+    test_Geometry_Calculation()
+        
+    #=========================================================================
+    # End of test
+    #=========================================================================
diff --git a/src/FeaturesPlugin/doc/FeaturesPlugin.rst b/src/FeaturesPlugin/doc/FeaturesPlugin.rst
index b63fb696d..5304756f4 100644
--- a/src/FeaturesPlugin/doc/FeaturesPlugin.rst
+++ b/src/FeaturesPlugin/doc/FeaturesPlugin.rst
@@ -24,6 +24,7 @@ Features plug-in provides a set of common topological operations. It implements
    importResultFeature.rst
    linearCopyFeature.rst
    measurementFeature.rst
+   geometryCalculationFeature.rst
    boundingBoxFeature.rst
    pipeFeature.rst
    placementFeature.rst
diff --git a/src/FeaturesPlugin/doc/TUI_geometry_calculation.rst b/src/FeaturesPlugin/doc/TUI_geometry_calculation.rst
new file mode 100644
index 000000000..43a8f06a8
--- /dev/null
+++ b/src/FeaturesPlugin/doc/TUI_geometry_calculation.rst
@@ -0,0 +1,12 @@
+
+  .. _tui_geometry_calculation:
+
+Get Geometry Calculation
+========================
+
+.. literalinclude:: examples/geometry_calculation.py 
+    :linenos:
+    :language: python
+
+:download:`Download this script <examples/geometry_calculation.py>`
+   
diff --git a/src/FeaturesPlugin/doc/examples/geometry_calculation.py b/src/FeaturesPlugin/doc/examples/geometry_calculation.py
new file mode 100644
index 000000000..e1e340a3b
--- /dev/null
+++ b/src/FeaturesPlugin/doc/examples/geometry_calculation.py
@@ -0,0 +1,13 @@
+import os
+from salome.shaper import model
+
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+properties = model.getGeometryCalculation(Part_1_doc,model.selection("SOLID", "Box_1_1"))
+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
new file mode 100644
index 000000000..2487d5317
--- /dev/null
+++ b/src/FeaturesPlugin/doc/geometryCalculationFeature.rst
@@ -0,0 +1,38 @@
+.. |GeometryCalculation.icon|    image:: images/geometryCalculation.png
+
+Geometry calculation
+====================
+
+The **Geometry calculation** feature displays basic properties of sub-elements of a geometrical object (shape).
+
+The geometry calculation 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.  
+
+To display geometry calculation in the active part:
+
+#. select in the Main Menu *Inspection - > Geometry calculation* item  or
+#. click |GeometryCalculation.icon| **Geometry calculation** button in the toolbar
+
+The geometry calculation can be displayed for a selected object in the property panel : 
+
+.. figure:: images/geometryCalculationPropertyPanel.png
+   :align: center
+
+   Geometry calculation
+
+Input fields:
+
+- **Object** contains an object selected in 3D OCC viewer or object browser. 
+
+The geometry calculation displayed can be selected.
+
+**TUI Command**:
+
+.. py:function:: model.getGeometryCalculation(Part_doc, shape)
+
+    :param part: The current part object.
+    :param object: A shape in format *model.selection("type", shape)*.
+    :return: list containing length, area and volume.
+
+**See Also** a sample TUI Script of :ref:`tui_geometry_calculation` operation.
\ No newline at end of file
diff --git a/src/FeaturesPlugin/doc/images/geometryCalculation.png b/src/FeaturesPlugin/doc/images/geometryCalculation.png
new file mode 100644
index 0000000000000000000000000000000000000000..f46c0da7a378a05f515f1b3583cec1a34526ddd7
GIT binary patch
literal 809
zcmV+^1J?YBP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;pGibPRCwBA{Qv(y12q9a0I?u*7#SH;fs`8oJ&%BR
z7ZC46mjF2qAb`LG3<JTM|9HUfKY#x}e)8<Ql(h5?sKrd^1_A^Sx`FHe{{8>|&mZjg
z<(tp{|NZ;-|NO-(-}w3Y_W;#9A{z=a10aA{&|J;*=N|(@dTBRYU|L5hLskWZUyvTn
zz|YUapr)?Lxq0g@3wKwCs_#GmlsW~(|3GR00tnrOo4)@1|Nq?=O#I>N|NlqMKKTFT
z*Z=?Tzy1IJ@%!)p+ji~y2n_cwpgtZ@6oAYC2q1J9GW`C_z))1v&Ct<M%23hJjUtzk
z9LF$u{!WHhuRk!TtH>}|8*B3c&9Mf0Rum}x3xojzh!Hv20Bzd@3?|>NKOpXBVnEO!
z@a_9ghL>+Y0O=nLTpa8Sa*})uN|HS1fd*y+rLO|b`UDU_7%uz;bYXof#AOv_r3@Wi
z2v>sm3l=Vd^V@*F02;;&B=~`t4I~B-Ko~B(|K`8%hc7^v0fm_u5i~jgiHiU|EHBJ>
z8OW^yMGVlaR{#OTge?pwPUvR%{u@G1p4bhhzy4xCp+Vw5|DdL85CITC7%sf}{J-yu
zcf@5g2_XgsZArKbPXf()4G=(BV|npxM7V_{lrpSYfEwE{v4WCP3`+n42*ZV^AO81!
z_zE-J{$VLY<i!{mOyyBs2oOLRF8l*@;g+S{SiR^PR?4t@6+$jO57UJJ0fb>7CouAD
z152<P_~Z9~6gf^dOf>)jgf$EgukS$-v+{=+a%^J{iWo>OIsgbD^e}vS@56tor*E;x
zDigc}fB<P>1_mVo#*aW|3@i)*0tnrOeLw|4KpL228JLMIq;Eid3Qp4i0fcVg5+J?_
n#413{PNac9L2(J=00bBSI@)&56%FA}00000NkvXXu0mjfN^nc_

literal 0
HcmV?d00001

diff --git a/src/FeaturesPlugin/doc/images/geometryCalculationPropertyPanel.png b/src/FeaturesPlugin/doc/images/geometryCalculationPropertyPanel.png
new file mode 100644
index 0000000000000000000000000000000000000000..17f8cd7ef35a4e3ef73b80f05ccea19b367dafcf
GIT binary patch
literal 11752
zcmb_?b8sfzw{9}Aor#T!ZB1<3w)MuC*qGS1ZB1-D6Wed>oP57i7w1;pd+MG#{YUTa
zU8{GmUcL9To_h8QSCA7&fW?6Y0Rcgfln_w@0Re^lx?X_(=j_`UUHR33I}1swKz|+H
z&?aGD_t-9?8ZOHAW-e}qPNpE{cJ{WWbk4?3rlxkz7WOVzU_JaGAVeUNB7!RJnHPWE
z+?7pnhk^EUQI`;O=oTj+W1AVwB0r1k6UhVMvA@+P(y1or`uo$aN{fJEV2{P6Xx4_E
zGi#60R(O%grg!?eKxYcUp$m2iEGNOGX96?Hj@+_u$+%jm52s{lgrGs+T2IVD78qLb
zg~C$ezypzm1Oo)2^Kw0A5uP5U_9be>;LG0VI$mD$y~c`CtE+Q?xE-nO=HzUd*$!s?
zTmiWEWF9++#YuHuW0+w*^EU@Ht>`Ggkzug6x8uz&?d-|NA6!s@i@gW7x2df5U|w?i
zq?<$dIsWwvw)2rlUJE7L^WA&5T2fdA`WMk2ikp|<mP~oHpEeZZ&F_7K9b)IO$@z8}
zdQo_DA#*Vd%Aw<b{@PZR36vmpaJ2L)BUr%Ac#kMd=&gPK%NY+ho>G%5vGXVP?=QE@
zmC-L>2vQF%kGwMRHdiUCD^Dh^g#o)u9+2xFoc#xTJkN*o&FIjtF??<^ZCaz_e~jvR
zSMMBqSU#ewy|GmzW0x=Xgr2B;^*KV+WqF?2=dLrg(n4)?$~LR%n*J6UKgl~#kpzfE
z<C?yAIS<PXMI%kMUu@JReDzRyLZ;o~^E&uD?gbLM+iW};AQEuKU3kadt{Bt~;qN3&
z$0|QGn97{!1cJCh+2G$OR*K>Br?aIX2G7TesP&t&`)<VJ6iF!z^q|(<X%FPUVDsd0
zrFXG-Dz(_aL_DRGJgm>Jc<_)aD9N#Osv!%jd5ax!AN<%=4>vRRJ$Px-$6Bt&1m!3H
zvE_?HT!%egPv&Gb=#Z{X6YVzple!VFkK?;??e7sn;g{N%8;m7DrS$XIy}Pv!`Y6h6
zsdgKhGv#BEX20jcWowvQ#S%H^c}*5KofRn^b+gI6>#eZ1{q9(MT_qd9aIq7VmFgfo
zp^B7XF!1={#5-VoMfgUu+q;HbRSHUJpoLXcD|Y9VX6QUeM*7=u3POqK{ha$N1gb^_
zX%3$BKsvJ2@R+QICmV~2GACa<JzKzZei(r?EfmG$cG8$B)v0zSs-XSt$-{c8{{qeU
z3DYTOOKfbe;i8p_6>~_!>=85~>~6t46<0TA8TRyIC)K-qm!@&KdbM~ccHRJ=W^x2?
zqxq*Vg*R%Z>w1IVr*X+vvk%lyHBOU{43EzQcN<2mYTHAk0s+1=4};s%@XBz!_eL7y
z=>_wtk9m=74SD^0RL>X$@=Ys>)8UWKmbG7f8FI+j&B2Nge*5owXRXO?goT?X>(h4d
z@6SI{9%6=_$B{SB>ymz>wK!jHnDI;Kj)&6F8xQ>H+Tzc@trX#|;uIMu>aVo$38dmP
zb6nb%NJ@kASYHm6+q&EvnC<dj?k2(^qI>xvz=dS+UfqSK^~oNnS66F#K>iz)5v|FZ
zDxROuQs+9apqxB;Pe5<DNYYD+yOaPpU`e&WoSK7}b2!$9FGJOmQ}@oEJAyUWdV7Y<
zJ>4mO2Js4wB+yT|6`fmGf_d<pu)kbL|BcSf7LJ_vjZ-_MwZZTy^o?OHV5)>ix<sY7
z;g5<h59(OXI;G;&$48p8FWp>zY~7?W<5~0N_I5LpVimz){dk%DoKQRzvlr}7HF;u=
zf5LqK`RaxExRs+Fiva0-gP_Fvd_7|>W7gf54q$_()y?i@7IcA=^&epDUNg&^47yaA
zE*TtR@@Mbw*hQ|7hzy?%qUDqR1xg5P@1bM&v`<GO43U4L_U*{3dn~<Gv{(6F-flhX
z)gy%DM_2p;W}!a@6P+b6$&En-ut$fKW(_q9-JY{&#h2zOm~B<68<)^yc^?}R$1eg+
zQq~M{qYn&(Rp3%6AGR*_(;iwS>vc(}8qbG5*Zv+GnlPO?5lx1HD2h*jAMpU%dGDzj
z!D*>*1~*@O<%Ql3WQiX|k~I&fFu6q8*g`7SKJd0sW#{x%&j%2{?`8Xv<9;viUQN7#
zIImS)SMEIcx#`k2vUJwQSyi|Hrd6s#%~<I}1fZVTuMyLZ#R43et&+&|S<3JDB8B$O
z2YuUTd@8Mb{4?bp(ji8}S^iVmzd4e9o|7t*VZD3UG66$+OtyM(i)cS<=zK&ceNiN{
zi40O0H9nkrLy9Yb>&<je1D(N^8716u8`0wY$9XDO0Zx}*s4z-s)PPcf<IGPhYE0#C
z-;L3rbC$!orCDMd)Ra)~S=o#EoNyOBkv3fY@KbET+GpfG+4Xbe43dW_)WlMVTg~`Q
zg{;o6ooau(kcYDpb?op|F#RShhGelnlgx*wUchS2+LzCN&SOYOM+*;AkFUvGSN7uu
zEzFUsN}He@2cQ9_gVrdb2iDb2v7KkPIF7Ehj(=9U_EX&!DXbb;gO!z8YV3@9vXe~n
z@dD!3PyRvCSAsy>_+*vY;D-HP{5dy1-17~->pPcW;yr}IX1bq(DfxFAued#-=kh)H
z+!Jjx7z<NJKNZDkn9TP^d7UMsJO9Wg@cG8X@*<kc?}gPgpplE)5Rp0a5kql$+;EsB
zHb7yN*5<$Yww(5HG);xJaPt6P|0u}$KJvjNy(%oyWwdmyMMqS@p*)_6O$ls(fzYOg
zzgQ9(KdPDC93smRz#SYfF(po2f}uo{`cA1`X2pmy=~UGB$=UYBHQATMJ58rf0{nqD
zs4sFzCC{1qoPalIN}=wO7W+fHYN;)+s@SKH4hkfFIAF{8IUny-fgGU|F7>0A4P&WJ
z`3-P}IrFU+%D4xCoP-;qfH>Ql(vOmsfA7bIO1fZ8nkE+jJJhboh&;MbyJYqKj0@GV
z<gkOhjm?chn<QF8spj@<;zS2{_J<~0o>QqBP%_nfy76rEZ7VaZ&!ovHqGyVb$Iam{
zbm_&9LTO@N=I~)cfhKgz#pt)ZJ*=*=pBMZG4x<karGq8?BHX8H^RB(Tfb1^e-%Q~h
z-w|tf_ddXL<S5wqAu_xNubr3kzY>enUnP1IG?LQ4W%s_SMu)zCPWPBnt1QX%_{2sK
zNRQzZ1pH`wf;J=xMLL_aR$s5;bqPnTqKH+`L=8~PSqo8o+{w>sOkzMwXFA#nB6tR~
z&ZjCDJf5_|j>>%%X25d97LZ`a7QH9aSs_1QgD3o0uKZBBI!Rs7FPal=pAVTWKcH9%
z9HZSM`5>fJ4w?j=)3g?0RH(}#YYcZ69O3<3A>&7>@nFG~YWm&FS(mmK4`~i{KjIuG
z$C!x*lS!J|8ND1SJDdEC;w~L+Mz-7`t*_*aY_{5?y5l3Jnix%SUCca@a~WjT1rb&l
z^AUZ)E~r=>;m)l2jSAq{^JA|{I{m5;=Erznw1urwaJ+BkrQY~6`kpv?_LUl8Tk?N_
zH(m6HcE_Mo-N9tJMdwQfwxI(ZiY%Ij+}F+B_$>m5tywf(jd=?^7mRcoF+u~9PU;O%
z*x)eo-y5^fac0uFBVo5S3z?&>yqxGWidHbsrk^N$o^vIQH@Y?)8T10xVb9t!fUU+S
z#4fid(`TkBhW9poLz6z2Tc^X_n9KuDyAV&$b*AHLT8$PTy~D|m>utuApuWDbnKghc
zZY17hY{b>cN6zxk!x|d2r}y_E_-l=!&26QX?&Cw~_#IKdTc+FPq|Z?U#=k2PDVVn~
zYpqFwzBg4riJ9NU{Q$Q6Z;4`w<vcLLp;Rsm)OkcAfR6+|NMezPkAi<1I|)W;VstXB
zAY@oncp+#A1b^#~0EYH2x_M;rJSW=d+of7vGW~LBeEzreXpV?@Kp-|#>VG`Z_Mw?I
zXk|Lz-G9!5EjAFnUTSM|&2TIkIA&_0*D!W#Q-J*W1G6I7K89AXpgB)BxY~kk`V+TV
zts+Uq8OPIh^G%6eUAoPKBmI$I-+yQ++q3CRsVEt$tXRcPL=?Cf%cIeL&w&YlA?&Mu
z#A}&|{Am&?Z05}IiGK(16tl-2II21nSakZ}^o_`>Sc)%hC>oymK%cluzHr%5x39H&
zQE$bHRykdXdAYY1kiPw;lPQHIYxW|i|1*i2?a5+BVM9lE#qWs-3W<;;r-R2hB)U*!
z)afn<$VPEnP*X@Y;MbS+q@5Y{ismQp2g`#&k@i%g6~jdrtt-9ENPb6@gSRpH2WCF3
z9k(F$axTf*o5PYj=kuAT&pgKQyn~Q2J^R=ba&?RetC{cvEvt(~7ME>jdk0yqT2ruy
z<PtpT$G{L_kGcK`sGj}Ww*;xl544h;HbJ4c1fM!{UJPqhux+&)+c&&#IaXXaxVTaN
z5VZ|jY2LglD2U%lYw8VeWGF)L#RD-|sPoxyT++>ZNYrEcY99x%;UU3#&e!^4*L}@~
z{M}Cemcv}J+Dcq^;6H73^MQb4!tFl|j+ooUA%CiP(c6e0*~WsMEI;x%AA<*;#(JL~
zH2L*>?;{^G!$tf~QUmNyWJp5>(9)m}C71tf*#T25%YKK=;(`=@ePOdCRKb=V<6B#-
z5*$SR(2T|BcFz72+zHZ(jS=kj%X@l*h*(doPLhcX8;$U}b<}3}b-sdXPaD#IK1FUW
zZ-VF8Ci~;2r$`EX=Dc4p!a?KuM8!9iH&DJm#t^I!lrW{dH=`hQ`%3q?Y}u^`4~oz_
z5vEWK+tls2VG(!L_l~T8i%{n209q~wZg0FB|E5q;s8a@$AX74R2R&H@uIim<rdC9G
zkk$E7zCdI0PC<eMV$YQnLErvi;*4IE1cV<?<oc)qhX3p5RwP+c#^ly%DJEdUVp#H6
zF@o}oW_$RgWuJP%vn<&fO^-T9VRQd}3IaEy%N&maz1lt8Pc=tC+ckB(ll#F&vs?_A
zB=YU9&u&mGA#i`wk|B$?L_u$yMCz@JQ{cBj&NM%pKIigQ%BNNPnSug~X`nL-+ep9`
zWF*>kYvXf`-dAh+dG+S94K4iQ*PG?#md53WsQlU~+ZADY(`YEvNt?M4Q)s5s*6O*K
zK7o)m)HTqd89Tkf5ig}W2ZdKNs8^CHP0pJMw{MAi2LNE%vLfk#{;gDsuUy{Q-;OIe
z3n+mO$r6{JE4P%U#e{3XoG?_XnPM%~p`XU37#KGad6(y^7XX*2QBo?hljYy!f-hJd
zIaJ1Vpvxx2$Enl^=k$!pW`jCBd126P8+uGAW??$#WG{R~r!9QME6(J+8Hr`i8AOBX
zZyT{jr&aL3O`%s9TFww#q~5m-402y}=lotMe?W}K^}++vd`yL=5>uxwu)Q26i~dLr
z*;_X+exiB-X0za--g{INOExdyBSHFpXZRJPLg4Y&$ct!Dfnv7(cWwIh=NU;)7-Q>~
zzmXX#n1iXWwRY4p`TbBq+@f(IXuju}WZi)oSCWHvfO}DUs82Vz>V<U<4UMv-IeeBN
zk<(lcjr4UgIWZCn3_G~*GN}2joFGhCo|tnZ0^~IkRm1#hhkntueY~pDZ^aBOH~a|3
z@2V%@@z_S<x8~)TUNV)F-piOix*lBJi%|Hna|9MgfSBVmT4Ek+9^Ah&ZO&qM`ed&6
ziS~#UGOa!J`vOX%)fUP4dyUT_Bs5TduFF%PGTu_8Xk)aUVOI?t0hVoOl>N$=Ceeg(
zH|h7=hyuvhm<7jN$I8F!c*}iH(A;m7VWLAWb=zmFZh2BCr$4f6h(9dFSkrr(W}xkG
zFHwzUiB2b6H!E-Cva9<C`?9}Pr88A&ScarjltTy0r0p<P3bFB1=?CY^+2>CM+Vk@R
z%Yrt=`YR!vYc=L1*l4Uc;D9wHYGr8~Mu^t2v^#oZd;u9Ue)MM^1+LD!I2^rwYOzCy
zvta4uZ{An}*09BmtS;$2K=b9tbrv_J>`IL=Kjy6H7(2EXzQ_Ak&Xpr8?j)%s^E?nI
z2uflR_Wv!h6zV(cK@&4u`cqPi5C=UyCMd%Y2L=33NrR}5C`cjB09okA|B;bkApbKn
z54Zb~@8?GDoG>sj8y#L(q8y@O-zoGzyjwZB_O7lTWyYV?!TSfV9Tu!`sa47!@-s*V
z;J!Pad`tO53hf@^@T3kdEF|=;rt@Vj(k=v<0mAJO=X~@2jD>DbpJ|Aw1WAbZSo1O5
zPxLEQ-X#Cy@eXzX@h{=5@>zpH*ZL|0OHOeI1!Tf3Igc0BFr9|Yze2h>Yi|zgH(zi1
zfFQt!UqYw<;7n`5RqbmDLkgB&I=Cm6=0s0O?jX1RmqMcDWto%b0TTqMko)VABI)yc
zwUSC_4NGR2dl2ZdP~dixFH@lBUAK3bKzF218QhTLTA*kuu;HTB$&E)r%+Y{Ns<}}E
z!4~0VV7({x*Y<IwZKgeV1&naMPSB$>t7!#;@E0EG2NwYfJVmwdd`5DCZ^^*+B3_$A
zd@X*?JhLT=?wZ_Q>_Fxg=1Qwlm#(%|$LC){??TkJJK2EE^$7DT47_es;fbXF%Hu2X
zm7Dhsw$I5)kFwHQI-SVsKDe~4X5_XQn<UIwsS7ON;&LaULB?5A8UCB)iWjx?(ZZjD
zRhov#9>wN9gXq^l`I4;MiNxS2OU;Nk0C#4W^_<tC5I04Y**+3Sy&RzoM+;-StL?W)
z2&L-5AM84loD>2s)P`(2W_!c<Ws2qCqHi=nsUFd{w7As^HZ&gx`mPMM{^=IZ?gN}T
z*D29zTl}9ne>u1W8W2=z)C=UMk$0U|h^%d(3j&0xcwWWLTxz0oI`|&!_*HCqLddPx
z6eYltTNTWDl)(r&C^K(Ua%bc0!x=#|!d|*DHy6J%R><RfZ{UsSxAQf`Z0#RsPN~rE
z2Ly_Xw$t@Qq4>K$wEU1dG3>juQp@31l~S(%09n#wH){^rZx}z>BJ%f^lWTp2m_0j7
zAkzXJr(<7u@Yp`a^}9xRqn<vfhf!kil@r}6p1@lU4{4%So@-&Hqa+|>zolXkt@98u
z{<fieeODoSg^?mL%2Z<uyjV-It69z~Tt@?Mu12=+Tn=nT7~3fuzaXd{YBO@%Je!L;
z1x4g-59@HpHpPVxu@*qHx+^e`8wO)29m@mH!r?}31JVN3{L$&FR)t3;*SXLD{vJ)j
z*ngd=P>>#%tNw2S3v6+P^~sVK+e>x@m*WZV_Xj#N1z9&(*3XFG8h1sb5hOe=oUvcz
zO%9`mfl4IH&LbKDpwX~qx8w+H8u`x`?;L5KHMkih#%*3!{A?eOpj9Oyh9jxeI}><Q
z9J+&TJj<(dJKxaKn@pd&2y9|nzoaK3L~q{IccwHiL*|_=@j1^ydc-%!L|Oc4#`=DB
z9Vv+4F+j(Rcs%RQ0OwgI9j)aM>Am&qoxCR<mqFqSy&oB{QKq+j1(~qV;ETH-w5=xK
z6FQ#{wwvo%y-|BD;oMzOo_Q>sNfo!>h@Fyc8B-JN<MKyiLofP~tR1c$dvOSZiRs?2
z0%XN!%c4lx*WSSIaV5)2?`=AsXB<q7u=H&kX3T`#%8%xa_OO0t?C3f|YYq;Ype?sl
zZyWVu@!Ne5ONfT8st{N#Z#(L)@bX(vsQ#S~9GJgEF_(lXNo^39PqDmGnq7s|?F)g=
zP>VjcUpBeJ>E*u$6KlK~mfMpGMyvw%#_WLU6~*aAnqOQl%!WE|1I%7duI&U8)%n=`
z=>~aX@+Kx#ZQ7HiZh{BjQg2{$kl;yr)B?5d`Mqby#+uuXB*q4tOLZ!ki>0y8Rda!r
z!lB=0&s)>KC3oPZ`a#yjip~Ggj$PxAYYFJsDe;S-lnJvjS<hKm`TnJJMDReuac=em
zrb)K{4jL;1X=XoZ=m2jwx#*={|AxL;;=nZv5Al&c{@W?R8pr|dQNqN-yllaSVon#{
zXG5{0#N6!5k5qkX$uZK0%X7<QSEA7?+1A^bn6XjcdR?4B->|rX0Y9+m5Dw1L3W^h&
z&uQk8w16Xi2Y?u<Q8(TERUnH)WtryVi6HkOrzu}3btH!3!@L7yCKJAcg@3vo-_(EV
z$Z!;N@@k<39Cg%Q;C9Pwz_ba>LMX(UuT4h{mzYt=O|)L}biGV+SiW%oT_P1GJ_b;4
zq?`Lq{Q{kQ-qZh{BdC!ub$ekSj&7?AYmVWc)_M!n+(S_7rz435JaO}<a#($Rstc7=
zY*P==Yvki@J+D6#PFK+OJAxeO0~SejeCbo6EChA!VewX0U$upo)#)_LRg3ly0f9Or
z<D=jb?wACoGR;S9yDZ98c94=197;A6pIyDB68z+SYaNN^{w>MCrCCCsIqXX_M6Nig
zi8Am;{>x((_7%%sBZ+a&s#>Fn$l=5c+eOaZGZW%NPiD;m)^HTEj}j;~QN1yCEERgy
zXLk#1x#;upeLC|tbH;dwd*sN_2g52`aSHQji;VC!_9RzBNsWnFJdG!8!)#m2muvAv
zxgzYl^t2@76vtyVYPC6ucGvX3J=vtQ`9%)5cIa?91BHYPadBpY=->O|XDnn^433J(
zPtNJ!+u)&+tm!EHbdu1()|tIcp;L^NB*MGK2yrRr8^%5DR+3B&biu5LDtAqUaEi4*
zjSs`N9K9-7y4wgHdScT`Cyg}#yuVoIZ2|Ix(y7bqjntL>-R|;QtCwa2Z^9xOlLG{r
z1L7IElAk~ERAQbMop%r074qo}WD&n;R}5NChU(frWvRTR-Gt6ynhA}@F0^iI99-KI
z=Zuxypar9mOoNct%ct@rmq43knHannsaXYvbvbC@Y^rmZrYu%8WK<burJD25=e!eJ
zH;G=QxXWe}x{o=GfPAIQ%H5O-EHqK=ETeDz#b`O9xZ)(0v&mYFKfPck_F}3Mx%I4@
zJ_f(;2Abbr;YejJMK*T?G-*PEr;3AXAcJtyQh_FJauCFfr<>7pKn&T`)z4Lb)Wp*D
z$km=<qrRBkE-yu(JHr?TT%pde&%j};B)7L$mHAcx#fHW;yJ}?X?;dv_PllL$s~k`F
z;|&kj4>x#c9T{hP^_wK$*mqa6T1OMA^XyZq#uAaM;!J#<a3KP6cQ<`}etnKOBhTJE
zR5T8`!n?yMbZ6)On!nuM{F}XZ=~Jb(MFVkME-~0*_cx2sR&2kttHyTID+K)zf_Z98
z05bq?l?u5o^>r5c`Lta`u1WLlw?f#~wS$7geCTSs($LT>7V^+6vS-JJw3>!?Ip1@g
zG3JK}I>bi$fUYi%3t<96<8bk<g46<h2)(~klaVZ?yJn$Yi>qUOmcTj1!Hu?O?{6E(
zLo4cAq_(qw;zZweUHTTl<xBJfKDWTKs|iE)JKflA-<cQJ!thZUq;#-5!BWj@h*%A~
z_wKXr#vRKwo*zv-CgD_?36vD~_$A4Jz@+oDR{qYp2~IbVPtJa-uxPnw_czif*5O%&
zM*&bnPQcsF;QL6aKKp!$1whc2{Ls%{vBs-(mu7B_MEBWp7`*=C4twfWb3U22_3gUt
z7irSrrI|1s(sR<Lz``w0(i3i1>lZoIlVi9j8`z@yB9aX4FhZRw*{(TXR536zfyFO~
zz;|{MdAG=c?2eIsitF8d8~A|%2J-RYs{<Qr@K~*Xz-+%OK=&^W+Od6g^!hIj3U)1{
zK7jGXCiNYuiGxP8|E0M6=lu5nY1UcT7uTC7w`ftj%UzsFi7B*Sml;UR7Qk?peAHz7
zsGt((C8$(Go3D4^#+iAvn1!H|$`-bSP_d^ylF_RtF6q7PNE32>g|$|XBN_>=kgtbi
zh8Oi-fv%?o|7zALeW3*Ej!_|Z8@q(&s}Dmby(@|NU@b)@px-&pRxrIgznXY}wmax0
z=>^Xa0o$dn%I$r}#iE6-fEmZ6V_^0OgNKkVdR(+;<EuYD*Dd^XZ-)~%l%*d!V_p;^
zm=WX5wJ#m;@f1|uKyLt2JA}sF&B0>VvX>z+?d+tgZ8v#7+DZyks+a9_$)>}i4bRkK
z$~;_@+S6r?gQXL{o*YcP<M14_3|TJkf7OS$1ymd^R4GP#UeO)cI1Skuv=26KbCjv@
z#_c9)Gg)jJ>6OhyOuBt?2c=(Knkj{Hqtj?b{gw^6eP=@}%rteXS<UQdi*-9yE%2TM
zcw=X)vrXSUb>1UprK=URR@{`kQK3|55^9G7eXMrM+zLf9Q0^SK#x~+CXp=33FyF$Z
zA5j{qF2gnpFyHyBWhO!vb)-O1r<m<ak`4*oihoxiE=TA>+nJfZzA=i@K@saUnnOdv
zJ^H?eO*NpNH0~m!q#!or-y;;?r4DKe50MRJoO5gaqQY&ix8HJe>0nRE)3%EbNz1^6
zWV~DcS$xSi*cQjd%Gr=w3-xkArK8o5k#F4M`0&TKo3<f#dzN@$CE4U|R}kED(ez+b
zK@M-N*Fdyx;;2u^=!pqc*LvqHPSHT=NH8nk%8sBjaMnFEF2gEf>4vE5v<o&gzsW)R
zCE=P3u8e88&E%m_FmGavt{L5GJN$W$DZePWz<re0hfyP+i<JjF#kb%@V+}icC@Df$
z>?Zw0on3FV^tBpTI15#?Qw8P{T(&h5yzXUhED=dzav<8t@17H)r?udzuLXY*RP*tH
zVL>$q0M8oZDwxG6v};LU(L+42s|JvusV6rT2%X%3o4HkNCgIP@dpg+@vn@e$tGj4U
zr{iQ*Kq}i%V@gxcnjuvC@r7v}MG%lOiNUEEvzA#n&X+eFE_R#}v4yB`r64n;mGnq8
za{Y>|g9(~G6Uiz{BTug?Bs;aVnZSx^nB6nXXd^AHty4`%HX2G#9!L^ldw#=fz{zz*
z91!ie{Z-86&SQ`OOwl?EizW|l)VUDRf_2lG*bxPz`6?{1`==Hl1~c|aM!2ef@LrNd
zF?vcBsjRNh%rqi+fs<v8gnPltVL3JY=}eHe%n@sLuUNT&xuc+8Bx+R1lR%qss5oE>
zLARP(2M+k?@nSIZmFmw$Mn7;@HtP(Q5HraSm~PiNxA!azl|@JnapWvOl;5~^ot{?<
zVKFoaQ;;dDYkX47l&6hHE)7E?CbrtrDK6zv5v}mvX?C&PQfWqgfb(TU_w>Z^YMq-m
zKWjqM_0%5l+5_uC&^#;2^kImX@=!lwtXy7T!7Wm1ImUW%2_F1^m3Fz!fU69=UvZ+L
z?!xSQPS>VJ72-r=MT<oZsYF@YEnsV8@#xEJXP_~qR;tMWm!FM~5UX*WHBzH_*g9UE
zjhA=<TdammV)dqnTJ%S(`iJKLh&q-n650nv$uF7_Dtf-w73s73w|Oe>gVYmVt%1t;
zwK6XG<5R`i6MFU8H7{#ik%E>_sB!e?K=KJ~bcM*L)@AA9<-(<Qd@Baaiqon;)eCea
zCH`QM?e}lzASJ)=tf93jeTPp((8A5T_vUS93iYWnomy6f-fW##jU~1vrm5Xc->WF}
z3kaW_C*hYivj$eWU9o*gF|w=;$Jmc2?s7BLwM+l%baUSF_n##bueO29dUZ;Vc4^O)
zI$f$){IzDOpG4)i&`1WR=ihDJv5-axF#h}%9S8-1@6_Vz$K>Q_MtUmOA>k?3RIGtQ
zC+hVnG_pUpvYKpge8aSXzmg-RFII3{CBEgsVwo<`)w2&=lQ|4UFcq0+hG%S3&b!c1
zL!kdf=RcNqnnSxAh!i?seNIWn1u=IXI4Dzk8kH#-mNF@=e6i;4NKxa$`L#a<S9bc8
zuT47OHy>F8ux<U*?6X5w_=_CKi(6bx+%07OcA>8k8H9|jr*k2t%<3iJ7yHW)Cbe#m
zvK05W7z!w|_v=gP-!0-wLKf<DXZTPNf(Fk0{x7L8|1nDuKlT~K80kj-<dy0fzfAR;
zA;+r(;t{AO1O%5e@0&O+{f(_5rDCHV^wX{m>~pzQ$IN8eOM8QIM&c{(ts1<WL+^o*
z;OEO>g8Bw@ZMRo;F8_CH9s0n&fknb(=fzhr{;U0w@aNao1dpfA8ZpzO!|2jkhaY|v
zLRJg(#V*z&qy9$jDW1Xf`saJuTt1k4i>mNey0J=wk;<(aY&b|deJ6!Swd+{@n!HYw
zO%xBgsTV%WMpJn)g$t$VpRR3ikjCI!m0i*DEzJvOAKcYPn80z_Tc6l1191r=G~boJ
zozKbQhzC^X4n%YDaK|@HKz8K1xRT4f0_2+$WfxC1py=Z|DJYX`_(0g%{bCp1a~h5^
z#gyD>bYRi7K=Vi-CJzITU}a`_IX)35Nob!M>-ThxiEtw!Uk3WX?3L`=QP0Hg<npLz
z&ia1IW}F)Mv8q3;@RL<{n|6{U*qO3KiP+WO)V_XL2hUZ@-O5~sjR=5XcdON+#qDzL
zk@%qGifh0M>p?q$dC9d^u=qkQ?Yh6OABE|<*=<!-l%C1-bzPIASE<a>-kF3{v=p(E
zW74t66zxlJ&~AZ8lRu=5x5ZW-2%MTNQT?z&1enD+5b$QLSp0N5u*oIXLm{Z?id}Um
zqO$qOSp4f`lin;QV={zPU9x^HSE@_A(i|=d)4g>m%eL;9cT0o$0~?Jh`>}3A+h!+u
z2p^gm>XtDE9WPtl(~Ql_@Z!G*01JMpb#LPJ0@D%3xJ;j(^PS(B*HQ9J)3r<>=fzCM
zeJew6Z$Gv|U9fwTElUbXJ+OZ0rpJ&F*!Ah+3tuL0*cGwDXRk=f`Ff8_Kb5ch%BC|}
zjgvK&rQY)#Ttg$Ek~icYXiKcl+1vnezz<bPv1^2?&{8w}yo39c*S~ivQ9k<>1|VUI
zF{4N*{kDG-aip7UL9+AEW)2{fj&EysyyyrUSeBnj2l%+UP9E2eO6|%R3_RN_kUzK_
zEWitAkS!Q9`@LJmi2>KET=U1ObpXj(F8*hO&2kMA)`%OAr@>V7aPAPhKD+C&4H$OM
zJ0qbffaSLwWA38FM)%rC;%V^gYTIlLaVHOu$CLI%XqE=sl`N%jIbP*oaF`*Z;Thxv
zHja{_Sl}c@=eA%qXRQ*G)tAiCottz!8ikWo@YS)F?0sGz{6smzg!M4V6QdiM#7eE^
z-vj7->tyPL%t3lhPw0Q8Hm|3f+Gb-hxKl|_@rva<zlJUq%RnlblgNsFNqDXI-OgCh
z-U}{?{GJpTvC~NPdSB5v<?hKPu&P$Z%6V}6WGyb^GPpDZ`Re`b*wO;(RQm7BGZQ@%
zMaU#RfJG=w{J#T6{#EVvFKO6)s?UJja~U_$wmW#8LD_?vc)<7o3tphP>}M0q(cE~A
zX&tItE|Mt?!nVR&&(oO0k_Mm&c3`rf<}A6#MP8_ZUi_2SS|>ehjr$jXO={;rH{Hr!
z)<}E7CuMBPa8-ym5-%{%?(>GsPOGnN|MjwQ$jRj6$^!SkIP<pW9km2eMH6`}+Bzk?
z9guc5jH$qOYjr<eH&k?Ts@0D43DF}DK=$?J$$7Cgb*Qmtp)bhkuMc(?<AMzIy6;|K
zzSuvT_fxg4+u)h#G=6A2MF|5_Q=+dlUcqGpKGKEgA1q@xGDn?DDHdlE2;b+1XHI%Q
z7K<@oCE>UT{DvlTC{<=V_3n<Ey|CK7LX#M5>E1S2An(S1;5LnX-qXI-Jq#u{#|ZV&
z@tNo>5Gq>CTRxk&=eAv1%+Aq|mPX@ft|I$m{-YoFd*4(wv}_3cAf*vkhJ7kgi76Z~
z$_XAaNgCp1Igk%d9@!j1VsC0QIMc~id>KSrf`4+~E`f8^fIaW~)XmZEp@_^yUn?n$
zyy9Q3;OnN)udQ~<qiH*%TtkQ}7yJoeh%=|t1J>EPzTrb?j{^+?<Dmi}%QP9<!{}Ke
zgL)DU-7C|5${98rdyaXuG+4{SR)4pVqz>~KV5K#&@V5`Empv{~=$B8GPE1e75+|Fo
zGoRgYGgxq`_I2-P4!m1-;)?i%K{bYvd5CD9s+2iufz}7rGVYUOQ$;BfQyx1=v%7!o
zeq2a%<<}wQYL@(2(cr%RuokUb<W#<lE^ggg6;F)EJ2U1V8Avj{D2>y7AD=sbsr-jr
zuAVDUYezh$4V9Buth~)TQ8YEy1AdBAWJ`R@{_+)$$`P}%y1hq_sEL51D)`9+Zok%s
zI9rw8N<F|Q+|6R|3DX&Av%v1zmbP0fRgVs?0BkpbglSEkGKb&U3g4~>pXnWaJmI_B
zl7T*119KBjbRcAv4+<W0OgeQm7`r9p94*)Ku(!i_Bl=})Dn4C(g)>yCYip}nN__KE
zqfM~<kbbvMG2?rS`qTBggjfp0GoH0hd7ZOj36#vzgqV@6Rp!NF?h+s1Ya&<ZK!ADb
zbGx~iF9zTTeF^AQ{=Zo7rE*ly6wrNcJo2Oc5qm{!G)UG+s*ksS%{@@#YA;~!=|fmm
ziCyv@pj_77GhxW+=)clW7H3cUI!xt}+`3g4hkMEKB;iDh1rM4GM&Jw|sqM{Sp0*~u
z&2#O}j~SSQSptuqSyr>yvzv1t-M;|HU9HXg`<GUEix^BVV>Ix`V(hLWRD4KrW2%Qm
z_8tnW=N!ps!fZFD%J7Y0rdAvTX*qAnW1&z&3Yw<|2ZY59iS{70LVmMGLjQ`V^WX-T
z)a>d|DguHQ@-kasghAX$F-E|OYQqqv18`-e4```!F3pjR?Mrvbj?O@G+%cmK2XZ{$
zzEVX!=}LD!Y_5O;e0433oDyNAW07r{k>eHj>izyf(8oKR6dJSIgL+WqyZ9)a6x}&%
z9qyv#)(vhTj~r#X1aHEZ<rj^dQEGkWc@mv6S<3zqRi^l6KLt<n-acC&hv}r%j6D6r
zjSuqY*<xb%U@;?6J~x{6;VX^e`8YG+8F~o*O#T4-v9>*_@Zg$UrgAsvG;c@TwYyyg
zzd2kFU*9y)+!r>{T0+@gJ3qVlAhselZE~L-kpO+7&K!vBjOSO4H@eanzago%N1%|k
zgr?5a{c>C5SayFoQEwT4N4N^I^#dc=8en+1E9Y(vYD3WTH8JBCs?oo2crEF_9f$vG
nTXg@C9R4p<|NkEC1F7hlbMlZcQSqx(8$?o6PNZ7MAmHBs0#(p-

literal 0
HcmV?d00001

diff --git a/src/FeaturesPlugin/geometry_calculation_widget.xml b/src/FeaturesPlugin/geometry_calculation_widget.xml
new file mode 100644
index 000000000..55979378c
--- /dev/null
+++ b/src/FeaturesPlugin/geometry_calculation_widget.xml
@@ -0,0 +1,13 @@
+<source>
+  <shape_selector id="main_object"
+                  label="Object"
+                  tooltip="Select a object"
+                  shape_types="edges faces solids compsolids"
+                  default=""
+                  geometrical_selection="true">
+    <validator id="GeomValidators_ShapeType" parameters="line,edge,wire,face,shell,solid,compsolid,compound"/>
+  </shape_selector>
+  <label id="length" label="Length = " isSelectable = "true"/>
+  <label id="area" label="Area = " isSelectable = "true"/>
+  <label id="volume" label="Volume = " isSelectable = "true"/>
+</source>
diff --git a/src/FeaturesPlugin/icons/geometryCalculation.png b/src/FeaturesPlugin/icons/geometryCalculation.png
new file mode 100644
index 0000000000000000000000000000000000000000..f46c0da7a378a05f515f1b3583cec1a34526ddd7
GIT binary patch
literal 809
zcmV+^1J?YBP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00009a7bBm000XU
z000XU0RWnu7ytkO1ZP1_K>z@;j(q!3lK=n!AY({UO#lFTB>(_`g8%^e{{R4h=>PzA
zFaQARU;qF*m;eA5Z<1fdMgRZ;pGibPRCwBA{Qv(y12q9a0I?u*7#SH;fs`8oJ&%BR
z7ZC46mjF2qAb`LG3<JTM|9HUfKY#x}e)8<Ql(h5?sKrd^1_A^Sx`FHe{{8>|&mZjg
z<(tp{|NZ;-|NO-(-}w3Y_W;#9A{z=a10aA{&|J;*=N|(@dTBRYU|L5hLskWZUyvTn
zz|YUapr)?Lxq0g@3wKwCs_#GmlsW~(|3GR00tnrOo4)@1|Nq?=O#I>N|NlqMKKTFT
z*Z=?Tzy1IJ@%!)p+ji~y2n_cwpgtZ@6oAYC2q1J9GW`C_z))1v&Ct<M%23hJjUtzk
z9LF$u{!WHhuRk!TtH>}|8*B3c&9Mf0Rum}x3xojzh!Hv20Bzd@3?|>NKOpXBVnEO!
z@a_9ghL>+Y0O=nLTpa8Sa*})uN|HS1fd*y+rLO|b`UDU_7%uz;bYXof#AOv_r3@Wi
z2v>sm3l=Vd^V@*F02;;&B=~`t4I~B-Ko~B(|K`8%hc7^v0fm_u5i~jgiHiU|EHBJ>
z8OW^yMGVlaR{#OTge?pwPUvR%{u@G1p4bhhzy4xCp+Vw5|DdL85CITC7%sf}{J-yu
zcf@5g2_XgsZArKbPXf()4G=(BV|npxM7V_{lrpSYfEwE{v4WCP3`+n42*ZV^AO81!
z_zE-J{$VLY<i!{mOyyBs2oOLRF8l*@;g+S{SiR^PR?4t@6+$jO57UJJ0fb>7CouAD
z152<P_~Z9~6gf^dOf>)jgf$EgukS$-v+{=+a%^J{iWo>OIsgbD^e}vS@56tor*E;x
zDigc}fB<P>1_mVo#*aW|3@i)*0tnrOeLw|4KpL228JLMIq;Eid3Qp4i0fcVg5+J?_
n#413{PNac9L2(J=00bBSI@)&56%FA}00000NkvXXu0mjfN^nc_

literal 0
HcmV?d00001

diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index 5de92e7cd..64379ac67 100644
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -173,9 +173,9 @@
   </workbench>
   <workbench id="Inspection">
     <group id="Calculation">
-      <feature id="GeometryCalculation" title="Geometry Calculation" tooltip="Calculate properties of objects"
-               icon="icons/Features/basicproperties.png" helpfile="geometryCalculationFeature.html" abort_confirmation="false">
-        <source path="GeometryCalculation_widget.xml"/>
+      <feature id="GeometryCalculation" title="Geometry calculation" tooltip="Calculate properties of objects"
+               icon="icons/Features/geometryCalculation.png" helpfile="geometryCalculationFeature.html" abort_confirmation="false">
+        <source path="geometry_calculation_widget.xml"/>
       </feature>
       <feature id="BoundingBoxMacro" title="Bounding box" tooltip="Calculate the bounding box" auto_preview="true"
                icon="icons/Features/bounding.png" helpfile="boundingBoxFeature.html"> 
diff --git a/src/GeomAlgoAPI/CMakeLists.txt b/src/GeomAlgoAPI/CMakeLists.txt
index ed4b96a73..8e55582d9 100644
--- a/src/GeomAlgoAPI/CMakeLists.txt
+++ b/src/GeomAlgoAPI/CMakeLists.txt
@@ -33,7 +33,7 @@ SET(PROJECT_HEADERS
     GeomAlgoAPI_Prism.h
     GeomAlgoAPI_Revolution.h
     GeomAlgoAPI_Boolean.h
-    GeomAlgoAPI_BasicProperties.h
+    GeomAlgoAPI_GeometryCalculation.h
     GeomAlgoAPI_BoundingBox.h
     GeomAlgoAPI_ThroughAll.h
     GeomAlgoAPI_Rotation.h
@@ -100,7 +100,7 @@ SET(PROJECT_SOURCES
     GeomAlgoAPI_Prism.cpp
     GeomAlgoAPI_Revolution.cpp
     GeomAlgoAPI_Boolean.cpp
-    GeomAlgoAPI_BasicProperties.cpp
+    GeomAlgoAPI_GeometryCalculation.cpp
     GeomAlgoAPI_BoundingBox.cpp
     GeomAlgoAPI_ThroughAll.cpp
     GeomAlgoAPI_Rotation.cpp
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.cpp b/src/GeomAlgoAPI/GeomAlgoAPI_GeometryCalculation.cpp
similarity index 61%
rename from src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.cpp
rename to src/GeomAlgoAPI/GeomAlgoAPI_GeometryCalculation.cpp
index 2a7530383..43af83cf2 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.cpp
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_GeometryCalculation.cpp
@@ -17,7 +17,7 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#include "GeomAlgoAPI_BasicProperties.h"
+#include "GeomAlgoAPI_GeometryCalculation.h"
 
 #include <GProp_GProps.hxx>
 #include <TopoDS_Shape.hxx>
@@ -26,42 +26,42 @@
 #include <Standard_ErrorHandler.hxx>
 
 //=================================================================================================
-bool GetBasicProperties(  const std::shared_ptr<GeomAPI_Shape>& theShape,
-                          const double theTolerance,
-                          Standard_Real& theLength,
-                          Standard_Real& theSurfArea,
-                          Standard_Real& theVolume,
-                          std::string& theError)
+bool getGeometryCalculation(const std::shared_ptr<GeomAPI_Shape>& theShape,
+                            const double theTolerance,
+                            Standard_Real& theLength,
+                            Standard_Real& theSurfArea,
+                            Standard_Real& theVolume,
+                            std::string& theError)
 {
 
   #ifdef _DEBUG
-  std::cout << "GetBasicProperties " << std::endl;
+  std::cout << "getGeometryCalculation " << std::endl;
   #endif
 
   if (!theShape.get()) {
-    theError = "GetBasicProperties : An invalid argument";
+    theError = "getGeometryCalculation : An invalid argument";
     return false;
   }
 
   TopoDS_Shape aShape = theShape->impl<TopoDS_Shape>();
 
   //Compute the parameters
-  GProp_GProps LProps, SProps;
+  GProp_GProps aLProps, aSProps;
   Standard_Real anEps = theTolerance >= 0 ? theTolerance : 1.e-6;
   try {
     OCC_CATCH_SIGNALS;
-    BRepGProp::LinearProperties(aShape, LProps, Standard_True);
-    theLength = LProps.Mass();
+    BRepGProp::LinearProperties(aShape, aLProps, Standard_True);
+    theLength = aLProps.Mass();
 
-    BRepGProp::SurfaceProperties(aShape, SProps, anEps, Standard_True);
-    theSurfArea = SProps.Mass();
+    BRepGProp::SurfaceProperties(aShape, aSProps, anEps, Standard_True);
+    theSurfArea = aSProps.Mass();
 
     theVolume = 0.0;
     if (aShape.ShapeType() < TopAbs_SHELL) {
-      for (TopExp_Explorer Exp (aShape, TopAbs_SOLID); Exp.More(); Exp.Next()) {
-        GProp_GProps VProps;
-        BRepGProp::VolumeProperties(Exp.Current(), VProps, anEps, Standard_True);
-        theVolume += VProps.Mass();
+      for (TopExp_Explorer anExp (aShape, TopAbs_SOLID); anExp.More(); anExp.Next()) {
+        GProp_GProps aVProps;
+        BRepGProp::VolumeProperties(anExp.Current(), aVProps, anEps, Standard_True);
+        theVolume += aVProps.Mass();
       }
     }
   }
diff --git a/src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.h b/src/GeomAlgoAPI/GeomAlgoAPI_GeometryCalculation.h
similarity index 72%
rename from src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.h
rename to src/GeomAlgoAPI/GeomAlgoAPI_GeometryCalculation.h
index 5450ea726..df1f2f2b3 100644
--- a/src/GeomAlgoAPI/GeomAlgoAPI_BasicProperties.h
+++ b/src/GeomAlgoAPI/GeomAlgoAPI_GeometryCalculation.h
@@ -17,8 +17,8 @@
 // See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
-#ifndef GeomAlgoAPI_BasicProperties_H_
-#define GeomAlgoAPI_BasicProperties_H_
+#ifndef GeomAlgoAPI_GeometryCalculation_H_
+#define GeomAlgoAPI_GeometryCalculation_H_
 
 #include <GeomAlgoAPI.h>
 #include <GeomAPI_Shape.h>
@@ -27,16 +27,16 @@
 /// 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
 GEOMALGOAPI_EXPORT
-bool GetBasicProperties(  const std::shared_ptr<GeomAPI_Shape>& theShape,
-                          const Standard_Real theTolerance,
-                          Standard_Real& theLength,
-                          Standard_Real& theSurfArea,
-                          Standard_Real& theVolume,
-                          std::string& theError);
+bool getGeometryCalculation(const std::shared_ptr<GeomAPI_Shape>& theShape,
+                            const Standard_Real theTolerance,
+                            Standard_Real& theLength,
+                            Standard_Real& theSurfArea,
+                            Standard_Real& theVolume,
+                            std::string& theError);
 
 #endif
diff --git a/src/ModuleBase/ModuleBase_WidgetLabel.cpp b/src/ModuleBase/ModuleBase_WidgetLabel.cpp
index 7e3f86de0..3aada3be8 100644
--- a/src/ModuleBase/ModuleBase_WidgetLabel.cpp
+++ b/src/ModuleBase/ModuleBase_WidgetLabel.cpp
@@ -37,6 +37,9 @@ ModuleBase_WidgetLabel::ModuleBase_WidgetLabel(QWidget* theParent,
 : ModuleBase_ModelWidget(theParent, theData)
 {
   QString aText = translate(theData->getProperty("title"));
+
+  myPrefix  = theData->getProperty(ATTR_LABEL);
+
   bool aIsHtml = theData->getBooleanAttribute(ATTR_HTML_STYLE, false);
 
   QString aLabelIcon = QString::fromStdString(theData->getProperty("icon"));
@@ -99,7 +102,11 @@ bool ModuleBase_WidgetLabel::restoreValueCustom()
         aText = ModuleBase_Tools::translate(myFeature->getKind(), aMsg);
       }
     }
-    myLabel->setText(aText);
+    if (myPrefix == "") {
+      myLabel->setText(aText);
+    } else {
+      myLabel->setText( ModuleBase_Tools::translate(myFeature->getKind(), myPrefix) + aText);
+    }
   }
   return true;
 }
diff --git a/src/ModuleBase/ModuleBase_WidgetLabel.h b/src/ModuleBase/ModuleBase_WidgetLabel.h
index be90456c0..6c01efad9 100644
--- a/src/ModuleBase/ModuleBase_WidgetLabel.h
+++ b/src/ModuleBase/ModuleBase_WidgetLabel.h
@@ -61,6 +61,8 @@ protected:
 
   /// A label control
   QLabel* myLabel;
+  /// prefix for label
+  std::string myPrefix;
 };
 
 #endif
diff --git a/src/PythonAPI/model/features/__init__.py b/src/PythonAPI/model/features/__init__.py
index 0d6aafd55..5d61b5ce8 100644
--- a/src/PythonAPI/model/features/__init__.py
+++ b/src/PythonAPI/model/features/__init__.py
@@ -30,7 +30,7 @@ from FeaturesAPI import addRecover
 from FeaturesAPI import addFillet, addChamfer
 from FeaturesAPI import addFusionFaces
 from FeaturesAPI import measureLength, measureDistance, measureRadius, measureAngle
-from FeaturesAPI import getBasicProperties, getBoundingBox
+from FeaturesAPI import getGeometryCalculation, getBoundingBox
 from FeaturesAPI import addRemoveResults
 from FeaturesAPI import addCopy, addImportResult
 from FeaturesAPI import addDefeaturing
-- 
2.39.2