From: cg246364 <clarisse.genrault@cea.fr>
Date: Thu, 3 Dec 2020 16:25:13 +0000 (+0100)
Subject: Lot 2 : Basic properties
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e03ea28e529196f5a3928c7c5ac8dd8d3b81ff47;p=modules%2Fshaper.git

Lot 2 : Basic properties
---

e03ea28e529196f5a3928c7c5ac8dd8d3b81ff47
diff --cc src/FeaturesAPI/CMakeLists.txt
index 280b95f2f,093877f66..66ee1d4e6
--- a/src/FeaturesAPI/CMakeLists.txt
+++ b/src/FeaturesAPI/CMakeLists.txt
@@@ -32,7 -32,7 +32,8 @@@ SET(PROJECT_HEADER
    FeaturesAPI_Fillet.h
    FeaturesAPI_Intersection.h
    FeaturesAPI_Measurement.h
 +  FeaturesAPI_PointCoordinates.h
+   FeaturesAPI_GeometryCalculation.h
    FeaturesAPI_MultiRotation.h
    FeaturesAPI_MultiTranslation.h
    FeaturesAPI_Partition.h
@@@ -66,7 -66,7 +67,8 @@@ SET(PROJECT_SOURCE
    FeaturesAPI_Fillet.cpp
    FeaturesAPI_Intersection.cpp
    FeaturesAPI_Measurement.cpp
 +  FeaturesAPI_PointCoordinates.cpp
+   FeaturesAPI_GeometryCalculation.cpp
    FeaturesAPI_MultiRotation.cpp
    FeaturesAPI_MultiTranslation.cpp
    FeaturesAPI_Partition.cpp
diff --cc src/FeaturesAPI/FeaturesAPI.i
index 211fe3db4,c2c0631d4..4651e8401
--- a/src/FeaturesAPI/FeaturesAPI.i
+++ b/src/FeaturesAPI/FeaturesAPI.i
@@@ -211,7 -211,7 +211,8 @@@
  %include "FeaturesAPI_Fillet.h"
  %include "FeaturesAPI_Intersection.h"
  %include "FeaturesAPI_Measurement.h"
 +%include "FeaturesAPI_PointCoordinates.h"
+ %include "FeaturesAPI_GeometryCalculation.h"
  %include "FeaturesAPI_MultiRotation.h"
  %include "FeaturesAPI_MultiTranslation.h"
  %include "FeaturesAPI_Partition.h"
diff --cc src/FeaturesAPI/FeaturesAPI_swig.h
index f338d877e,030fbaa26..075fc129d
--- a/src/FeaturesAPI/FeaturesAPI_swig.h
+++ b/src/FeaturesAPI/FeaturesAPI_swig.h
@@@ -35,7 -35,7 +35,8 @@@
    #include "FeaturesAPI_Fillet.h"
    #include "FeaturesAPI_Intersection.h"
    #include "FeaturesAPI_Measurement.h"
 +  #include "FeaturesAPI_PointCoordinates.h"
+   #include "FeaturesAPI_GeometryCalculation.h"
    #include "FeaturesAPI_MultiRotation.h"
    #include "FeaturesAPI_MultiTranslation.h"
    #include "FeaturesAPI_Partition.h"
diff --cc src/FeaturesPlugin/CMakeLists.txt
index ea3598605,83df4b493..d17eace79
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@@ -69,7 -69,7 +69,8 @@@ SET(PROJECT_HEADER
      FeaturesPlugin_Fillet.h
      FeaturesPlugin_Fillet1D.h
      FeaturesPlugin_Measurement.h
 +    FeaturesPlugin_PointCoordinates.h
+     FeaturesPlugin_GeometryCalculation.h
      FeaturesPlugin_FusionFaces.h
      FeaturesPlugin_RemoveResults.h
      FeaturesPlugin_Chamfer.h
@@@ -117,7 -117,7 +118,8 @@@ SET(PROJECT_SOURCE
      FeaturesPlugin_Fillet.cpp
      FeaturesPlugin_Fillet1D.cpp
      FeaturesPlugin_Measurement.cpp
 +    FeaturesPlugin_PointCoordinates.cpp
+     FeaturesPlugin_GeometryCalculation.cpp
      FeaturesPlugin_FusionFaces.cpp
      FeaturesPlugin_RemoveResults.cpp
      FeaturesPlugin_Chamfer.cpp
@@@ -156,7 -156,7 +158,8 @@@ SET(XML_RESOURCE
    fillet_widget.xml
    fillet1d_widget.xml
    measurement_widget.xml
 +  point_coordinates_widget.xml
+   geometry_calculation_widget.xml
    fusion_faces_widget.xml
    chamfer_widget.xml
    copy_widget.xml
@@@ -700,11 -700,5 +703,12 @@@ ADD_UNIT_TESTS(TestExtrusion.p
                 TestFillet1D_Wire_3.py
                 TestFillet1D_Wire_4.py
                 TestFillet1D_Wire_5.py
 +               Test19931.py
 +               Test20027.py
 +               Test20245_1.py
 +               Test20245_2.py
 +               Test20245_3.py
 +               Test20247.py
 +               TestPointCoordinates.py
+                TestBasicProperties.py
  )
diff --cc src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
index 9e97eb0ce,d4f2f77a3..512810067
--- a/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
+++ b/src/FeaturesPlugin/FeaturesPlugin_Plugin.cpp
@@@ -31,9 -31,9 +31,10 @@@
  #include <FeaturesPlugin_ExtrusionFuse.h>
  #include <FeaturesPlugin_Fillet.h>
  #include <FeaturesPlugin_Fillet1D.h>
++#include <FeaturesPlugin_GeometryCalculation.h>
  #include <FeaturesPlugin_Intersection.h>
  #include <FeaturesPlugin_Measurement.h>
 -#include <FeaturesPlugin_GeometryCalculation.h>
 +#include <FeaturesPlugin_PointCoordinates.h>
  #include <FeaturesPlugin_MultiRotation.h>
  #include <FeaturesPlugin_MultiTranslation.h>
  #include <FeaturesPlugin_Partition.h>
@@@ -188,8 -188,8 +189,10 @@@ FeaturePtr FeaturesPlugin_Plugin::creat
      return FeaturePtr(new FeaturesPlugin_Fillet1D);
    } else if (theFeatureID == FeaturesPlugin_Measurement::ID()) {
      return FeaturePtr(new FeaturesPlugin_Measurement);
 +  } else if (theFeatureID == FeaturesPlugin_PointCoordinates::ID()) {
 +    return FeaturePtr(new FeaturesPlugin_PointCoordinates);
+   } else if (theFeatureID == FeaturesPlugin_GeometryCalculation::ID()) {
+     return FeaturePtr(new FeaturesPlugin_GeometryCalculation);
    } else if (theFeatureID == FeaturesPlugin_RemoveResults::ID()) {
      return FeaturePtr(new FeaturesPlugin_RemoveResults);
    } else if (theFeatureID == FeaturesPlugin_Chamfer::ID()) {
diff --cc src/FeaturesPlugin/doc/FeaturesPlugin.rst
index a2d77f7bf,cb35ea50a..7f0ff9a1e
--- a/src/FeaturesPlugin/doc/FeaturesPlugin.rst
+++ b/src/FeaturesPlugin/doc/FeaturesPlugin.rst
@@@ -18,14 -18,14 +18,15 @@@ Features plug-in provides a set of comm
     extrusionCutFeature.rst
     extrusionFeature.rst
     extrusionFuseFeature.rst
 -   fillet1dFeature.rst
     filletFeature.rst
 +   fillet1dFeature.rst
     fuseFeatureFaces.rst
++   geometryCalculationFeature.rst
     importResultFeature.rst
     linearCopyFeature.rst
     measurementFeature.rst
-    pointCoordinatesFeature.rst
 -   geometryCalculationFeature.rst
     pipeFeature.rst
++   pointCoordinatesFeature.rst
     placementFeature.rst
     recoverFeature.rst
     removeSubShapesFeature.rst
diff --cc src/FeaturesPlugin/geometry_calculation_widget.xml
index 000000000,da30ff176..81d5b2489
mode 000000,100644..100644
--- a/src/FeaturesPlugin/geometry_calculation_widget.xml
+++ b/src/FeaturesPlugin/geometry_calculation_widget.xml
@@@ -1,0 -1,13 +1,13 @@@
+ <source>
+   <shape_selector id="main_object"
+                   label="Object"
+                   tooltip="Select a object"
 -                  shape_types="edges faces solids compsolids"
++                  shape_types="edges wires faces shells solids compsolids compounds"
+                   default=""
+                   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="area" isSelectable = "true"/>
+   <label id="volume" isSelectable = "true"/>
+ </source>
diff --cc src/FeaturesPlugin/plugin-Features.xml
index 926f4cfe2,343c77567..92de1c372
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@@ -172,13 -172,11 +172,17 @@@
      </group>
    </workbench>
    <workbench id="Inspection">
 +    <group id="PointCoordinates">
 +      <feature id="PointCoordinates" title="Point coordinates" tooltip="View point coordinate"
 +               icon="icons/Features/point_coord.png" helpfile="pointCoordinatesFeature.html" abort_confirmation="false">
 +        <source path="point_coordinates_widget.xml"/>
 +      </feature>
 +    </group>
      <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="geometry_calculation_widget.xml"/>
+       </feature>
        <feature id="Measurement" title="Measurement" tooltip="Calculate properties of objects"
                 icon="icons/Features/measurement.png" helpfile="measurementFeature.html" abort_confirmation="false">
          <source path="measurement_widget.xml"/>
diff --cc src/PythonAPI/model/features/__init__.py
index 41f3e1e8e,354362e09..ff5d62f2b
--- a/src/PythonAPI/model/features/__init__.py
+++ b/src/PythonAPI/model/features/__init__.py
@@@ -30,7 -30,7 +30,8 @@@ from FeaturesAPI import addRecove
  from FeaturesAPI import addFillet, addChamfer
  from FeaturesAPI import addFusionFaces
  from FeaturesAPI import measureLength, measureDistance, measureRadius, measureAngle
 +from FeaturesAPI import getPointCoordinates
+ from FeaturesAPI import getBasicProperties
  from FeaturesAPI import addRemoveResults
  from FeaturesAPI import addCopy, addImportResult
  from FeaturesAPI import addDefeaturing