X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FCMakeLists.txt;h=07a31f551b0bbb89382f5a252e2cfa1ee4ef1e06;hb=a52f4db613b20b4ff0997b4a1c1001d430daa287;hp=b0be8b41278ecdeba343131e49998b7b0d07c41d;hpb=f683c7e26a3ab8d24912b462f6eab69d8c91dd13;p=modules%2Fshaper.git

diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt
index b0be8b412..07a31f551 100644
--- a/src/FeaturesPlugin/CMakeLists.txt
+++ b/src/FeaturesPlugin/CMakeLists.txt
@@ -30,6 +30,11 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_Rotation.h
     FeaturesPlugin_Translation.h
     FeaturesPlugin_Boolean.h
+    FeaturesPlugin_BooleanCut.h
+    FeaturesPlugin_BooleanFuse.h
+    FeaturesPlugin_BooleanCommon.h
+    FeaturesPlugin_BooleanSmash.h
+    FeaturesPlugin_BooleanFill.h
     FeaturesPlugin_Intersection.h
     FeaturesPlugin_Partition.h
     FeaturesPlugin_Pipe.h
@@ -52,6 +57,8 @@ SET(PROJECT_HEADERS
     FeaturesPlugin_MultiTranslation.h
     FeaturesPlugin_MultiRotation.h
     FeaturesPlugin_Fillet.h
+    FeaturesPlugin_Measurement.h
+    FeaturesPlugin_FusionFaces.h
 )
 
 SET(PROJECT_SOURCES
@@ -62,6 +69,10 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_Rotation.cpp
     FeaturesPlugin_Translation.cpp
     FeaturesPlugin_Boolean.cpp
+    FeaturesPlugin_BooleanCut.cpp
+    FeaturesPlugin_BooleanFuse.cpp
+    FeaturesPlugin_BooleanCommon.cpp
+    FeaturesPlugin_BooleanSmash.cpp
     FeaturesPlugin_Intersection.cpp
     FeaturesPlugin_Partition.cpp
     FeaturesPlugin_Pipe.cpp
@@ -84,6 +95,8 @@ SET(PROJECT_SOURCES
     FeaturesPlugin_MultiTranslation.cpp
     FeaturesPlugin_MultiRotation.cpp
     FeaturesPlugin_Fillet.cpp
+    FeaturesPlugin_Measurement.cpp
+    FeaturesPlugin_FusionFaces.cpp
 )
 
 SET(XML_RESOURCES
@@ -97,6 +110,10 @@ SET(XML_RESOURCES
   rotation_widget.xml
   translation_widget.xml
   boolean_widget.xml
+  boolean_fuse_widget.xml
+  boolean_common_widget.xml
+  boolean_fill_widget.xml
+  boolean_smash_widget.xml
   recover_widget.xml
   partition_widget.xml
   placement_widget.xml
@@ -109,6 +126,8 @@ SET(XML_RESOURCES
   multitranslation_widget.xml
   multirotation_widget.xml
   fillet_widget.xml
+  measurement_widget.xml
+  fusion_faces_widget.xml
 )
 
 SET(TEXT_RESOURCES
@@ -125,6 +144,8 @@ INCLUDE_DIRECTORIES(
   ../GeomAlgoAPI
   ../GeomValidators
   ../Events
+  ../Config
+  ${OpenCASCADE_INCLUDE_DIR}
 )
 
 SET(PROJECT_LIBRARIES
@@ -133,6 +154,8 @@ SET(PROJECT_LIBRARIES
     GeomAPI
     GeomAlgoAPI
     GeomValidators
+    Config
+    ${OpenCASCADE_Visualization_LIBRARIES}
 )
 
 ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS)
@@ -167,6 +190,7 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestUnionFaces.py
                TestRemoveSubShapes.py
                TestRemoveSubShapes2.py
+               TestRemoveSubShapes3.py
                TestPipe.py
                TestRecover.py
                TestRecover1798.py
@@ -217,8 +241,15 @@ ADD_UNIT_TESTS(TestExtrusion.py
                TestPartitionInclinedFaceSolid.py
                TestPartitionWireFaceSolid.py
                TestUnion4CurvedFaces.py
+               TestUnion4CurvedFaces_2.py
                TestUnion4Faces.py
                TestUnionOfUnion.py
+               TestMeasurementLength.py
+               TestMeasurementDistance.py
+               TestMeasurementRadius.py
+               TestMeasurementAngle.py
+               TestFusionFaces.py
+               Test1379.py
                Test1922.py
                Test1942.py
                Test1915.py
@@ -251,4 +282,89 @@ ADD_UNIT_TESTS(TestExtrusion.py
                Test2419_2.py
                Test2419_3.py
                Test2465.py
+               Test2495.py
+               Test2514.py
+               Test2520.py
+               TestBooleanCut_CompSolid_CompSolid.py
+               TestBooleanCut_CompSolidCompound_CompSolidCompound.py
+               TestBooleanCut_Edge_Edge.py
+               TestBooleanCut_Edge_Face.py
+               TestBooleanCut_EdgeCompound_EdgeCompound.py
+               TestBooleanCut_EdgeCompound_Solid.py
+               TestBooleanCut_Face_Face.py
+               TestBooleanCut_Face_Solid.py
+               TestBooleanCut_FaceCompound_FaceCompound.py
+               TestBooleanCut_Shell_Shell.py
+               TestBooleanCut_ShellCompound_ShellCompound.py
+               TestBooleanCut_Solid_Solid.py
+               TestBooleanCut_SolidCompound_SolidCompound.py
+               TestBooleanCut_Vertex_Vertex.py
+               TestBooleanCut_VertexCompound_Solid.py
+               TestBooleanCut_VertexCompound_VertexCompound.py
+               TestBooleanCut_Wire_Face.py
+               TestBooleanCut_Wire_Wire.py
+               TestBooleanCut_WireCompound_WireCompound.py
+               TestBooleanSmash_Face_Face.py
+               TestBooleanFuse_SimpleMode.py
+               TestBooleanFuse_RemoveEdges.py
+               TestBooleanCommon_Vertex_Vertex.py
+               TestBooleanCommon_VertexCompound_VertexCompound.py
+               TestBooleanCommon_Edge_Edge.py
+               TestBooleanCommon_EdgeCompound_EdgeCompound.py
+               TestBooleanCommon_Wire_Wire.py
+               TestBooleanCommon_WireCompound_WireCompound.py
+               TestBooleanCommon_Face_Face.py
+               TestBooleanCommon_FaceCompound_FaceCompound.py
+               TestBooleanCommon_Shell_Shell.py
+               TestBooleanCommon_ShellCompound_ShellCompound.py
+               TestBooleanCommon_Solid_Face.py
+               TestBooleanCommon_Solid_Shell.py
+               TestBooleanCommon_Solid_Solid.py
+               TestBooleanCommon_SolidCompound_Face.py
+               TestBooleanCommon_SolidCompound_Shell.py
+               TestBooleanCommon_SolidCompound_SolidCompound.py
+               TestBooleanCommon_CompSolid_Face.py
+               TestBooleanCommon_CompSolid_Shell.py
+               TestBooleanCommon_CompSolid_CompSolid.py
+               TestBooleanCommon_CompSolidCompound_Face.py
+               TestBooleanCommon_CompSolidCompound_Shell.py
+               TestBooleanCommon_CompSolidCompound_CompSolidCompound.py
+               Test2596.py
+               Test2592.py
+               Test2588.py
+               Test1467.py
+               TestPartitionSubCompsolidWithCompsolid1.py
+               TestPartitionSubCompsolidWithCompsolid2.py
+               TestPartitionSubCompsolidWithCompsolid3.py
+               TestPartitionSubCompsolidWithSolid1.py
+               TestPartitionSubCompsolidWithSolid2.py
+               TestPartitionSubCompsolidWithSolid3.py
+               TestPartitionSubCompsolidWithSolid4.py
+               TestPartitionSubCompsolidWithSolid5.py
+               TestPartitionSubCompsolidWithFace1.py
+               TestPartitionSubCompsolidWithFace2.py
+               TestPartitionSubCompsolidWithFace3.py
+               TestPartitionSubCompsolidWithFace4.py
+               TestPartitionSubCompsolidWithFace5.py
+               TestPartitionSubCompsolidWithPlane1.py
+               TestPartitionSubCompsolidWithPlane2.py
+               TestPartitionSubCompsolidWithPlane3.py
+               TestPartitionSubCompsolidWithPlane4.py
+               TestPartitionSubCompsolidWithPlane5.py
+               TestBooleanFuse_Vertex_Vertex.py
+               TestBooleanFuse_VertexCompound_VertexCompound.py
+               TestBooleanFuse_Edge_Edge.py
+               TestBooleanFuse_EdgeCompound_EdgeCompound.py
+               TestBooleanFuse_Wire_Wire.py
+               TestBooleanFuse_WireCompound_WireCompound.py
+               TestBooleanFuse_Face_Face.py
+               TestBooleanFuse_FaceCompound_FaceCompound.py
+               TestBooleanFuse_Shell_Shell.py
+               TestBooleanFuse_ShellCompound_ShellCompound.py
+               TestBooleanFuse_Solid_Solid.py
+               TestBooleanFuse_SolidCompound_SolidCompound.py
+               TestBooleanFuse_CompSolid_CompSolid.py
+               TestBooleanFuse_CompSolidCompound_CompSolidCompound.py
+               Test1816.py
+               Test2631.py
 )