/// 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<std::string, std::set<std::string> > myConcealed;
+ /// Stored the unconcealed results and features that caused the canceled concealment (Recover).
+ /// If the feature is empty, unconcealment is persistent.
+ std::map<std::shared_ptr<ModelAPI_Result>, std::list<std::shared_ptr<ModelAPI_Feature> > >
+ myUnconcealed;
/// 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 Ids (possible values of the switch attribute))
std::map<std::string, std::map<std::string,
- std::pair<std::string, std::set<std::string> > > > myCases;
+ std::map<std::string, std::set<std::string> > > > myCases;
public:
/// Registers the instance of the validator by the ID
MODEL_EXPORT virtual void validators(const std::string& theFeatureID,
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,
- Validators& theResult) const;
+ MODEL_EXPORT virtual void validators(const std::string& theFeatureID,
+ 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;
/// Returns true if the attribute is valid.
MODEL_EXPORT virtual bool validate(const std::shared_ptr<ModelAPI_Attribute>& theAttribute,
- std::string& theValidator, std::string& theError) const;
+ 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
/// Returns true that it was registered that attribute conceals the referenced result
virtual bool isConcealed(std::string theFeature, std::string theAttribute);
+ /// Registers (by Recover feature) cancel of concealment of specific result by specific feature.
+ /// If theCanceledFeat is empty, the concealment is canceled for this result forever.
+ virtual void registerUnconcealment(std::shared_ptr<ModelAPI_Result> theUnconcealed,
+ std::shared_ptr<ModelAPI_Feature> theCanceledFeat);
+
+ /// Disables cancel of concealment of specific result by specific feature.
+ virtual void disableUnconcealment(std::shared_ptr<ModelAPI_Result> theUnconcealed,
+ std::shared_ptr<ModelAPI_Feature> theCanceledFeat);
+
+ /// Returns true if concealment is canceled.
+ virtual bool isUnconcealed(std::shared_ptr<ModelAPI_Result> theUnconcealed,
+ std::shared_ptr<ModelAPI_Feature> theCanceledFeat);
+
/// 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<std::pair<std::string, std::string> >& theCases);
/// Returns true if the attribute must be checked (the case is selected)
virtual bool isCase(FeaturePtr theFeature, std::string theAttribute);
