-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
+// Copyright (C) 2014-2020 CEA/DEN, EDF R&D
+//
+// This library is free software; you can redistribute it and/or
+// modify it under the terms of the GNU Lesser General Public
+// License as published by the Free Software Foundation; either
+// version 2.1 of the License, or (at your option) any later version.
+//
+// This library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public
+// License along with this library; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+//
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+//
-// File: Model_Validator.cpp
-// Created: 2 Jul 2014
-// Author: Mikhail PONIKAROV
+#include "Model_Validator.h"
+
+#include "Model_AttributeValidator.h"
+#include "Model_FeatureValidator.h"
-#include <Model_Validator.h>
-#include <Model_FeatureValidator.h>
-#include <ModelAPI_Feature.h>
#include <ModelAPI_Attribute.h>
-#include <ModelAPI_Data.h>
-#include <ModelAPI_AttributeValidator.h>
#include <ModelAPI_AttributeString.h>
-#include <Events_Error.h>
+#include <ModelAPI_AttributeValidator.h>
+#include <ModelAPI_Feature.h>
+#include <ModelAPI_Result.h>
+#include <Model_Data.h>
+
+#include <Config_Translator.h>
+
+#include <Events_InfoMessage.h>
void Model_ValidatorsFactory::registerValidator(const std::string& theID,
ModelAPI_Validator* theValidator)
{
if (myIDs.find(theID) != myIDs.end()) {
- Events_Error::send(std::string("Validator ") + theID + " is already registered");
+ Events_InfoMessage("Model_Validator", "Validator %1 is already registered").arg(theID).send();
} else {
myIDs[theID] = theValidator;
}
myFeatures[theFeatureID] = AttrValidators();
}
if (myFeatures[theFeatureID].find(theID) != myFeatures[theFeatureID].end()) {
- //Events_Error::send(std::string("Validator ") + theID +
+ //Events_Error::send(std::string("Validator ") + theID +
// " for feature " + theFeatureID + "is already registered");
} else {
myFeatures[theFeatureID][theID] = std::list<std::string>();
}
if (myFeatures[theFeatureID].find(theID) != myFeatures[theFeatureID].end()) {
- //Events_Error::send(std::string("Validator ") + theID +
+ //Events_Error::send(std::string("Validator ") + theID +
// " for feature " + theFeatureID + "is already registered");
} else {
myFeatures[theFeatureID][theID] = theArguments;
void Model_ValidatorsFactory::validators(const std::string& theFeatureID,
Validators& theValidators) const
{
- std::map<std::string, AttrValidators>::const_iterator aFeatureIt =
+ std::map<std::string, AttrValidators>::const_iterator aFeatureIt =
myFeatures.find(theFeatureID);
if (aFeatureIt != myFeatures.cend()) {
AttrValidators::const_iterator aValidatorsIt = aFeatureIt->second.cbegin();
for (; aValidatorsIt != aFeatureIt->second.cend(); aValidatorsIt++) {
if (!validator(aValidatorsIt->first)) {
- Events_Error::send(std::string("Validator ") + aValidatorsIt->first + " was not registered");
+ Events_InfoMessage("Model_Validator", "Validator %1 was not registered")
+ .arg(aValidatorsIt->first).send();
} else {
theValidators.push_back(std::make_pair(aValidatorsIt->first, aValidatorsIt->second));
}
addDefaultValidators(theValidators);
}
-void Model_ValidatorsFactory::validators(const std::string& theFeatureID, const std::string& theAttrID,
+void Model_ValidatorsFactory::validators(const std::string& theFeatureID,
+ const std::string& theAttrID,
Validators& theValidators) const
{
- std::map<std::string, std::map<std::string, AttrValidators> >::const_iterator aFeatureIt =
+ std::map<std::string, std::map<std::string, AttrValidators> >::const_iterator aFeatureIt =
myAttrs.find(theFeatureID);
if (aFeatureIt != myAttrs.cend()) {
- std::map<std::string, AttrValidators>::const_iterator anAttrIt = aFeatureIt->second.find(theAttrID);
+ std::map<std::string, AttrValidators>::const_iterator anAttrIt =
+ aFeatureIt->second.find(theAttrID);
if (anAttrIt != aFeatureIt->second.end()) {
AttrValidators::const_iterator aValidatorsIt = anAttrIt->second.cbegin();
for (; aValidatorsIt != anAttrIt->second.cend(); aValidatorsIt++) {
if (!validator(aValidatorsIt->first)) {
- Events_Error::send(std::string("Validator ") + aValidatorsIt->first + " was not registered");
+ Events_InfoMessage("Model_Validator", "Validator %1 was not registered")
+ .arg(aValidatorsIt->first).send();
} else {
theValidators.push_back(std::make_pair(aValidatorsIt->first, aValidatorsIt->second));
}
}
}
}
+ addDefaultAttributeValidators(theValidators);
}
Model_ValidatorsFactory::Model_ValidatorsFactory()
: ModelAPI_ValidatorsFactory()
{
- const static std::string kDefaultId = "Model_FeatureValidator";
- registerValidator(kDefaultId, new Model_FeatureValidator);
+ registerValidator("Model_FeatureValidator", new Model_FeatureValidator);
+ registerValidator("Model_AttributeValidator", new Model_AttributeValidator);
}
const ModelAPI_Validator* Model_ValidatorsFactory::validator(const std::string& theID) const
theValidators.push_back(std::make_pair(kDefaultId, std::list<std::string>()));
}
-bool Model_ValidatorsFactory::validate(const std::shared_ptr<ModelAPI_Feature>& theFeature) const
+void Model_ValidatorsFactory::addDefaultAttributeValidators(Validators& theValidators) const
{
- const static std::string kDefaultId = "Model_FeatureValidator";
+ const static std::string kDefaultId = "Model_AttributeValidator";
+ if (!validator(kDefaultId))
+ return;
+ theValidators.push_back(std::make_pair(kDefaultId, std::list<std::string>()));
+}
- ModelAPI_ExecState anExecState = theFeature->data()->execState();
- theFeature->setError("", false);
- theFeature->data()->execState(anExecState);
+bool Model_ValidatorsFactory::validate(const std::shared_ptr<ModelAPI_Feature>& theFeature) const
+{
+ std::shared_ptr<Model_Data> aData = std::dynamic_pointer_cast<Model_Data>(theFeature->data());
+ if (aData.get() && aData->isValid()) {
+ if (aData->execState() == ModelAPI_StateDone)
+ aData->eraseErrorString(); // no error => erase the information string
+ } else {
+ return false; // feature is broken, already not presented in the data structure
+ }
// check feature validators first
Validators aValidators;
for(; aValidatorIt != aValidators.cend(); aValidatorIt++) {
const std::string& aValidatorID = aValidatorIt->first;
const std::list<std::string>& anArguments = aValidatorIt->second;
- // validators() checks invalid validator names
- //if (!aValidator) {
- // Events_Error::send(std::string("Validator ") + aValidatorID + " was not registered");
- // continue;
- //}
- const ModelAPI_FeatureValidator* aFValidator =
+ const ModelAPI_FeatureValidator* aFValidator =
dynamic_cast<const ModelAPI_FeatureValidator*>(validator(aValidatorID));
if (aFValidator) {
- std::string anError;
+ Events_InfoMessage anError;
if (!aFValidator->isValid(theFeature, anArguments, anError)) {
if (anError.empty())
anError = "Unknown error.";
- anError = "Feature invalidated by \"" + aValidatorID + "\" with error: " + anError;
- theFeature->setError(anError, false);
+ if (anError.context().empty()) {
+ anError.setContext(theFeature->getKind() + ":" + aValidatorID);
+ }
+ theFeature->setError(Config_Translator::translate(anError), false, false);
theFeature->data()->execState(ModelAPI_StateInvalidArgument);
return false;
}
}
}
}
- // The default validator was retrned by validators() and was checked in previous cycle
- //// check default validator
- //std::map<std::string, ModelAPI_Validator*>::const_iterator aDefaultVal = myIDs.find(kDefaultId);
- //if(aDefaultVal != myIDs.end()) {
- // static const std::list<std::string> anEmptyArgList;
- // const ModelAPI_FeatureValidator* aFValidator =
- // dynamic_cast<const ModelAPI_FeatureValidator*>(aDefaultVal->second);
- // if (aFValidator) {
- // std::string anError;
- // if (!aFValidator->isValid(theFeature, anEmptyArgList, anError)) {
- // if (anError.empty())
- // anError = "Unknown error.";
- // anError = "Feature invalidated by \"" + kDefaultId + "\" with error: " + anError;
- // theFeature->setError(anError, false);
- // theFeature->data()->execState(ModelAPI_StateInvalidArgument);
- // return false;
- // }
- // }
- //}
-
+
// check all attributes for validity
- std::shared_ptr<ModelAPI_Data> aData = theFeature->data();
- // Validity of data is checked by "Model_FeatureValidator" (kDefaultId)
- // if (!aData || !aData->isValid())
- // return false;
static const std::string kAllTypes = "";
std::list<std::string> aLtAttributes = aData->attributesIDs(kAllTypes);
std::list<std::string>::const_iterator anAttrIt = aLtAttributes.cbegin();
for (; anAttrIt != aLtAttributes.cend(); anAttrIt++) {
- const std::string& anAttributeID = *anAttrIt;
+ const std::string& anAttributeID = *anAttrIt;
AttributePtr anAttribute = theFeature->data()->attribute(anAttributeID);
std::string aValidatorID;
- std::string anError;
+ Events_InfoMessage anError;
if (!validate(anAttribute, aValidatorID, anError)) {
if (anError.empty())
anError = "Unknown error.";
- anError = "Attribute \"" + anAttributeID + "\" invalidated by \"" + aValidatorID + "\" with error: " + anError;
- theFeature->setError(anError, false);
+ if (anError.context().empty()) {
+ anError.setContext(theFeature->getKind() + ":" + anAttributeID + ":" + aValidatorID);
+ }
+ theFeature->setError(Config_Translator::translate(anError), false, false);
theFeature->data()->execState(ModelAPI_StateInvalidArgument);
return false;
- }
+ }
}
return true;
bool Model_ValidatorsFactory::validate(const std::shared_ptr<ModelAPI_Attribute>& theAttribute,
std::string& theValidator,
- std::string& theError) const
+ Events_InfoMessage& theError) const
{
FeaturePtr aFeature = ModelAPI_Feature::feature(theAttribute->owner());
if (!aFeature.get()) {
if (!anAttrValidator->isValid(theAttribute, anArguments, theError)) {
theValidator = aValidatorID;
return false;
- }
+ }
}
return true;
}
-void Model_ValidatorsFactory::registerNotObligatory(std::string theFeature, std::string theAttribute)
+void Model_ValidatorsFactory::registerNotObligatory(std::string theFeature,
+ std::string theAttribute)
{
const static std::string kDefaultId = "Model_FeatureValidator";
std::map<std::string, ModelAPI_Validator*>::const_iterator it = myIDs.find(kDefaultId);
}
void Model_ValidatorsFactory::registerCase(std::string theFeature, std::string theAttribute,
- std::string theSwitchId, std::string theCaseId)
+ const std::list<std::pair<std::string, std::string> >& theCases)
{
- std::map<std::string, std::map<std::string, std::pair<std::string, std::string> > >::iterator
- aFindFeature = myCases.find(theFeature);
+ std::map<std::string, std::map<std::string, std::map<std::string, std::set<std::string> > > >
+ ::iterator aFindFeature = myCases.find(theFeature);
if (aFindFeature == myCases.end()) {
- myCases[theFeature] = std::map<std::string, std::pair<std::string, std::string> >();
+ myCases[theFeature] = std::map<std::string, std::map<std::string, std::set<std::string> > >();
aFindFeature = myCases.find(theFeature);
}
- (aFindFeature->second)[theAttribute] = std::pair<std::string, std::string>(theSwitchId, theCaseId);
+ std::map<std::string, std::map<std::string, std::set<std::string> > >::iterator aFindAttrID =
+ aFindFeature->second.find(theAttribute);
+
+ if (aFindAttrID == aFindFeature->second.end()) {
+ aFindFeature->second[theAttribute] =
+ std::map<std::string, std::set<std::string> >();
+ aFindAttrID = aFindFeature->second.find(theAttribute);
+ }
+ std::list<std::pair<std::string, std::string> >::const_iterator aCasesIt = theCases.begin(),
+ aCasesLast = theCases.end();
+ std::map<std::string, std::set<std::string> > aFindCases = aFindAttrID->second;
+ for (; aCasesIt != aCasesLast; aCasesIt++) {
+ std::pair<std::string, std::string> aCasePair = *aCasesIt;
+ std::string aSwitch = aCasePair.first;
+ if (aFindAttrID->second.find(aSwitch) == aFindAttrID->second.end()) {
+ aFindAttrID->second[aSwitch] = std::set<std::string>();
+ }
+ aFindAttrID->second[aSwitch].insert(aCasePair.second);
+ }
}
-bool Model_ValidatorsFactory::isCase(
- FeaturePtr theFeature, std::string theAttribute)
+bool Model_ValidatorsFactory::isCase(FeaturePtr theFeature, std::string theAttribute)
{
- std::map<std::string, std::map<std::string, std::pair<std::string, std::string> > >::iterator
- aFindFeature = myCases.find(theFeature->getKind());
+ bool anInCase = true;
+ std::map<std::string, std::map<std::string, std::map<std::string, std::set<std::string> > > >
+ ::iterator aFindFeature = myCases.find(theFeature->getKind());
if (aFindFeature != myCases.end()) {
- std::map<std::string, std::pair<std::string, std::string> >::iterator
- aFindAttr = aFindFeature->second.find(theAttribute);
- if (aFindAttr != aFindFeature->second.end()) {
- // the the switch-attribute that contains the case value
- AttributeStringPtr aSwitch = theFeature->string(aFindAttr->second.first);
- if (aSwitch.get()) {
- return aSwitch->value() == aFindAttr->second.second; // the second is the case identifier
+ std::map<std::string, std::map<std::string, std::set<std::string> > >::iterator
+ aFindAttrID = aFindFeature->second.find(theAttribute);
+ if (aFindAttrID != aFindFeature->second.end()) {
+ std::map<std::string, std::set<std::string> >::iterator
+ aCasesIt = aFindAttrID->second.begin(), aCasesLast = aFindAttrID->second.end();
+ for (; aCasesIt != aCasesLast && anInCase; aCasesIt++) {
+ // the the switch-attribute that contains the case value
+ AttributeStringPtr aSwitch = theFeature->string(aCasesIt->first);
+ if (aSwitch.get()) {
+ // the second has the case identifier
+ anInCase = aCasesIt->second.find(aSwitch->value()) != aCasesIt->second.end();
+ }
}
}
}
- return true; // if no additional conditions, this attribute is the case to be validated
+ return anInCase; // if no additional conditions, this attribute is the case to be validated
+}
+
+void Model_ValidatorsFactory::registerMainArgument(std::string theFeature,
+ std::string theAttribute)
+{
+ std::map<std::string, std::string>::iterator aFound = myMainArgument.find(theFeature);
+ if (aFound == myMainArgument.end())
+ myMainArgument[theFeature] = theAttribute;
+}
+
+bool Model_ValidatorsFactory::isMainArgument(std::string theFeature, std::string theAttribute)
+{
+ std::map<std::string, std::string>::iterator aFound = myMainArgument.find(theFeature);
+ return aFound != myMainArgument.end() && aFound->second == theAttribute;
+}
+
+void Model_ValidatorsFactory::registerGeometricalSelection(std::string theFeature,
+ std::string theAttribute)
+{
+ std::map<std::string, std::set<std::string> >::iterator aFind =
+ myGeometricalSelection.find(theFeature);
+ if (aFind == myGeometricalSelection.end()) {
+ std::set<std::string> aNewSet;
+ aNewSet.insert(theAttribute);
+ myGeometricalSelection[theFeature] = aNewSet;
+ }
+ else {
+ aFind->second.insert(theAttribute);
+ }
+}
+
+bool Model_ValidatorsFactory::isGeometricalSelection(std::string theFeature,
+ std::string theAttribute)
+{
+ std::map<std::string, std::set<std::string> >::iterator aFind =
+ myGeometricalSelection.find(theFeature);
+ return aFind != myGeometricalSelection.end()
+ && aFind->second.find(theAttribute) != aFind->second.end();
}
