X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Validator.cpp;h=3059ea572df8226c088604be4a3cad0d1350a518;hb=bdfef16c6cd1f7cb83c1a1117e3e3d76b7063c26;hp=d34681a13a2c5c9e4a7115d8c72ab9d5478ad282;hpb=fa16bd63a969591127eea4d3959ca738d56d2e0f;p=modules%2Fshaper.git diff --git a/src/Model/Model_Validator.cpp b/src/Model/Model_Validator.cpp index d34681a13..3059ea572 100644 --- a/src/Model/Model_Validator.cpp +++ b/src/Model/Model_Validator.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: Model_Validator.cpp -// Created: 2 Jul 2014 -// Author: Mikhail PONIKAROV +// Copyright (C) 2014-2019 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 +// #include "Model_Validator.h" @@ -16,6 +29,8 @@ #include #include +#include + #include void Model_ValidatorsFactory::registerValidator(const std::string& theID, @@ -172,11 +187,6 @@ bool Model_ValidatorsFactory::validate(const std::shared_ptr& for(; aValidatorIt != aValidators.cend(); aValidatorIt++) { const std::string& aValidatorID = aValidatorIt->first; const std::list& 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 = dynamic_cast(validator(aValidatorID)); if (aFValidator) { @@ -184,38 +194,18 @@ bool Model_ValidatorsFactory::validate(const std::shared_ptr& if (!aFValidator->isValid(theFeature, anArguments, anError)) { if (anError.empty()) anError = "Unknown error."; - anError = aValidatorID + ": " + anError.messageString(); - theFeature->setError(anError.messageString(), 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::const_iterator aDefaultVal = myIDs.find(kDefaultId); - //if(aDefaultVal != myIDs.end()) { - // static const std::list anEmptyArgList; - // const ModelAPI_FeatureValidator* aFValidator = - // dynamic_cast(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 - // Validity of data is checked by "Model_FeatureValidator" (kDefaultId) - // if (!aData || !aData->isValid()) - // return false; static const std::string kAllTypes = ""; std::list aLtAttributes = aData->attributesIDs(kAllTypes); std::list::const_iterator anAttrIt = aLtAttributes.cbegin(); @@ -228,8 +218,10 @@ bool Model_ValidatorsFactory::validate(const std::shared_ptr& if (!validate(anAttribute, aValidatorID, anError)) { if (anError.empty()) anError = "Unknown error."; - anError = anAttributeID + " - " + aValidatorID + ": " + anError.messageString(); - theFeature->setError(anError.messageString(), 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; } @@ -370,3 +362,41 @@ bool Model_ValidatorsFactory::isCase(FeaturePtr theFeature, std::string theAttri } 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::iterator aFound = myMainArgument.find(theFeature); + if (aFound == myMainArgument.end()) + myMainArgument[theFeature] = theAttribute; +} + +bool Model_ValidatorsFactory::isMainArgument(std::string theFeature, std::string theAttribute) +{ + std::map::iterator aFound = myMainArgument.find(theFeature); + return aFound != myMainArgument.end() && aFound->second == theAttribute; +} + +void Model_ValidatorsFactory::registerGeometricalSelection(std::string theFeature, + std::string theAttribute) +{ + std::map >::iterator aFind = + myGeometricalSelection.find(theFeature); + if (aFind == myGeometricalSelection.end()) { + std::set aNewSet; + aNewSet.insert(theAttribute); + myGeometricalSelection[theFeature] = aNewSet; + } + else { + aFind->second.insert(theAttribute); + } +} + +bool Model_ValidatorsFactory::isGeometricalSelection(std::string theFeature, + std::string theAttribute) +{ + std::map >::iterator aFind = + myGeometricalSelection.find(theFeature); + return aFind != myGeometricalSelection.end() + && aFind->second.find(theAttribute) != aFind->second.end(); +}