[bos #26505] EDF 24182 - picking elipse from sketch

[modules/shaper.git] / src / Model / Model_FeatureValidator.cpp

diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp
index eab3761b1afae4cef4db4961a51dabcb45d103bf..7e83c5cf1ade19145a9231554e8b8e4afa9fe14c 100644 (file)
--- a/src/Model/Model_FeatureValidator.cpp
+++ b/src/Model/Model_FeatureValidator.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_FeatureValidator.cpp
-// Created:     8 Jul 2014
-// Author:      Vitaly SMETANNIKOV
+// Copyright (C) 2014-2021  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
+//
 
 #include <Model_FeatureValidator.h>
 
@@ -12,6 +25,7 @@
 #include <ModelAPI_Attribute.h>
 #include <ModelAPI_Data.h>
 #include <ModelAPI_Feature.h>
+#include <ModelAPI_FiltersFeature.h>
 #include <ModelAPI_Object.h>
 #include <ModelAPI_Session.h>
 
@@ -19,7 +33,7 @@
 #include <memory>
 
 bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& theFeature,
-                                     const std::list<std::string>& theArguments,
+                                     const std::list<std::string>& /*theArguments*/,
                                      Events_InfoMessage& theError) const
 {
   static Model_ValidatorsFactory* aValidators =
@@ -44,9 +58,13 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr<ModelAPI_Feature>& th
         myNotObligatory.find(theFeature->getKind());
       if (aFeatureFind == myNotObligatory.end() || // and it is obligatory for filling
           aFeatureFind->second.find(*it) == aFeatureFind->second.end()) {
-        // TODO(spo): exceptional case for translation
-        theError = "Attribute \"" + anAttr->id() + "\" is not initialized.";
-//        theError.arg(anAttr->id());
+        theError = "Attribute \"%1\" is not initialized.";
+        theError.addParameter(anAttr->id());
+        // workaround for the filters selection feature: do not append the attribute id
+        if (std::dynamic_pointer_cast<ModelAPI_FiltersFeature>(theFeature))
+          theError.setContext(theFeature->getKind());
+        else
+          theError.setContext(theFeature->getKind() + ":" + anAttr->id());
         return false;
       }
     }