Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make compilable on Linux
[modules/shaper.git]
/
src
/
Model
/
Model_FeatureValidator.cpp
diff --git
a/src/Model/Model_FeatureValidator.cpp
b/src/Model/Model_FeatureValidator.cpp
index b3b1b821687f13ebdadaed93bc9ed4772fde4f02..a809abe461a5d1653edcd6a4e8e5b3af2c817858 100644
(file)
--- a/
src/Model/Model_FeatureValidator.cpp
+++ b/
src/Model/Model_FeatureValidator.cpp
@@
-5,10
+5,12
@@
// Author: Vitaly SMETANNIKOV
#include <Model_FeatureValidator.h>
// Author: Vitaly SMETANNIKOV
#include <Model_FeatureValidator.h>
+#include <Model_Validator.h>
#include <ModelAPI_Attribute.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Object.h>
#include <ModelAPI_Attribute.h>
#include <ModelAPI_Data.h>
#include <ModelAPI_Feature.h>
#include <ModelAPI_Object.h>
+#include <ModelAPI_Session.h>
#include <list>
#include <memory>
#include <list>
#include <memory>
@@
-16,6
+18,9
@@
bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
const std::list<std::string>& theArguments) const
{
bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
const std::list<std::string>& theArguments) const
{
+ static Model_ValidatorsFactory* aValidators =
+ static_cast<Model_ValidatorsFactory*>(ModelAPI_Session::get()->validators());
+
std::shared_ptr<ModelAPI_Data> aData = theFeature->data();
// "Action" features has no data, but still valid. e.g "Remove Part"
if (!aData) {
std::shared_ptr<ModelAPI_Data> aData = theFeature->data();
// "Action" features has no data, but still valid. e.g "Remove Part"
if (!aData) {
@@
-28,6
+33,8
@@
bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& th
std::list<std::string>::iterator it = aLtAttributes.begin();
for (; it != aLtAttributes.end(); it++) {
AttributePtr anAttr = aData->attribute(*it);
std::list<std::string>::iterator it = aLtAttributes.begin();
for (; it != aLtAttributes.end(); it++) {
AttributePtr anAttr = aData->attribute(*it);
+ if (!aValidators->isCase(theFeature, anAttr->id()))
+ continue; // this attribute is not participated in the current case
if (!anAttr->isInitialized()) { // attribute is not initialized
std::map<std::string, std::set<std::string> >::const_iterator aFeatureFind =
myNotObligatory.find(theFeature->getKind());
if (!anAttr->isInitialized()) { // attribute is not initialized
std::map<std::string, std::set<std::string> >::const_iterator aFeatureFind =
myNotObligatory.find(theFeature->getKind());