X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParametersPlugin%2FParametersPlugin_Parameter.cpp;h=54dc39581185a6892ddb35ce04310de7b19e044e;hb=03936c76cd52c555961e4636e640c12fe2d47f2f;hp=f9fdc7c6d114d6493101b5874747048e15ffef87;hpb=fccb11b890bf75fde316cd0dbc911fa001368062;p=modules%2Fshaper.git

diff --git a/src/ParametersPlugin/ParametersPlugin_Parameter.cpp b/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
index f9fdc7c6d..54dc39581 100644
--- a/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
+++ b/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
@@ -4,13 +4,18 @@
 // Created:     23 MArch 2015
 // Author:      sbh
 
+#include <pyconfig.h>
+
 #include "ParametersPlugin_Parameter.h"
 #include <ParametersPlugin_PyInterp.h>
 
 #include <ModelAPI_AttributeString.h>
 #include <ModelAPI_ResultParameter.h>
 #include <ModelAPI_AttributeDouble.h>
+#include <ModelAPI_AttributeRefList.h>
 #include <ModelAPI_Tools.h>
+#include <ModelAPI_Session.h>
+#include <ModelAPI_Validator.h>
 
 #include <string>
 #include <sstream>
@@ -27,10 +32,11 @@ ParametersPlugin_Parameter::~ParametersPlugin_Parameter()
 
 void ParametersPlugin_Parameter::initAttributes()
 {
-  data()->addAttribute(ParametersPlugin_Parameter::VARIABLE_ID(),
-                       ModelAPI_AttributeString::typeId());
-  data()->addAttribute(ParametersPlugin_Parameter::EXPRESSION_ID(),
-                       ModelAPI_AttributeString::typeId());
+  data()->addAttribute(VARIABLE_ID(), ModelAPI_AttributeString::typeId());
+  data()->addAttribute(EXPRESSION_ID(), ModelAPI_AttributeString::typeId());
+  data()->addAttribute(ARGUMENTS_ID(), ModelAPI_AttributeRefList::typeId());
+  data()->reflist(ARGUMENTS_ID())->setIsArgument(false);
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ARGUMENTS_ID());
 }
 
 bool ParametersPlugin_Parameter::isInHistory()
@@ -38,11 +44,25 @@ bool ParametersPlugin_Parameter::isInHistory()
   return false;
 }
 
-void ParametersPlugin_Parameter::attributeChanged(const std::string&)
+void ParametersPlugin_Parameter::attributeChanged(const std::string& theID)
+{
+  if (theID == EXPRESSION_ID())
+    updateExpression();
+}
+
+void ParametersPlugin_Parameter::updateName()
 {
+  std::string aName = string(VARIABLE_ID())->value();
+  data()->setName(aName);
+
   ResultParameterPtr aParam = document()->createParameter(data());
+  aParam->data()->setName(aName);
+  setResult(aParam);
+}
 
-  std::string anExpression = string(ParametersPlugin_Parameter::EXPRESSION_ID())->value();
+void ParametersPlugin_Parameter::updateExpression()
+{
+  std::string anExpression = string(EXPRESSION_ID())->value();
   if(anExpression.empty()) {
     // clear error/result if the expression is empty
     setError("", false);
@@ -50,21 +70,21 @@ void ParametersPlugin_Parameter::attributeChanged(const std::string&)
   }
   std::string outErrorMessage;
   double aValue = evaluate(anExpression, outErrorMessage);
-  // Name
-  std::string aName = string(ParametersPlugin_Parameter::VARIABLE_ID())->value();
   std::ostringstream sstream;
   sstream << aValue;
   std::string aParamValue = sstream.str();
-  data()->setName(aName);
-  aParam->data()->setName(aName);
   // Error
-  std::string aStateMsg;
   if (!outErrorMessage.empty()) {
-    aStateMsg = "Error: " + outErrorMessage;
+    std::string aStateMsg("Error: " + outErrorMessage);
     data()->execState(ModelAPI_StateExecFailed);
-  } 
-  setError(aStateMsg, false);
-  // Value
+    setError(aStateMsg, false);
+  } else {
+    static const std::string anEmptyMsg(""); // it is checked in the validator by the empty message
+    setError(anEmptyMsg, false);
+    data()->execState(ModelAPI_StateDone);
+  }
+
+  ResultParameterPtr aParam = document()->createParameter(data());
   AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
   aValueAttribute->setValue(aValue);
   setResult(aParam);
@@ -72,26 +92,55 @@ void ParametersPlugin_Parameter::attributeChanged(const std::string&)
 
 void ParametersPlugin_Parameter::execute()
 {
+  updateName();
+  updateExpression();
 }
 
 double ParametersPlugin_Parameter::evaluate(const std::string& theExpression, std::string& theError)
 {
-
   std::list<std::string> anExprParams = myInterp->compile(theExpression);
   // find expression's params in the model
   std::list<std::string> aContext;
   std::list<std::string>::iterator it = anExprParams.begin();
+  std::list<ResultParameterPtr> aParamsList;
   for ( ; it != anExprParams.end(); it++) {
     double aValue;
-    if (!ModelAPI_Tools::findVariable(*it, aValue)) continue;
+    ResultParameterPtr aParamRes;
+    if (!ModelAPI_Tools::findVariable(*it, aValue, aParamRes, document())) continue;
+    aParamsList.push_back(aParamRes);
 
     std::ostringstream sstream;
     sstream << aValue;
     std::string aParamValue = sstream.str();
     aContext.push_back(*it + "=" + aParamValue);
   }
+  // compare the list of parameters to store if changed
+  AttributeRefListPtr aParams = reflist(ARGUMENTS_ID());
+  bool aDifferent = aParams->size() != aParamsList.size();
+  if (!aDifferent) {
+    std::list<ResultParameterPtr>::iterator aNewIter = aParamsList.begin();
+    std::list<ObjectPtr> anOldList = aParams->list();
+    std::list<ObjectPtr>::iterator anOldIter = anOldList.begin();
+    for(; !aDifferent && aNewIter != aParamsList.end(); aNewIter++, anOldIter++) {
+      if (*aNewIter != *anOldIter)
+        aDifferent = true;
+    }
+  }
+  if (aDifferent) {
+    aParams->clear();
+    std::list<ResultParameterPtr>::iterator aNewIter = aParamsList.begin();
+    for(; aNewIter != aParamsList.end(); aNewIter++) {
+      aParams->append(*aNewIter);
+    }
+  }
+
   myInterp->extendLocalContext(aContext);
   double result = myInterp->evaluate(theExpression, theError);
   myInterp->clearLocalContext();
   return result;
 }
+
+bool ParametersPlugin_Parameter::isPreviewNeeded() const
+{
+  return false;
+}