X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModelAPI%2FModelAPI_Validator.h;h=cd73508d58ecb55d3b82e1590bacc6abe6b24a51;hb=f626fe578ad8bf82242d71b583e96f846e628596;hp=c1c5f37fbcc03cc44add704d8f26d3e263d42e80;hpb=cd9217d7e87997ec8bc150a6d8c389e742ca0f84;p=modules%2Fshaper.git diff --git a/src/ModelAPI/ModelAPI_Validator.h b/src/ModelAPI/ModelAPI_Validator.h index c1c5f37fb..cd73508d5 100644 --- a/src/ModelAPI/ModelAPI_Validator.h +++ b/src/ModelAPI/ModelAPI_Validator.h @@ -29,14 +29,6 @@ class MODELAPI_EXPORT ModelAPI_Validator virtual ~ModelAPI_Validator() { } - ; - - /// Returns true if feature and/or attributes are valid - /// \param theFeature the validated feature - /// \param theAttr the validated attribute ID, empty string of feature is validated - /// \param theArguments list of string, feature attribute names: dependent attributes - //virtual bool validate(const boost::shared_ptr& theFeature, - // const std::string theAttr, std::list theArguments) const = 0; }; typedef boost::shared_ptr ValidatorPtr; @@ -48,7 +40,7 @@ typedef boost::shared_ptr ValidatorPtr; * Allows to get a validator by the feature identifier and * the attribute identifier (if attribute is validated). * All accessible validators mustbe registered by the ID string first. - * The instance of this factory can be get in the PluginManager. + * The instance of this factory can be get in the Session. * Keeps the validator objects alive and just returns one of it by request. * All the needed information is provided to the validator as an argument, * this allows to work with them independently from the feature specific object. @@ -62,6 +54,11 @@ class MODELAPI_EXPORT ModelAPI_ValidatorsFactory /// Assigns validator to the feature virtual void assignValidator(const std::string& theID, const std::string& theFeatureID) = 0; + /// Assigns validator to the feature with arguments of the validator + virtual void assignValidator(const std::string& theID, + const std::string& theFeatureID, + const std::list& theArguments) = 0; + /// Assigns validator to the attribute of the feature virtual void assignValidator(const std::string& theID, const std::string& theFeatureID, const std::string& theAttrID, @@ -69,7 +66,8 @@ class MODELAPI_EXPORT ModelAPI_ValidatorsFactory /// Provides a validator for the feature, returns NULL if no validator virtual void validators(const std::string& theFeatureID, - std::list& theResult) const = 0; + std::list& theResult, + std::list >& theArguments) const = 0; /// Provides a validator for the attribute, returns NULL if no validator virtual void validators(const std::string& theFeatureID, const std::string& theAttrID, std::list& theValidators, @@ -78,13 +76,22 @@ class MODELAPI_EXPORT ModelAPI_ValidatorsFactory /// Returns registered validator by its Id virtual const ModelAPI_Validator* validator(const std::string& theID) const = 0; - /// Returns the result of "validate" method for attribute of validator. - /// If validator is not exists, returns true: everything is valid by default. - //virtual bool validate( - // const boost::shared_ptr& theFeature, const std::string& theAttrID) const = 0; + /// Returns true if feature and all its attributes are valid. + virtual bool validate(const boost::shared_ptr& theFeature) const = 0; + + /// 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) = 0; + + /// register that this attribute conceals in the object browser + /// all referenced features after execution + virtual void registerConcealment(std::string theFeature, std::string theAttribute) = 0; + + /// Returns true that it was registered that attribute conceals the referenced result + virtual bool isConcealed(std::string theFeature, std::string theAttribute) = 0; protected: - /// Get instance from PluginManager + /// Get instance from Session ModelAPI_ValidatorsFactory() { }