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
Change icons for chamfer
[modules/shaper.git]
/
src
/
GeomValidators
/
GeomValidators_IntersectionSelection.cpp
diff --git
a/src/GeomValidators/GeomValidators_IntersectionSelection.cpp
b/src/GeomValidators/GeomValidators_IntersectionSelection.cpp
index 0100988007bf5812e038acc1140d7e1b61cb29ce..b539b8748355450bf20ae83bfaa028522e1076fb 100644
(file)
--- a/
src/GeomValidators/GeomValidators_IntersectionSelection.cpp
+++ b/
src/GeomValidators/GeomValidators_IntersectionSelection.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_IntersectionSelection.h"
//
#include "GeomValidators_IntersectionSelection.h"
@@
-45,12
+44,18
@@
bool GeomValidators_IntersectionSelection::isValid(const AttributePtr& theAttrib
theError = "Error: empty attribute selection.";
return false;
}
theError = "Error: empty attribute selection.";
return false;
}
+ FeaturePtr aFeature;
ResultPtr aContext = anAttrSelection->context();
if(!aContext.get()) {
ResultPtr aContext = anAttrSelection->context();
if(!aContext.get()) {
- theError = "Error: empty selection context.";
- return false;
+ aFeature = anAttrSelection->contextFeature();
+ if (!aFeature.get()) {
+ theError = "Error: Empty selection context.";
+ return false;
+ }
+ } else {
+ aFeature = ModelAPI_Feature::feature(aContext);
}
}
- FeaturePtr aFeature = ModelAPI_Feature::feature(aContext);
+
if(!aFeature.get()) {
theError = "Error: empty feature.";
return false;
if(!aFeature.get()) {
theError = "Error: empty feature.";
return false;