X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FGeomValidators%2FGeomValidators_MinObjectsSelected.cpp;h=ca3ebc7a2aef4c871355f0c678c700ca4844d958;hb=be64ac512378281d54e4a73e8edb68ae43d0c5a7;hp=aa4088daa7420b72710b4fad193b75c60c126402;hpb=7e9e955376b504dc7d9e0a5e79a9a38943a53fcd;p=modules%2Fshaper.git diff --git a/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp b/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp index aa4088daa..ca3ebc7a2 100644 --- a/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp +++ b/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp @@ -1,8 +1,21 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: GeomValidators_MinObjectsSelected.cpp -// Created: 30 June 2015 -// Author: Dmitry Bobylev +// Copyright (C) 2014-2019 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 @@ -17,31 +30,31 @@ bool GeomValidators_MinObjectsSelected::isValid(const std::shared_ptrselectionList(aSelectionListId); if(!anAttrSelList.get()) { - theError = "Error: Could not get attribute \"" + aSelectionListId + "\"."; +// LCOV_EXCL_START + theError = "Error: Could not get attribute \"%1\"."; + theError.arg(aSelectionListId); return false; +// LCOV_EXCL_STOP } int anObjectsNb = anAttrSelList->size(); int aMinObjectsNb = atoi(theArguments.back().c_str()); if(anObjectsNb < aMinObjectsNb) { - theError = "Error: Attribute \"" + aSelectionListId + "\" should contain at least " - + theArguments.back() + " items."; + theError = "Error: Attribute \"%1\" should contain at least %2 items."; + theError.arg(aSelectionListId).arg(aMinObjectsNb); return false; } return true; } - -//================================================================================================= -bool GeomValidators_MinObjectsSelected::isNotObligatory(std::string theFeature, std::string theAttribute) -{ - return false; -}