From 7e763f660f2c2ea37bc415448cc17c67494fb92c Mon Sep 17 00:00:00 2001 From: nds Date: Wed, 20 Jan 2016 16:36:12 +0300 Subject: [PATCH] Issue #1223 Conflicting constraints not raised: correction of error text over Apply If the feature is Composite and error is StateInvalidArgument, error text should include error of first invalid sub-feature. --- src/ModelAPI/ModelAPI_Tools.cpp | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/src/ModelAPI/ModelAPI_Tools.cpp b/src/ModelAPI/ModelAPI_Tools.cpp index 1b618562d..20df8a89d 100755 --- a/src/ModelAPI/ModelAPI_Tools.cpp +++ b/src/ModelAPI/ModelAPI_Tools.cpp @@ -52,8 +52,26 @@ std::string getFeatureError(const FeaturePtr& theFeature) if (anError.empty()) { bool isDone = ( theFeature->data()->execState() == ModelAPI_StateDone || theFeature->data()->execState() == ModelAPI_StateMustBeUpdated ); - if (!isDone) + if (!isDone) { anError = toString(theFeature->data()->execState()); + // If the feature is Composite and error is StateInvalidArgument, + // error text should include error of first invalid sub-feature. Otherwise + // it is not clear what is the reason of the invalid argument. + if (theFeature->data()->execState() == ModelAPI_StateInvalidArgument) { + CompositeFeaturePtr aComposite = + std::dynamic_pointer_cast(theFeature); + if (aComposite) { + for (int i = 0, aSize = aComposite->numberOfSubs(); i < aSize; i++) { + FeaturePtr aSubFeature = aComposite->subFeature(i); + std::string aSubFeatureError = getFeatureError(aSubFeature); + if (!aSubFeatureError.empty()) { + anError = anError + " in " + aSubFeature->getKind() + ".\n" + aSubFeatureError; + break; + } + } + } + } + } } return anError; -- 2.39.2