#include <ParametersPlugin_Validators.h>
+#include <ParametersPlugin_Parameter.h>
+
#include <ModelAPI_AttributeString.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_ResultParameter.h>
std::string& theError) const
{
AttributeStringPtr aStrAttr = std::dynamic_pointer_cast<ModelAPI_AttributeString>(theAttribute);
+ if (!aStrAttr->isInitialized()) {
+ theError = "Attribute \"" + aStrAttr->id() + "\" is not initialized.";
+ return false;
+ }
+ bool isEmptyExpr = aStrAttr->value().empty();
+ if (isEmptyExpr) {
+ theError = "Attribute \"" + aStrAttr->id() + "\" value is empty.";
+ return false;
+ }
if (!isVariable(aStrAttr->value())) {
theError = "Incorrect variable name.";
return false;
return true;
}
-bool ParametersPlugin_VariableValidator::isUnique(const AttributePtr& theAttribute,
+bool ParametersPlugin_VariableValidator::isUnique(const AttributePtr& theAttribute,
const std::string& theString) const
{
DocumentPtr aDocument = theAttribute->owner()->document();
AttributeStringPtr aStrAttr =
std::dynamic_pointer_cast<ModelAPI_AttributeString>(theAttribute);
+ if (!aStrAttr->isInitialized()) {
+ theError = "Attribute \"" + aStrAttr->id() + "\" is not initialized.";
+ return false;
+ }
bool isEmptyExpr = aStrAttr->value().empty();
- if(isEmptyExpr) {
+ if (isEmptyExpr) {
theError = "Expression is empty.";
return false;
}
- if(!aParam.get()) {
+ if (!aParam.get()) {
theError = "Result is empty.";
return false;
}
- theError = aFeature->error();
- return aFeature->error().empty();
+ theError = aFeature->string(ParametersPlugin_Parameter::EXPRESSION_ERROR_ID())->value();
+ return theError.empty();
}