From: mpv <mpv@opencascade.com>
Date: Tue, 18 Jun 2019 13:50:37 +0000 (+0300)
Subject: Correct processing of parametric update of filters arguments
X-Git-Tag: VEDF2019Lot4~101^2~27
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=80b380850d212f0febdaf53a50548155d598d92c;p=modules%2Fshaper.git

Correct processing of parametric update of filters arguments
---

diff --git a/src/FiltersPlugin/FiltersPlugin_OnPlane.cpp b/src/FiltersPlugin/FiltersPlugin_OnPlane.cpp
index 3bb1019a2..c86a33474 100644
--- a/src/FiltersPlugin/FiltersPlugin_OnPlane.cpp
+++ b/src/FiltersPlugin/FiltersPlugin_OnPlane.cpp
@@ -99,11 +99,9 @@ bool FiltersPlugin_OnPlane::isOk(const GeomShapePtr& theShape,
       for (int i = 0; i < aList->size(); i++) {
         AttributeSelectionPtr aAttr = aList->value(i);
         GeomShapePtr aGeom = aAttr->value();
-        if (!aGeom->isSame(theShape)) {
-          GeomPlanePtr aPlane = getPlane(aAttr);
-          if (aPlane->isCoincident(aPln))
-            return true;
-        }
+        GeomPlanePtr aPlane = getPlane(aAttr);
+        if (aPlane->isCoincident(aPln))
+          return true;
       }
     }
   }
diff --git a/src/Model/Model_AttributeSelection.cpp b/src/Model/Model_AttributeSelection.cpp
index 8ae93763d..88a1610d5 100644
--- a/src/Model/Model_AttributeSelection.cpp
+++ b/src/Model/Model_AttributeSelection.cpp
@@ -730,6 +730,22 @@ std::string Model_AttributeSelection::namingName(const std::string& theDefaultNa
   if(!this->isInitialized())
     return !theDefaultName.empty() ? theDefaultName : aName;
 
+  // not argument has not parametric name (filters)
+  if (!this->isArgument() || (myParent && !myParent->isArgument())) {
+    GeomShapePtr aShape = value();
+    if (!aShape.get() && context().get())
+      aShape = context()->shape();
+    std::string aName;
+    if (aShape.get()) {
+      aName = aShape->shapeTypeStr();
+      if (myParent) {
+        aName += std::string("_") +
+          TCollection_AsciiString(selectionLabel().Father().Tag()).ToCString();
+      }
+    }
+    return aName;
+  }
+
   CenterType aCenterType = NOT_CENTER;
   std::shared_ptr<GeomAPI_Shape> aSubSh = internalValue(aCenterType);
   ResultPtr aCont = context();