X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParametersPlugin%2FParametersPlugin_Parameter.cpp;h=54dc39581185a6892ddb35ce04310de7b19e044e;hb=42dfdea5422ab72d81c36155b4c6f352c85c1110;hp=b32afe718bb75b96d6e1e0997ad63f417d415b93;hpb=7775c24bea17646e17dd9370befe98b8336de9d8;p=modules%2Fshaper.git

diff --git a/src/ParametersPlugin/ParametersPlugin_Parameter.cpp b/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
index b32afe718..54dc39581 100644
--- a/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
+++ b/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
@@ -4,34 +4,39 @@
 // 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>
 
 ParametersPlugin_Parameter::ParametersPlugin_Parameter()
 {
-  myInterp = new ParametersPlugin_PyInterp();
+  myInterp = std::shared_ptr<ParametersPlugin_PyInterp>(new ParametersPlugin_PyInterp());
   myInterp->initialize();
 }
 
 ParametersPlugin_Parameter::~ParametersPlugin_Parameter()
 {
-  myInterp->destroy();
-  delete myInterp;
 }
 
 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()
@@ -39,41 +44,56 @@ bool ParametersPlugin_Parameter::isInHistory()
   return false;
 }
 
-void ParametersPlugin_Parameter::execute()
+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
-    aParam->data()->string(ModelAPI_ResultParameter::STATE())->setValue("");
+    setError("", false);
     return;
   }
-  // Value
   std::string outErrorMessage;
   double aValue = evaluate(anExpression, outErrorMessage);
-  AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
-  aValueAttribute->setValue(aValue);
-  setResult(aParam);
-  // Name
-  std::string aName = string(ParametersPlugin_Parameter::VARIABLE_ID())->value();
   std::ostringstream sstream;
   sstream << aValue;
   std::string aParamValue = sstream.str();
-  data()->setName(aName + " ("+ aParamValue + ")");
-  aParam->data()->setName(aName);
   // Error
-  AttributeStringPtr aErrorAttr = aParam->data()->string(ModelAPI_ResultParameter::STATE());
-  std::string aStateMsg;
-  if (outErrorMessage.empty()) {
-    aStateMsg = "Result: " + aParamValue;
+  if (!outErrorMessage.empty()) {
+    std::string aStateMsg("Error: " + outErrorMessage);
+    data()->execState(ModelAPI_StateExecFailed);
+    setError(aStateMsg, false);
   } else {
-    aStateMsg = "Error:\n" + outErrorMessage;
+    static const std::string anEmptyMsg(""); // it is checked in the validator by the empty message
+    setError(anEmptyMsg, false);
+    data()->execState(ModelAPI_StateDone);
   }
-  aErrorAttr->setValue(aStateMsg);
-  //if(!outErrorMessage.empty()) {
-  //  data()->execState(ModelAPI_StateExecFailed);
-  //}
+
+  ResultParameterPtr aParam = document()->createParameter(data());
+  AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
+  aValueAttribute->setValue(aValue);
+  setResult(aParam);
+}
+
+void ParametersPlugin_Parameter::execute()
+{
+  updateName();
+  updateExpression();
 }
 
 double ParametersPlugin_Parameter::evaluate(const std::string& theExpression, std::string& theError)
@@ -82,17 +102,45 @@ double ParametersPlugin_Parameter::evaluate(const std::string& theExpression, st
   // 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++) {
-    std::string aParamName = *it;
-    ObjectPtr aParamObj = document()->objectByName(ModelAPI_ResultParameter::group(), aParamName);
-    ResultParameterPtr aParam = std::dynamic_pointer_cast<ModelAPI_ResultParameter>(aParamObj);
-    if(!aParam.get()) continue;
-    AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
+    double aValue;
+    ResultParameterPtr aParamRes;
+    if (!ModelAPI_Tools::findVariable(*it, aValue, aParamRes, document())) continue;
+    aParamsList.push_back(aParamRes);
+
     std::ostringstream sstream;
-    sstream << aValueAttribute->value();
+    sstream << aValue;
     std::string aParamValue = sstream.str();
-    aContext.push_back(aParamName + "=" + aParamValue);
+    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);
-  return myInterp->evaluate(theExpression, theError);
+  double result = myInterp->evaluate(theExpression, theError);
+  myInterp->clearLocalContext();
+  return result;
+}
+
+bool ParametersPlugin_Parameter::isPreviewNeeded() const
+{
+  return false;
 }