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
Merge branch 'master' into gni/evolution
[modules/shaper.git]
/
src
/
FeaturesPlugin
/
FeaturesPlugin_Revolution.cpp
diff --git
a/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp
b/src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp
index 2f941d59e0034d74a4ced88dd54766a755faadac..fb1a60c673c36f57fba2f362fc557fd1ee9664f0 100644
(file)
--- a/
src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp
+++ b/
src/FeaturesPlugin/FeaturesPlugin_Revolution.cpp
@@
-1,4
+1,4
@@
-// Copyright (C) 2014-20
17
CEA/DEN, EDF R&D
+// Copyright (C) 2014-20
22
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 "FeaturesPlugin_Revolution.h"
//
#include "FeaturesPlugin_Revolution.h"
@@
-27,6
+26,7
@@
#include <ModelAPI_Validator.h>
#include <GeomAlgoAPI_Revolution.h>
#include <ModelAPI_Validator.h>
#include <GeomAlgoAPI_Revolution.h>
+#include <GeomAlgoAPI_Tools.h>
#include <GeomAPI_Edge.h>
#include <GeomAPI_Lin.h>
#include <GeomAPI_Edge.h>
#include <GeomAPI_Lin.h>
@@
-139,12
+139,16
@@
bool FeaturesPlugin_Revolution::makeRevolutions(ListOfShape& theBaseShapes,
double aToAngle = 0.0;
double aFromAngle = 0.0;
double aToAngle = 0.0;
double aFromAngle = 0.0;
- if(string(CREATION_METHOD())->value() == CREATION_METHOD_BY_ANGLES()) {
+ if
(string(CREATION_METHOD())->value() == CREATION_METHOD_BY_ANGLES()) {
aToAngle = real(TO_ANGLE_ID())->value();
aFromAngle = real(FROM_ANGLE_ID())->value();
aToAngle = real(TO_ANGLE_ID())->value();
aFromAngle = real(FROM_ANGLE_ID())->value();
- } else {
+ } else
if (string(CREATION_METHOD())->value() == CREATION_METHOD_BY_PLANES())
{
aToAngle = real(TO_OFFSET_ID())->value();
aFromAngle = real(FROM_OFFSET_ID())->value();
aToAngle = real(TO_OFFSET_ID())->value();
aFromAngle = real(FROM_OFFSET_ID())->value();
+ } else if (string(CREATION_METHOD())->value() == CREATION_METHOD_THROUGH_ALL()) {
+ aToAngle = 360.0;
+ aFromAngle = 0.0;
+ } else {
}
// Getting bounding planes.
}
// Getting bounding planes.
@@
-177,6
+181,7
@@
bool FeaturesPlugin_Revolution::makeRevolutions(ListOfShape& theBaseShapes,
}
// Generating result for each base shape.
}
// Generating result for each base shape.
+ std::string anError;
for(ListOfShape::const_iterator
anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
GeomShapePtr aBaseShape = *anIter;
for(ListOfShape::const_iterator
anIter = theBaseShapes.cbegin(); anIter != theBaseShapes.cend(); anIter++) {
GeomShapePtr aBaseShape = *anIter;
@@
-185,7
+190,8
@@
bool FeaturesPlugin_Revolution::makeRevolutions(ListOfShape& theBaseShapes,
aBaseShape, anAxis,
aToShape, aToAngle,
aFromShape, aFromAngle));
aBaseShape, anAxis,
aToShape, aToAngle,
aFromShape, aFromAngle));
- if(!isMakeShapeValid(aRevolAlgo)) {
+ if (GeomAlgoAPI_Tools::AlgoError::isAlgorithmFailed(aRevolAlgo, getKind(), anError)) {
+ setError(anError);
return false;
}
return false;
}