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
Task #3005 : To be able to create a group on a whole result
[modules/shaper.git]
/
src
/
GeomAlgoAPI
/
GeomAlgoAPI_Revolution.cpp
diff --git
a/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp
b/src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp
index e7a035cc1b4c4f071bfe8fc08520a763edf66385..6a2221e16efb9f8957e7f664591de8e54a76255c 100644
(file)
--- a/
src/GeomAlgoAPI/GeomAlgoAPI_Revolution.cpp
+++ b/
src/GeomAlgoAPI/GeomAlgoAPI_Revolution.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 "GeomAlgoAPI_Revolution.h"
//
#include "GeomAlgoAPI_Revolution.h"
@@
-314,11
+313,10
@@
void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh
if(aResult.ShapeType() == TopAbs_COMPOUND) {
std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
aGeomShape->setImpl(new TopoDS_Shape(aResult));
if(aResult.ShapeType() == TopAbs_COMPOUND) {
std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
aGeomShape->setImpl(new TopoDS_Shape(aResult));
- ListOfShape a
CompSolids, aFreeSolid
s;
+ ListOfShape a
Result
s;
aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
GeomAPI_Shape::COMPSOLID,
aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
GeomAPI_Shape::COMPSOLID,
- aCompSolids,
- aFreeSolids);
+ aResults);
aResult = aGeomShape->impl<TopoDS_Shape>();
}
aResult = aGeomShape->impl<TopoDS_Shape>();
}
@@
-484,11
+482,10
@@
void GeomAlgoAPI_Revolution::build(const GeomShapePtr& theBaseSh
if(aResult.ShapeType() == TopAbs_COMPOUND) {
std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
aGeomShape->setImpl(new TopoDS_Shape(aResult));
if(aResult.ShapeType() == TopAbs_COMPOUND) {
std::shared_ptr<GeomAPI_Shape> aGeomShape(new GeomAPI_Shape);
aGeomShape->setImpl(new TopoDS_Shape(aResult));
- ListOfShape a
CompSolids, aFreeSolid
s;
+ ListOfShape a
Result
s;
aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
GeomAPI_Shape::COMPSOLID,
aGeomShape = GeomAlgoAPI_ShapeTools::combineShapes(aGeomShape,
GeomAPI_Shape::COMPSOLID,
- aCompSolids,
- aFreeSolids);
+ aResults);
aResult = aGeomShape->impl<TopoDS_Shape>();
}
aResult = aGeomShape->impl<TopoDS_Shape>();
}