{
data()->addAttribute(VARIABLE_ID(), ModelAPI_AttributeString::typeId());
data()->addAttribute(EXPRESSION_ID(), ModelAPI_AttributeString::typeId());
+
+ data()->addAttribute(COMMENT_ID(), ModelAPI_AttributeString::typeId());
+ ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), COMMENT_ID());
+
+ 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::attributeChanged(const std::string& theID)
{
- if (theID == EXPRESSION_ID()) { // recompute only on change of the expression
- ResultParameterPtr aParam = document()->createParameter(data());
-
- std::string anExpression = string(EXPRESSION_ID())->value();
- if(anExpression.empty()) {
- // clear error/result if the expression is empty
- setError("", false);
- return;
- }
- std::string outErrorMessage;
- double aValue = evaluate(anExpression, outErrorMessage);
- // Name
- std::string aName = string(VARIABLE_ID())->value();
- std::ostringstream sstream;
- sstream << aValue;
- std::string aParamValue = sstream.str();
- data()->setName(aName);
- aParam->data()->setName(aName);
- // Error
- if (!outErrorMessage.empty()) {
- std::string aStateMsg("Error: " + outErrorMessage);
- data()->execState(ModelAPI_StateExecFailed);
- 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);
- }
- // Value
- AttributeDoublePtr aValueAttribute = aParam->data()->real(ModelAPI_ResultParameter::VALUE());
- aValueAttribute->setValue(aValue);
- setResult(aParam);
- }
+ 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(EXPRESSION_ID())->value();
+
+ 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()
{
- // just call recompute
- attributeChanged(EXPRESSION_ID());
+ updateName();
+ if (!updateExpression())
+ setError("Expression error.", false);
}
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++) {
+ 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(*it, aValue, aParamRes)) continue;
+ 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);
+ size_t aPos = aParamValue.find(".");
+ std::string aPnt = "";
+ if (aPos == std::string::npos)
+ aPnt = ".";
+ aContext.push_back(*it + "=" + aParamValue + aPnt);
}
// compare the list of parameters to store if changed
AttributeRefListPtr aParams = reflist(ARGUMENTS_ID());
bool ParametersPlugin_Parameter::isPreviewNeeded() const
{
- return false;
+ return true;
}