X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2FModel%2FModel_FeatureValidator.cpp;h=303a465676c90fe08fc484e5a8689856d86db470;hb=530f5aff42069e844c4a4ef164088ea23ba0e2dd;hp=8cec7f4b7849ef1cf6edccede77472c3a3b9c03a;hpb=b2ab6b5d1fb5d1da1e04d68298605660cf5cce24;p=modules%2Fshaper.git diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp index 8cec7f4b7..303a46567 100644 --- a/src/Model/Model_FeatureValidator.cpp +++ b/src/Model/Model_FeatureValidator.cpp @@ -16,7 +16,8 @@ #include bool Model_FeatureValidator::isValid(const std::shared_ptr& theFeature, - const std::list& theArguments) const + const std::list& theArguments, + std::string& theError) const { static Model_ValidatorsFactory* aValidators = static_cast(ModelAPI_Session::get()->validators()); @@ -24,10 +25,10 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr& th std::shared_ptr aData = theFeature->data(); // "Action" features has no data, but still valid. e.g "Remove Part" if (!aData->isValid()) { + if (!theFeature->isAction()) + theError = "There is no data."; return theFeature->isAction(); } - if (!aData->isValid()) - return false; const std::string kAllTypes = ""; std::list aLtAttributes = aData->attributesIDs(kAllTypes); std::list::iterator it = aLtAttributes.begin(); @@ -40,6 +41,7 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr& th myNotObligatory.find(theFeature->getKind()); if (aFeatureFind == myNotObligatory.end() || // and it is obligatory for filling aFeatureFind->second.find(*it) == aFeatureFind->second.end()) { + theError = "Attribute \"" + anAttr->id() + "\" is not initialized."; return false; } }