X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FCMakeLists.txt;h=3ea4246124c7b8457cf194ffc652031a8df4fbc2;hb=eba04f700b9d6b0cfcf376b9661788107f0aee88;hp=d527286bb8f73fc659bddf2c70240d84f1ceef29;hpb=df643b545edc5f37df076a637aea27037d9c13d8;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/CMakeLists.txt b/src/FeaturesPlugin/CMakeLists.txt index d527286bb..3ea424612 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 @@ -51,6 +56,9 @@ SET(PROJECT_HEADERS FeaturesPlugin_Scale.h FeaturesPlugin_MultiTranslation.h FeaturesPlugin_MultiRotation.h + FeaturesPlugin_Fillet.h + FeaturesPlugin_Measurement.h + FeaturesPlugin_FusionFaces.h ) SET(PROJECT_SOURCES @@ -61,6 +69,11 @@ 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_BooleanFill.cpp FeaturesPlugin_Intersection.cpp FeaturesPlugin_Partition.cpp FeaturesPlugin_Pipe.cpp @@ -82,6 +95,9 @@ SET(PROJECT_SOURCES FeaturesPlugin_Scale.cpp FeaturesPlugin_MultiTranslation.cpp FeaturesPlugin_MultiRotation.cpp + FeaturesPlugin_Fillet.cpp + FeaturesPlugin_Measurement.cpp + FeaturesPlugin_FusionFaces.cpp ) SET(XML_RESOURCES @@ -95,6 +111,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 @@ -106,6 +126,9 @@ SET(XML_RESOURCES scale_widget.xml multitranslation_widget.xml multirotation_widget.xml + fillet_widget.xml + measurement_widget.xml + fusion_faces_widget.xml ) SET(TEXT_RESOURCES @@ -122,6 +145,8 @@ INCLUDE_DIRECTORIES( ../GeomAlgoAPI ../GeomValidators ../Events + ../Config + ${OpenCASCADE_INCLUDE_DIR} ) SET(PROJECT_LIBRARIES @@ -130,6 +155,8 @@ SET(PROJECT_LIBRARIES GeomAPI GeomAlgoAPI GeomValidators + Config + ${OpenCASCADE_Visualization_LIBRARIES} ) ADD_DEFINITIONS(-DFEATURESPLUGIN_EXPORTS) @@ -144,29 +171,117 @@ INSTALL(FILES ${TEXT_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES}) ADD_UNIT_TESTS(TestExtrusion.py TestExtrusionCut.py TestExtrusionFuse.py + TestExtrusion_ErrorMsg.py + TestExtrusion_ZeroOffsetError.py TestRevolution.py TestRevolutionCut.py TestRevolutionFuse.py TestCompositeFeaturesOnCompSolids.py TestPartition.py - TestPlacement.py + TestPartition_ErrorMsg.py + TestPlacement_Vertex_Vertex.py + TestPlacement_Edge_Vertex.py + TestPlacement_Edge_Edge.py + TestPlacement_Face_Vertex.py + TestPlacement_Face_Edge.py + TestPlacement_Face_Face.py + TestPlacement_Part_Part.py + TestPlacement_ErrorMsg.py TestTranslation.py + TestTranslation_Part.py TestRotation.py - TestBoolean.py + TestRotation_ErrorMsg.py + TestMultiRotation_Part.py + TestMultiTranslation_Part.py + TestSymmetry_Part.py + TestBoolean1.py + TestBoolean2.py + TestBoolean3.py TestBooleanCompSolids.py TestBooleanSmash.py TestBooleanFill.py TestBooleanFillWithPlane.py + TestBooleanFill_ErrorMsg.py TestMultiBoolean.py TestSerialBoolean.py + TestBoolean_ErrorMsg.py TestIntersection.py + TestIntersection_ErrorMsg.py TestUnion.py TestUnionFaces.py + TestUnion_ErrorMsg.py TestRemoveSubShapes.py TestRemoveSubShapes2.py + TestRemoveSubShapes3.py + TestRemoveSubShapes4.py + TestRemoveSubShapes5.py + TestRemoveSubShapes6.py TestPipe.py + TestPipe_Edge.py + TestPipe_Wire.py + TestPipe_Compound.py + TestPipe_ErrorMsg.py TestRecover.py TestRecover1798.py + TestFillEdgeVertex.py + TestFillEdgeEdge.py + TestFillEdgeEdgeIntersected.py + TestFillEdgeWire.py + TestFillEdgeFace.py + TestFillEdgeShell.py + TestFillEdgeSolid.py + TestFillEdgeSolidIntersected.py + TestFillWireVertex.py + TestFillWireEdge.py + TestFillWireWire.py + TestFillWireFace.py + TestFillWireShell.py + TestFillWireSolid.py + TestFillFaceVertex.py + TestFillFaceEdge.py + TestFillFaceEdgeInside.py + TestFillFaceEdgePerpendicular.py + TestFillFaceWire.py + TestFillFaceFace.py + TestFillFaceShell.py + TestFillFaceSolid.py + TestFillCompFaceSolid.py + TestFillShellVertex.py + TestFillShellEdge.py + TestFillShellConstrPlane.py + TestFillShellWire.py + TestFillShellFace.py + TestFillShellShell.py + TestFillShellSolid.py + TestFillSolid2ConstructionPlanes.py + TestFillSolidEdge.py + TestFillSolidFace.py + TestFillSolidCompFace.py + TestFillSolidShell.py + TestFillSolidCompShell.py + TestFillCompsolidPlane.py + TestPartition2Faces.py + TestPartition2Solids.py + TestPartition2Wires.py + TestPartitionBox4Planes.py + TestPartitionEdgeSolid.py + TestPartitionFace2Solid.py +# TestPartitionFaceSolid.py + TestPartitionFaceWire.py + TestPartitionInclinedFaceSolid.py + TestPartitionWireFaceSolid.py + TestUnion4CurvedFaces.py + TestUnion4CurvedFaces_2.py + TestUnion4Faces.py + TestUnionOfUnion.py + TestMeasurementLength.py + TestMeasurementDistance.py + TestMeasurementRadius.py + TestMeasurementAngle.py + TestMeasurementAngle3Points.py + TestMeasurementPresentation.py + TestFusionFaces.py + Test1379.py Test1922.py Test1942.py Test1915.py @@ -190,4 +305,123 @@ ADD_UNIT_TESTS(TestExtrusion.py Test2255.py Test2289.py Test2304.py + Test2304_2.py + Test2375.py + Test2377.py + Test2394.py + Test2395.py + Test2419_1.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 + TestBooleanCut_Compound_Solid.py + TestBooleanCut_ErrorMsg.py + TestBooleanSmash_Face_Face.py + TestBooleanSmash_SubSolid_Solid.py + TestBooleanSmash_CompSolid_Solid.py + TestBooleanSmash_ErrorMsg.py + TestBooleanFuse_SimpleMode.py + TestBooleanFuse_RemoveEdges.py + TestBooleanFuse_ErrorMsg.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_Face_Plane.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_SubCompound_Solid.py + TestBooleanCommon_SubSolid_Solid.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 + TestBooleanCommon_ErrorMsg.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_Face.py + TestBooleanFuse_CompSolid_CompSolid.py + TestBooleanFuse_CompSolidCompound_CompSolidCompound.py + TestFillet.py + TestFillet_ErrorMsg.py + Test1816.py + Test2631.py + Test2650.py + Test2681.py + Test2686.py + Test2689.py + Test2693.py + Test2698.py + Test2701.py + Test2724.py + Test2692.py + Test2617.py + Test2729.py + Test2751.py )