X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FParametersPlugin%2FParametersPlugin_Parameter.cpp;h=803ea9e43983c4b7403c967b18120636cb6bb364;hb=5a4405dc843479d921b53b83c181cbe9359414fe;hp=745d0c7651c185f9a5170549da7cf454c0ec9455;hpb=b2418a13c302e03ed5f80dbdae0cd20f0abd16af;p=modules%2Fshaper.git

diff --git a/src/ParametersPlugin/ParametersPlugin_Parameter.cpp b/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
index 745d0c765..803ea9e43 100644
--- a/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
+++ b/src/ParametersPlugin/ParametersPlugin_Parameter.cpp
@@ -4,54 +4,151 @@
 // 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()
 {
-  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(EXPRESSION_ERROR_ID(), ModelAPI_AttributeString::typeId());
+  data()->string(EXPRESSION_ERROR_ID())->setIsArgument(false);
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), EXPRESSION_ERROR_ID());
+
+  data()->addAttribute(ARGUMENTS_ID(), ModelAPI_AttributeRefList::typeId());
+  data()->reflist(ARGUMENTS_ID())->setIsArgument(false);
+  ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), ARGUMENTS_ID());
 }
 
-void ParametersPlugin_Parameter::execute()
+bool ParametersPlugin_Parameter::isInHistory()
+{
+  return false;
+}
+
+void ParametersPlugin_Parameter::attributeChanged(const std::string& theID)
+{
+  if (theID == EXPRESSION_ID())
+    updateExpression();
+
+  data()->execState(ModelAPI_StateMustBeUpdated);
+}
+
+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);
+}
+
+bool ParametersPlugin_Parameter::updateExpression()
 {
-  std::string anExpression = string(ParametersPlugin_Parameter::EXPRESSION_ID())->value();
-  if(anExpression.empty())
-    return;
-  ResultParameterPtr aParameterResult = document()->createParameter(data());
-  //AttributeDoublePtr anAttr = aParameterResult->data()->real(ModelAPI_ResultParameter::VALUE());
+  std::string anExpression = string(EXPRESSION_ID())->value();
 
-  double aValue = evaluate(anExpression);
-  //anAttr->setValue(aValue);
-  setResult(aParameterResult);
+  std::string outErrorMessage;
+  double aValue = evaluate(anExpression, outErrorMessage);
 
+  data()->string(EXPRESSION_ERROR_ID())->setValue(outErrorMessage);
+  if (!outErrorMessage.empty())
+    return false;
+
+  ResultParameterPtr aParam = document()->createParameter(data());
+  AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
+  aValueAttribute->setValue(aValue);
+  setResult(aParam);
+  return true;
+}
+
+void ParametersPlugin_Parameter::execute()
+{
+  updateName();
+  if (!updateExpression())
+    setError("Expression error.", false);
 }
 
-double ParametersPlugin_Parameter::evaluate(std::string theExpression)
+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
-  // todo
-  // myInterp->extendLocalContext();
-  std::string outError;
-  return myInterp->evaluate(theExpression, outError);
+  std::list<std::string> aContext;
+  std::list<std::string>::iterator it = anExprParams.begin();
+  std::list<ResultParameterPtr> aParamsList;
+  for ( ; it != anExprParams.end(); it++) {
+    std::string& aVariableName = *it;
 
+    // Parameter with the same name should be searched in the parent document.
+    // For the PartSet assume that the parameter is absent.
+    // Currently there is no way to get parent document, so we get PartSet for all.
+    DocumentPtr aDocument = document();
+    if (data()->name() == aVariableName) {
+      if (aDocument == ModelAPI_Session::get()->moduleDocument())
+        continue;
+      aDocument = ModelAPI_Session::get()->moduleDocument();
+    }
+
+    double aValue;
+    ResultParameterPtr aParamRes;
+    if (!ModelAPI_Tools::findVariable(aVariableName, aValue, aParamRes, aDocument)) 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;
 }