fix plugin-Features.xml and CMakeLists.txt

patch	TestNormalToFace.py
add	doc/example/createNormalToFace.py and createNormalToFaceAtVertex.py

diff --git a/doc/examples/createNormalToFace.py b/doc/examples/createNormalToFace.py
new file mode 100644 (file)
index 0000000..c89e07c
--- /dev/null
+++ b/doc/examples/createNormalToFace.py
@@ -0,0 +1,12 @@
+from salome.shaper import model
+import os
+
+model.begin()
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+model.do()
+    
+### Create BoundingBox
+Normal_1 = model.getNormal(Part_1_doc, model.selection("FACE", "Box_1_1/Top"))
+model.do()
+
+model.end()

diff --git a/doc/examples/createNormalToFaceAtVertex.py b/doc/examples/createNormalToFaceAtVertex.py
new file mode 100644 (file)
index 0000000..eb0071e
--- /dev/null
+++ b/doc/examples/createNormalToFaceAtVertex.py
@@ -0,0 +1,12 @@
+
+from salome.shaper import model
+import os
+
+model.begin()
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+model.do()
+    
+Normal_1 = model.getNormal(Part_1_doc, model.selection("FACE", "Box_1_1/Front"), model.selection("VERTEX", "[Box_1_1/Front][Box_1_1/Right][Box_1_1/Bottom]"))
+model.do()
+
+model.end()

diff --git a/src/FeaturesPlugin/Test/TestNormalToFace.py b/src/FeaturesPlugin/Test/TestNormalToFace.py
index ad70044d91a71c97647b1c7f4b2d52e0ee4c76f6..51ed2424c063c9ecce44de92b6cdfe9d4c8cf4cc 100644 (file)
--- a/src/FeaturesPlugin/Test/TestNormalToFace.py
+++ b/src/FeaturesPlugin/Test/TestNormalToFace.py
@@ -34,33 +34,44 @@ from salome.shaper import model
 
 __updated__ = "2020-11-12"
 
-
 #=========================================================================
-# test creating normal to face
+# Initialization of the test
 #=========================================================================
-def test_Normal_to_face():
+model.begin()
+partSet = model.moduleDocument()
+
+### Create Part
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
 
-    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()
-    ### Create Normal
-    Normal_1 = model.getNormal(Part_1_doc, model.selection("FACE", "box1_1/Shape_6"))
-    model.end()
+### Create Box
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+model.do()
+
+#=========================================================================
+# Test 1. Create a normal to a face with only a face
+#=========================================================================
+Normal_1 = model.getNormal(Part_1_doc, model.selection("FACE", "Box_1_1/Top"))
+model.do()
 
-    assert (len(Normal_1.results()) > 0)
-    assert(Normal_1.feature().error() == "")
-    anAxisResult = modelAPI_ResultConstruction(Normal_1.feature().firstResult())
-    assert (anAxisResult is not None)
+#=========================================================================
+# Test 2. Create a normal to a face with a face and a vertex
+#=========================================================================
+Normal_2 = model.getNormal(Part_1_doc, model.selection("FACE", "Box_1_1/Front"), model.selection("VERTEX", "[Box_1_1/Front][Box_1_1/Right][Box_1_1/Bottom]"))
+model.do()
 
+model.end()
 
-if __name__ == '__main__':
+assert (len(Normal_1.results()) > 0)
+assert(Normal_1.feature().error() == "")
+anAxisResult = modelAPI_ResultConstruction(Normal_1.feature().firstResult())
+assert (anAxisResult is not None)
 
-    test_Normal_to_face()
+assert (len(Normal_2.results()) > 0)
+assert(Normal_2.feature().error() == "")
+anAxisResult = modelAPI_ResultConstruction(Normal_2.feature().firstResult())
+assert (anAxisResult is not None)
 
-    #=========================================================================
-    # End of test
-    #=========================================================================
+#=========================================================================
+# End of test
+#=========================================================================

diff --git a/src/FeaturesPlugin/plugin-Features.xml b/src/FeaturesPlugin/plugin-Features.xml
index 9092142dcd31532c70f418021b7f87ea66edabe5..9de64b96e8a0cdc1247b478ba973c3e1384cd8eb 100644 (file)
--- a/src/FeaturesPlugin/plugin-Features.xml
+++ b/src/FeaturesPlugin/plugin-Features.xml
@@ -126,7 +126,7 @@
         <source path="fillet1d_widget.xml"/>
       </feature>
       <feature id="Fillet" title="Fillet" tooltip="Perform fillet on face or edge"
-               icon="icons/Features/fillet.png" auto_preview="false" helpfile="filletFeature.html">
+               icon="icons/Features/fillet.png" auto_preview="true" helpfile="filletFeature.html">
         <source path="fillet_widget.xml"/>
       </feature>
       <feature id="Chamfer" title="Chamfer" tooltip="Perform chamfer on face or edge"
@@ -134,7 +134,7 @@
         <source path="chamfer_widget.xml"/>
       </feature>
       <feature id="FusionFaces" title="Fuse Faces" tooltip="Performs fusion of connected faces"
-               icon="icons/Features/fusion_faces.png" auto_preview="true" helpfile="FeaturesPlugin/fusionFacesFeature.html">
+               icon="icons/Features/fusion_faces.png" auto_preview="true" helpfile="fusionFacesFeature.html">
         <source path="fusion_faces_widget.xml"/>
       </feature>
       <feature id="Defeaturing" title="Defeaturing" tooltip="Perform removing faces from solid"

diff --git a/src/ModelAPI/CMakeLists.txt b/src/ModelAPI/CMakeLists.txt
index e495fe850028aa945b761d86b02b6c4a3bf3b4e9..aaed42c91b2da2a326c418e65e70e662da53e780 100644 (file)
--- a/src/ModelAPI/CMakeLists.txt
+++ b/src/ModelAPI/CMakeLists.txt
@@ -117,7 +117,7 @@ SET(PROJECT_SOURCES
 SET(PROJECT_LIBRARIES
     Config
     GeomAPI
-    ${OpenCASCADE_ApplicationFramework_LIBRARIES}
+    Locale
 )
 SET(CMAKE_SWIG_FLAGS -threads -w325,321,362,383,302,403,451,473)
 ADD_DEFINITIONS(-DMODELAPI_EXPORTS)
@@ -131,10 +131,6 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/src/Config
                     ${PROJECT_SOURCE_DIR}/src/GeomAPI
                     ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
                     ${PROJECT_SOURCE_DIR}/src/Locale
-                    ${OpenCASCADE_INCLUDE_DIR}
-                    ${OpenCASCADE_DataExchange_LIBRARIES}
-                    ${OpenCASCADE_ModelingAlgorithms_LIBRARIES}
-                    ${OpenCASCADE_ApplicationFramework_LIBRARIES}
 )