Issue #763 - It is possible to remove parameter which is used in features -- Add...

diff --git a/src/Model/Model_Data.cpp b/src/Model/Model_Data.cpp
index 0e8d64bd1a911fbce36e8365379023c621999120..3e7a5407e491dd05745450173a4c7200100fa7d0 100644 (file)
--- a/src/Model/Model_Data.cpp
+++ b/src/Model/Model_Data.cpp
@@ -20,9 +20,14 @@
 #include <Model_Expression.h>
 #include <ModelAPI_Feature.h>
 #include <ModelAPI_Result.h>
+#include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_Validator.h>
 #include <ModelAPI_Session.h>
 #include <ModelAPI_ResultPart.h>
+#include <ModelAPI_Tools.h>
+
+#include <GeomDataAPI_Point.h>
+#include <GeomDataAPI_Point2D.h>
 
 #include <GeomData_Point.h>
 #include <GeomData_Point2D.h>
@@ -397,6 +402,45 @@ void Model_Data::updateConcealmentFlag()
 
 #include <Model_Validator.h>
 
+std::set<std::string> set_union(const std::set<std::string>& theLeft, 
+                                const std::set<std::string>& theRight)
+{
+  std::set<std::string> aResult;
+  aResult.insert(theLeft.begin(), theLeft.end());
+  aResult.insert(theRight.begin(), theRight.end());
+  return aResult;
+}
+
+std::set<std::string> usedParameters(const AttributePointPtr& theAttribute)
+{
+  std::set<std::string> anUsedParameters;
+  for (int aComponent = 0; aComponent < 3; ++aComponent)
+    anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent));
+  return anUsedParameters;
+}
+
+std::set<std::string> usedParameters(const AttributePoint2DPtr& theAttribute)
+{
+  std::set<std::string> anUsedParameters;
+  for (int aComponent = 0; aComponent < 2; ++aComponent)
+    anUsedParameters = set_union(anUsedParameters, theAttribute->usedParameters(aComponent));
+  return anUsedParameters;
+}
+
+std::list<ResultParameterPtr> findVariables(const std::set<std::string>& theParameters)
+{
+  std::list<ResultParameterPtr> aResult;
+  std::set<std::string>::const_iterator aParamIt = theParameters.cbegin();
+  for (; aParamIt != theParameters.cend(); ++aParamIt) {
+    const std::string& aName = *aParamIt;
+    double aValue;
+    ResultParameterPtr aParam;
+    if (ModelAPI_Tools::findVariable(aName, aValue, aParam))
+      aResult.push_back(aParam);
+  }
+  return aResult;
+}
+
 void Model_Data::referencesToObjects(
   std::list<std::pair<std::string, std::list<ObjectPtr> > >& theRefs)
 {
@@ -432,6 +476,24 @@ void Model_Data::referencesToObjects(
       for(int a = aRef->size() - 1; a >= 0; a--) {
         aReferenced.push_back(aRef->value(a)->context());
       }
+    } else if (aType == ModelAPI_AttributeDouble::typeId()) { // double attribute
+      AttributeDoublePtr anAttribute =
+          std::dynamic_pointer_cast<ModelAPI_AttributeDouble>(anAttr->second);
+      std::set<std::string> anUsedParameters = anAttribute->usedParameters();
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
+    } else if (aType == GeomDataAPI_Point::typeId()) { // point attribute
+      AttributePointPtr anAttribute =
+        std::dynamic_pointer_cast<GeomDataAPI_Point>(anAttr->second);
+      std::set<std::string> anUsedParameters = usedParameters(anAttribute);
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
+    } else if (aType == GeomDataAPI_Point2D::typeId()) { // point attribute
+      AttributePoint2DPtr anAttribute =
+        std::dynamic_pointer_cast<GeomDataAPI_Point2D>(anAttr->second);
+      std::set<std::string> anUsedParameters = usedParameters(anAttribute);
+      std::list<ResultParameterPtr> aParameters = findVariables(anUsedParameters);
+      aReferenced.insert(aReferenced.end(), aParameters.begin(), aParameters.end());
     } else
       continue; // nothing to do, not reference
 

diff --git a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
index 13dfc182a7d00a108b82df06cf04446b034dbb84..b5acdb33e644bbc8cd633950b5f13414150be821 100644 (file)
--- a/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
+++ b/src/ParametersPlugin/ParametersPlugin_EvalListener.cpp
@@ -25,6 +25,7 @@
 #include <GeomDataAPI_Point2D.h>
 
 #include <string>
+#include <set>
 #include <sstream>
 
 ParametersPlugin_EvalListener::ParametersPlugin_EvalListener()
@@ -84,6 +85,11 @@ double ParametersPlugin_EvalListener::evaluate(const std::string& theExpression,
   return result;
 }
 
+std::set<std::string> toSet(const std::list<std::string>& theContainer)
+{
+  return std::set<std::string>(theContainer.begin(), theContainer.end());
+}
+
 void ParametersPlugin_EvalListener::processEvaluationEvent(
     const std::shared_ptr<Events_Message>& theMessage)
 {
@@ -98,6 +104,7 @@ void ParametersPlugin_EvalListener::processEvaluationEvent(
     bool isValid = anError.empty();
     if (isValid)
       anAttribute->setCalculatedValue(aValue);
+    anAttribute->setUsedParameters(isValid ? toSet(myInterp->compile(anAttribute->text())) : std::set<std::string>());
     anAttribute->setExpressionInvalid(!isValid);
     anAttribute->setExpressionError(anAttribute->text().empty() ? "" : anError);
   } else
@@ -119,6 +126,7 @@ void ParametersPlugin_EvalListener::processEvaluationEvent(
       double aValue = evaluate(aText[i], anError);
       bool isValid = anError.empty();
       if (isValid) aCalculatedValue[i] = aValue;
+      anAttribute->setUsedParameters(i, isValid ? toSet(myInterp->compile(aText[i])) : std::set<std::string>());
       anAttribute->setExpressionInvalid(i, !isValid);
       anAttribute->setExpressionError(i, aText[i].empty() ? "" : anError);
     }
@@ -142,6 +150,7 @@ void ParametersPlugin_EvalListener::processEvaluationEvent(
       double aValue = evaluate(aText[i], anError);
       bool isValid = anError.empty();
       if (isValid) aCalculatedValue[i] = aValue;
+      anAttribute->setUsedParameters(i, isValid ? toSet(myInterp->compile(aText[i])) : std::set<std::string>());
       anAttribute->setExpressionInvalid(i, !isValid);
       anAttribute->setExpressionError(i, aText[i].empty() ? "" : anError);
     }