Issue #19890: Shape displayed with some transparency after symmetry

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

diff --git a/src/Model/Model_Validator.cpp b/src/Model/Model_Validator.cpp
index bf126c17b35654806c9b3b091861a7c56fc0cefa..73c02b7df3e8afb77f2913abf84044e481d65460 100644 (file)
--- a/src/Model/Model_Validator.cpp
+++ b/src/Model/Model_Validator.cpp
@@ -1,8 +1,21 @@
-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File:        Model_Validator.cpp
-// Created:     2 Jul 2014
-// Author:      Mikhail PONIKAROV
+// Copyright (C) 2014-2020  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_Validator.h"
 
@@ -174,11 +187,6 @@ bool Model_ValidatorsFactory::validate(const std::shared_ptr<ModelAPI_Feature>&
     for(; aValidatorIt != aValidators.cend(); aValidatorIt++) {
       const std::string& aValidatorID = aValidatorIt->first;
       const std::list<std::string>& anArguments = aValidatorIt->second;
-      // validators() checks invalid validator names
-      //if (!aValidator) {
-      //  Events_Error::send(std::string("Validator ") + aValidatorID + " was not registered");
-      //  continue;
-      //}
       const ModelAPI_FeatureValidator* aFValidator =
         dynamic_cast<const ModelAPI_FeatureValidator*>(validator(aValidatorID));
       if (aFValidator) {
@@ -196,30 +204,8 @@ bool Model_ValidatorsFactory::validate(const std::shared_ptr<ModelAPI_Feature>&
       }
     }
   }
-  // The default validator was retrned by validators() and was checked in previous cycle
-  //// check default validator
-  //std::map<std::string, ModelAPI_Validator*>::const_iterator aDefaultVal = myIDs.find(kDefaultId);
-  //if(aDefaultVal != myIDs.end()) {
-  //  static const std::list<std::string> anEmptyArgList;
-  //  const ModelAPI_FeatureValidator* aFValidator =
-  //    dynamic_cast<const ModelAPI_FeatureValidator*>(aDefaultVal->second);
-  //  if (aFValidator) {
-  //    std::string anError;
-  //    if (!aFValidator->isValid(theFeature, anEmptyArgList, anError)) {
-  //      if (anError.empty())
-  //        anError = "Unknown error.";
-  //      anError = "Feature invalidated by \"" + kDefaultId + "\" with error: " + anError;
-  //      theFeature->setError(anError, false);
-  //      theFeature->data()->execState(ModelAPI_StateInvalidArgument);
-  //      return false;
-  //    }
-  //  }
-  //}
 
   // check all attributes for validity
-  // Validity of data is checked by "Model_FeatureValidator" (kDefaultId)
-  // if (!aData || !aData->isValid())
-  //   return false;
   static const std::string kAllTypes = "";
   std::list<std::string> aLtAttributes = aData->attributesIDs(kAllTypes);
   std::list<std::string>::const_iterator anAttrIt = aLtAttributes.cbegin();
@@ -376,3 +362,41 @@ bool Model_ValidatorsFactory::isCase(FeaturePtr theFeature, std::string theAttri
   }
   return anInCase; // if no additional conditions, this attribute is the case to be validated
 }
+
+void Model_ValidatorsFactory::registerMainArgument(std::string theFeature,
+                                                   std::string theAttribute)
+{
+  std::map<std::string, std::string>::iterator aFound = myMainArgument.find(theFeature);
+  if (aFound == myMainArgument.end())
+    myMainArgument[theFeature] = theAttribute;
+}
+
+bool Model_ValidatorsFactory::isMainArgument(std::string theFeature, std::string theAttribute)
+{
+  std::map<std::string, std::string>::iterator aFound = myMainArgument.find(theFeature);
+  return aFound != myMainArgument.end() && aFound->second == theAttribute;
+}
+
+void Model_ValidatorsFactory::registerGeometricalSelection(std::string theFeature,
+                                                           std::string theAttribute)
+{
+  std::map<std::string, std::set<std::string> >::iterator aFind =
+    myGeometricalSelection.find(theFeature);
+  if (aFind == myGeometricalSelection.end()) {
+    std::set<std::string> aNewSet;
+    aNewSet.insert(theAttribute);
+    myGeometricalSelection[theFeature] = aNewSet;
+  }
+  else {
+    aFind->second.insert(theAttribute);
+  }
+}
+
+bool Model_ValidatorsFactory::isGeometricalSelection(std::string theFeature,
+                                                     std::string theAttribute)
+{
+  std::map<std::string, std::set<std::string> >::iterator aFind =
+    myGeometricalSelection.find(theFeature);
+  return aFind != myGeometricalSelection.end()
+         && aFind->second.find(theAttribute) != aFind->second.end();
+}