X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=inline;f=src%2FFiltersPlugin%2FCMakeLists.txt;h=d80b525159d47c74ec9c1f85be48c46b12d995f1;hb=0a332f5f970393cdf4d83f92aafd629dbe20b607;hp=bc9646cee8db95d21b15c9ebdfba62a1ee234c66;hpb=d4230889a1c3107f165746d0e73fc276444a4396;p=modules%2Fshaper.git

diff --git a/src/FiltersPlugin/CMakeLists.txt b/src/FiltersPlugin/CMakeLists.txt
index bc9646cee..d80b52515 100644
--- a/src/FiltersPlugin/CMakeLists.txt
+++ b/src/FiltersPlugin/CMakeLists.txt
@@ -34,6 +34,7 @@ SET(PROJECT_HEADERS
     FiltersPlugin_OppositeToEdge.h
     FiltersPlugin_RelativeToSolid.h
     FiltersPlugin_ExternalFaces.h
+    FiltersPlugin_Validators.h
 )
 
 SET(PROJECT_SOURCES
@@ -49,6 +50,7 @@ SET(PROJECT_SOURCES
     FiltersPlugin_OppositeToEdge.cpp
     FiltersPlugin_RelativeToSolid.cpp
     FiltersPlugin_ExternalFaces.cpp
+    FiltersPlugin_Validators.cpp
 )
 
 SET(PROJECT_LIBRARIES
@@ -57,6 +59,11 @@ SET(PROJECT_LIBRARIES
     Config
     GeomAPI
     GeomAlgoAPI
+    GeomValidators
+)
+
+SET(PROJECT_PYFILES
+    FiltersPlugin_TopoConnectedFaces.py
 )
 
 SET(XML_RESOURCES
@@ -68,11 +75,12 @@ SET(XML_RESOURCES
   filter-OnPlaneSide.xml
   filter-OppositeToEdge.xml
   filter-RelativeToSolid.xml
+  filter-TopoConnectedFaces.xml
 )
 
 ADD_DEFINITIONS(-DFILTERS_EXPORTS ${OpenCASCADE_DEFINITIONS})
-ADD_LIBRARY(Filters SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
-TARGET_LINK_LIBRARIES(Filters ${PROJECT_LIBRARIES})
+ADD_LIBRARY(FiltersPlugin SHARED ${PROJECT_SOURCES} ${PROJECT_HEADERS} ${XML_RESOURCES})
+TARGET_LINK_LIBRARIES(FiltersPlugin ${PROJECT_LIBRARIES})
 
 INCLUDE_DIRECTORIES(
   ${OpenCASCADE_INCLUDE_DIR}
@@ -82,28 +90,107 @@ INCLUDE_DIRECTORIES(
   ${PROJECT_SOURCE_DIR}/src/GeomAPI
   ${PROJECT_SOURCE_DIR}/src/GeomAlgoAPI
   ${PROJECT_SOURCE_DIR}/src/GeomDataAPI
+  ${PROJECT_SOURCE_DIR}/src/GeomValidators
+  ${PROJECT_SOURCE_DIR}/src/CollectionPlugin
 )
 
-INSTALL(TARGETS Filters DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
+INSTALL(TARGETS FiltersPlugin DESTINATION ${SHAPER_INSTALL_PLUGIN_FILES})
 INSTALL(FILES ${XML_RESOURCES} DESTINATION ${SHAPER_INSTALL_XML_RESOURCES})
+INSTALL(FILES ${PROJECT_PYFILES} DESTINATION ${SHAPER_INSTALL_ADDONS})
+
 
 ADD_UNIT_TESTS(
   TestFilters.py
+  TestFilters_Mixed1.py
+  TestFilters_Mixed2.py
+  TestFilters_Supported.py
+  TestFilters_Validator.py
+  TestFilters_Xml.py
+  TestFilters_FilterName.py
+  TestFilters_IsReversed.py
+  TestFilters_Remove.py
   TestFilter_BelongsTo.py
+  TestFilter_BelongsTo_Exclude.py
   TestFilter_OnPlane.py
+  TestFilter_OnPlane_Exclude.py
   TestFilter_OnLine.py
-  TestFilter_OnGeometry_Edge.py
-  TestFilter_OnGeometry_Face.py
+  TestFilter_OnLine_Exclude.py
+  TestFilter_OnGeometry_Edge1.py
+  TestFilter_OnGeometry_Edge2.py
+  TestFilter_OnGeometry_Face1.py
+  TestFilter_OnGeometry_Face2.py
+  TestFilter_OnGeometry_Face3.py
+  TestFilter_OnGeometry_Face4.py
+  TestFilter_OnGeometry_Exclude_Edge1.py
+  TestFilter_OnGeometry_Exclude_Edge2.py
+  TestFilter_OnGeometry_Exclude_Face1.py
+  TestFilter_OnGeometry_Exclude_Face2.py
+  TestFilter_OnGeometry_Exclude_Face3.py
+  TestFilter_OnGeometry_Exclude_Face4.py
   TestFilter_OnPlaneSide_Face.py
   TestFilter_OnPlaneSide_Plane.py
+  TestFilter_OnPlaneSide_Exclude_Face.py
+  TestFilter_OnPlaneSide_Exclude_Plane.py
   TestFilter_OppositeToEdge.py
+  TestFilter_OppositeToEdge_Exclude.py
   TestFilter_RelativeToSolid_In.py
   TestFilter_RelativeToSolid_Out.py
   TestFilter_RelativeToSolid_On.py
   TestFilter_RelativeToSolid_NotOn.py
   TestFilter_RelativeToSolid_InAndOn.py
   TestFilter_RelativeToSolid_OutAndOn.py
-  TestFilter_ExternalFaces.py
+  TestFilter_RelativeToSolid_Exclude_In.py
+  TestFilter_RelativeToSolid_Exclude_Out.py
+  TestFilter_RelativeToSolid_Exclude_On.py
+  TestFilter_RelativeToSolid_Exclude_NotOn.py
+  TestFilter_RelativeToSolid_Exclude_InAndOn.py
+  TestFilter_RelativeToSolid_Exclude_OutAndOn.py
+  TestFilter_ExternalFaces1.py
+  TestFilter_ExternalFaces2.py
+  TestFilter_ExternalFaces_Exclude1.py
+  TestFilter_ExternalFaces_Exclude2.py
   TestFilter_HorizontalFaces.py
+  TestFilter_HorizontalFaces_Exclude.py
   TestFilter_VerticalFaces.py
+  TestFilter_VerticalFaces_Exclude.py
+  TestFilter_TopoConnectedFaces_Vertex1.py
+  TestFilter_TopoConnectedFaces_Vertex2.py
+  TestFilter_TopoConnectedFaces_Vertex3.py
+  TestFilter_TopoConnectedFaces_Prop_Vertex1.py
+  TestFilter_TopoConnectedFaces_Prop_Vertex2.py
+  TestFilter_TopoConnectedFaces_Prop_Vertex3.py
+  TestFilter_TopoConnectedFaces_Edge1.py
+  TestFilter_TopoConnectedFaces_Edge2.py
+  TestFilter_TopoConnectedFaces_Edge3.py
+  TestFilter_TopoConnectedFaces_Prop_Edge1.py
+  TestFilter_TopoConnectedFaces_Prop_Edge2.py
+  TestFilter_TopoConnectedFaces_Prop_Edge3.py
+  TestFilter_TopoConnectedFaces_Face1.py
+  TestFilter_TopoConnectedFaces_Face2.py
+  TestFilter_TopoConnectedFaces_Face3.py
+  TestFilter_TopoConnectedFaces_Prop_Face1.py
+  TestFilter_TopoConnectedFaces_Prop_Face2.py
+  TestFilter_TopoConnectedFaces_Prop_Face3.py
+  TestFilter_TopoConnectedFaces_Exclude_Vertex1.py
+  TestFilter_TopoConnectedFaces_Exclude_Vertex2.py
+  TestFilter_TopoConnectedFaces_Exclude_Vertex3.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex1.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex2.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Vertex3.py
+  TestFilter_TopoConnectedFaces_Exclude_Edge1.py
+  TestFilter_TopoConnectedFaces_Exclude_Edge2.py
+  TestFilter_TopoConnectedFaces_Exclude_Edge3.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Edge1.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Edge2.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Edge3.py
+  TestFilter_TopoConnectedFaces_Exclude_Face1.py
+  TestFilter_TopoConnectedFaces_Exclude_Face2.py
+  TestFilter_TopoConnectedFaces_Exclude_Face3.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Face1.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Face2.py
+  TestFilter_TopoConnectedFaces_Prop_Exclude_Face3.py
+  Test2946.py
+  Test2951.py
+  Test17924.py
+  Test17962.py
 )