X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FModel%2FModel_FeatureValidator.cpp;h=b729662089530ed58c44f0903bf0ac11919e7aad;hb=88be48ed1ea478b9d9d6ac2d965092418ef4dae6;hp=479405e4a3b21c56e95a1bef7ff87d29e63430d3;hpb=ba727bd58bc3166536229f47c363a14d5a126fa7;p=modules%2Fshaper.git diff --git a/src/Model/Model_FeatureValidator.cpp b/src/Model/Model_FeatureValidator.cpp index 479405e4a..b72966208 100644 --- a/src/Model/Model_FeatureValidator.cpp +++ b/src/Model/Model_FeatureValidator.cpp @@ -1,8 +1,22 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: Model_FeatureValidator.cpp -// Created: 8 Jul 2014 -// Author: Vitaly SMETANNIKOV +// Copyright (C) 2014-2017 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 @@ -22,11 +36,11 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr& th const std::list& theArguments, Events_InfoMessage& theError) const { - static Model_ValidatorsFactory* aValidators = + static Model_ValidatorsFactory* aValidators = static_cast(ModelAPI_Session::get()->validators()); std::shared_ptr aData = theFeature->data(); - // "Action" features has no data, but still valid. e.g "Remove Part" + // "Action" features has no data, but still valid. e.g "Remove Part" if (!aData->isValid()) { if (!theFeature->isAction()) theError = "There is no data."; @@ -40,12 +54,13 @@ bool Model_FeatureValidator::isValid(const std::shared_ptr& th 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 >::const_iterator aFeatureFind = + std::map >::const_iterator aFeatureFind = myNotObligatory.find(theFeature->getKind()); if (aFeatureFind == myNotObligatory.end() || // and it is obligatory for filling aFeatureFind->second.find(*it) == aFeatureFind->second.end()) { - theError = "Attribute \"%1\" is not initialized."; - theError.arg(anAttr->id()); + // TODO(spo): exceptional case for translation + theError = "Attribute \"" + anAttr->id() + "\" is not initialized."; +// theError.arg(anAttr->id()); return false; } }