Salome HOME
projects
/
modules
/
shaper.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Issue #3052: Conflicting constraint after trim ellipse
[modules/shaper.git]
/
src
/
GeomValidators
/
GeomValidators_MinObjectsSelected.cpp
diff --git
a/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
b/src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
index 6b615acaccaac3775097ba82f2faf8466ea844a7..ca3ebc7a2aef4c871355f0c678c700ca4844d958 100644
(file)
--- a/
src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
+++ b/
src/GeomValidators/GeomValidators_MinObjectsSelected.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-201
7
CEA/DEN, EDF R&D
+// Copyright (C) 2014-201
9
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
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Lesser General Public
@@
-12,10
+12,9
@@
//
// You should have received a copy of the GNU Lesser General Public
// License along with this library; if not, write to the Free Software
//
// 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 <GeomValidators_MinObjectsSelected.h>
@@
-31,17
+30,21
@@
bool GeomValidators_MinObjectsSelected::isValid(const std::shared_ptr<ModelAPI_F
Events_InfoMessage& theError) const
{
if(theArguments.size() != 2) {
Events_InfoMessage& theError) const
{
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;
theError =
"Error: Wrong number of arguments (expected 2): selection list id and min number of objects";
return false;
+// LCOV_EXCL_STOP
}
std::string aSelectionListId = theArguments.front();
AttributeSelectionListPtr anAttrSelList = theFeature->selectionList(aSelectionListId);
if(!anAttrSelList.get()) {
}
std::string aSelectionListId = theArguments.front();
AttributeSelectionListPtr anAttrSelList = theFeature->selectionList(aSelectionListId);
if(!anAttrSelList.get()) {
+// LCOV_EXCL_START
theError = "Error: Could not get attribute \"%1\".";
theError.arg(aSelectionListId);
return false;
theError = "Error: Could not get attribute \"%1\".";
theError.arg(aSelectionListId);
return false;
+// LCOV_EXCL_STOP
}
int anObjectsNb = anAttrSelList->size();
}
int anObjectsNb = anAttrSelList->size();
@@
-49,16
+52,9
@@
bool GeomValidators_MinObjectsSelected::isValid(const std::shared_ptr<ModelAPI_F
if(anObjectsNb < aMinObjectsNb) {
theError = "Error: Attribute \"%1\" should contain at least %2 items.";
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;
}
return true;
}
return false;
}
return true;
}
-
-//================================================================================================
-bool GeomValidators_MinObjectsSelected::isNotObligatory(std::string theFeature,
- std::string theAttribute)
-{
- return false;
-}