{
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());
}
{
if (theID == EXPRESSION_ID())
updateExpression();
+
+ data()->execState(ModelAPI_StateMustBeUpdated);
}
void ParametersPlugin_Parameter::updateName()
setResult(aParam);
}
-void ParametersPlugin_Parameter::updateExpression()
+bool ParametersPlugin_Parameter::updateExpression()
{
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);
- std::ostringstream sstream;
- sstream << aValue;
- std::string aParamValue = sstream.str();
- // 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);
- }
+
+ 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();
- updateExpression();
+ if (!updateExpression())
+ setError("Expression error.", false);
}
double ParametersPlugin_Parameter::evaluate(const std::string& theExpression, std::string& theError)
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;