X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_Validator.h;h=7dcf2ff98c2470ec64311439b3ab4d3a0f9cf5df;hb=e91e5875dfa825c2a382737b2fd2e7e4cb4e2acd;hp=b3324c45862a0703a711823bd145063cbb681c92;hpb=83e925a876b26a470e513b0a229258b145c82bc8;p=modules%2Fshaper.git diff --git a/src/Model/Model_Validator.h b/src/Model/Model_Validator.h index b3324c458..7dcf2ff98 100644 --- a/src/Model/Model_Validator.h +++ b/src/Model/Model_Validator.h @@ -1,15 +1,28 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: Model_Validator.hxx -// Created: 2 Jul 2014 -// Author: Mikhail PONIKAROV +// Copyright (C) 2014-2017 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 +// #ifndef Model_Validator_H_ #define Model_Validator_H_ #include #include -#include #include #include @@ -35,13 +48,17 @@ class Model_ValidatorsFactory : public ModelAPI_ValidatorsFactory std::map myFeatures; /// validators IDs and arguments by feature and attribute IDs std::map > myAttrs; - /// Stores the registered attributes that leads to the concealment of referenced objects in + /// Stores the registered attributes that leads to the concealment of referenced objects in /// data tree. Map from feature kind to set of attribute IDs. std::map > myConcealed; /// Stores the registered attributes must be checked only if the particular case is activated - /// Map from feature kind to map of attribute IDs to pair - // (switchId (ID of the attribute) and case Id (possible values of the switch attribute)) - std::map > > myCases; + /// Map from feature kind to map of attribute IDs to pair + // (switchId (ID of the attribute) and case Ids (possible values of the switch attribute)) + std::map > > > myCases; + /// Stores main attribute for each feature + std::map myMainArgument; + std::map > myGeometricalSelection; public: /// Registers the instance of the validator by the ID @@ -65,13 +82,10 @@ class Model_ValidatorsFactory : public ModelAPI_ValidatorsFactory /// Provides a validator for the feature, returns NULL if no validator MODEL_EXPORT virtual void validators(const std::string& theFeatureID, - std::list& theResult, - std::list >& theArguments) const; + Validators& theResult) const; /// Provides a validator for the attribute, returns NULL if no validator MODEL_EXPORT virtual void validators(const std::string& theFeatureID, - const std::string& theAttrID, - std::list& theValidators, - std::list >& theArguments) const; + const std::string& theAttrID, Validators& theResult) const; /// Returns registered validator by its Id MODEL_EXPORT virtual const ModelAPI_Validator* validator(const std::string& theID) const; @@ -79,6 +93,10 @@ class Model_ValidatorsFactory : public ModelAPI_ValidatorsFactory /// Returns true if feature and all its attributes are valid. MODEL_EXPORT virtual bool validate(const std::shared_ptr& theFeature) const; + /// Returns true if the attribute is valid. + MODEL_EXPORT virtual bool validate(const std::shared_ptr& theAttribute, + std::string& theValidator, Events_InfoMessage& theError) const; + /// register that this attribute in feature is not obligatory for the feature execution /// so, it is not needed for the standard validation mechanism virtual void registerNotObligatory(std::string theFeature, std::string theAttribute); @@ -95,16 +113,29 @@ class Model_ValidatorsFactory : public ModelAPI_ValidatorsFactory /// register the case-attribute (\a myCases set definition) virtual void registerCase(std::string theFeature, std::string theAttribute, - std::string theSwitchId, std::string theCaseId); + const std::list >& theCases); /// Returns true if the attribute must be checked (the case is selected) virtual bool isCase(FeaturePtr theFeature, std::string theAttribute); + /// Register the attribute as a main argument of the feature + virtual void registerMainArgument(std::string theFeature, std::string theAttribute); + + /// Returns true is the attribute is a main argument of the feature + virtual bool isMainArgument(std::string theFeature, std::string theAttribute); + + /// Register the selection attribute as geometrical selection + virtual void registerGeometricalSelection(std::string theFeature, std::string theAttribute); + + /// Returns true if the attribute is a geometrical selection + virtual bool isGeometricalSelection(std::string theFeature, std::string theAttribute); + protected: /// Adds the defualt validators that are usefull for all features. - void addDefaultValidators(std::list& theValidators, - std::list >& theArguments) const; + void addDefaultValidators(Validators& theValidators) const; + /// Adds the defualt validators that are usefull for all attributes. + void addDefaultAttributeValidators(Validators& theValidators) const; /// Get instance from Session Model_ValidatorsFactory();