La part

[modules/shaper.git] / src / FiltersPlugin / FiltersPlugin_OnGeometry.cpp

diff --git a/src/FiltersPlugin/FiltersPlugin_OnGeometry.cpp b/src/FiltersPlugin/FiltersPlugin_OnGeometry.cpp
index e62dba49c31cf3f72e5fa7e4515ed94a4d324b0a..d234e4f8ec2114c07732fe99d00d3fb5ee47f1bb 100644 (file)
--- a/src/FiltersPlugin/FiltersPlugin_OnGeometry.cpp
+++ b/src/FiltersPlugin/FiltersPlugin_OnGeometry.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2019  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  CEA/DEN, EDF R&D
 //
 // This library is free software; you can redistribute it and/or
 // modify it under the terms of the GNU Lesser General Public
@@ -26,8 +26,8 @@ bool FiltersPlugin_OnGeometry::isSupported(GeomAPI_Shape::ShapeType theType) con
   return theType == GeomAPI_Shape::EDGE || theType == GeomAPI_Shape::FACE;
 }
 
-bool FiltersPlugin_OnGeometry::isOk(const GeomShapePtr& theShape,
-  const ModelAPI_FiltersArgs& theArgs) const
+bool FiltersPlugin_OnGeometry::isOk(const GeomShapePtr& theShape, const ResultPtr&,
+                                    const ModelAPI_FiltersArgs& theArgs) const
 {
   AttributePtr aAttr = theArgs.argument("OnGeometry");
   AttributeSelectionListPtr aList =
@@ -35,28 +35,19 @@ bool FiltersPlugin_OnGeometry::isOk(const GeomShapePtr& theShape,
   if (!aList.get())
     return false;
   for (int i = 0; i < aList->size(); i++) {
-    AttributeSelectionPtr aAttr = aList->value(i);
-    GeomShapePtr aGeom = aAttr->value();
-    if (aGeom->isSameGeometry(theShape))
+    AttributeSelectionPtr aCurAttr = aList->value(i);
+    GeomShapePtr aGeom = aCurAttr->value();
+    if (!aGeom)
+      aGeom = aCurAttr->context()->shape();
+    if (aGeom && aGeom->isSameGeometry(theShape))
       return true;
   }
   return false;
 }
 
-static std::string XMLRepresentation =
-"<filter id = \"OnGeometry\">"
-" <multi_selector id=\"OnGeometry__OnGeometry\""
-"   label=\"Edges/faces:\""
-"   tooltip=\"Select objects to limit selection.\""
-"   type_choice=\"edges faces\">"
-"   <validator id=\"GeomValidators_ShapeType\" parameters=\"edge,face\"/>"
-" </multi_selector>"
-"</filter>";
-
-
 std::string FiltersPlugin_OnGeometry::xmlRepresentation() const
 {
-  return XMLRepresentation;
+  return xmlFromFile("filter-OnGeometry.xml");
 }
 
 void FiltersPlugin_OnGeometry::initAttributes(ModelAPI_FiltersArgs& theArguments)