Merge branch 'master' into gni/evolution

[modules/shaper.git] / src / GeomValidators / GeomValidators_MinObjectsSelected.cpp

diff --git a/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp b/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
index cf30db5f93a85fbdc091ee25201b4f608d865bfb..1a5460342d007786fe882bff9aec27ec132b5a26 100644 (file)
--- a/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
+++ b/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
@@ -1,4 +1,4 @@
-// Copyright (C) 2014-2017  CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022  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
@@ -12,17 +12,19 @@
 //
 // 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
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 //
-// See http://www.salome-platform.org/ or
-// email : webmaster.salome@opencascade.com<mailto:webmaster.salome@opencascade.com>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 //
 
 #include <GeomValidators_MinObjectsSelected.h>
 
 #include <Events_InfoMessage.h>
 
+#include <BuildPlugin_Interpolation.h>
+
 #include <ModelAPI_AttributeInteger.h>
+#include <ModelAPI_AttributeString.h>
 #include <ModelAPI_AttributeSelectionList.h>
 
 //=================================================================================================
@@ -30,17 +32,25 @@ bool GeomValidators_MinObjectsSelected::isValid(const std::shared_ptr<ModelAPI_F
                                                 const std::list<std::string>& theArguments,
                                                 Events_InfoMessage& theError) const
 {
-  if(theArguments.size() != 2) {
+  if (theArguments.size() != 2) {
 // LCOV_EXCL_START
     theError =
       "Error: Wrong number of arguments (expected 2): selection list id and min number of objects";
     return false;
 // LCOV_EXCL_STOP
   }
+  //"Interpolation"
+  if (theFeature->name().substr(0, 6) == L"Interp")
+  {
+    AttributeStringPtr anAttr =theFeature->string(BuildPlugin_Interpolation::CREATION_METHOD_ID());
+    if (anAttr->isInitialized())
+      if (anAttr->value() == BuildPlugin_Interpolation::CREATION_METHOD_ANALYTICAL_ID())
+        return true;
+  }
 
   std::string aSelectionListId = theArguments.front();
   AttributeSelectionListPtr anAttrSelList = theFeature->selectionList(aSelectionListId);
-  if(!anAttrSelList.get()) {
+  if (!anAttrSelList.get()) {
 // LCOV_EXCL_START
     theError = "Error: Could not get attribute \"%1\".";
     theError.arg(aSelectionListId);
@@ -51,9 +61,9 @@ bool GeomValidators_MinObjectsSelected::isValid(const std::shared_ptr<ModelAPI_F
 
   int aMinObjectsNb = atoi(theArguments.back().c_str());
 
-  if(anObjectsNb < aMinObjectsNb) {
+  if (anObjectsNb < aMinObjectsNb) {
     theError = "Error: Attribute \"%1\" should contain at least %2 items.";
-    theError.arg(aSelectionListId).arg(theArguments.back());
+    theError.arg(aSelectionListId).arg(aMinObjectsNb);
     return false;
   }