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
Fix regression in unit tests
[modules/shaper.git]
/
src
/
FeaturesPlugin
/
FeaturesPlugin_RevolutionBoolean.cpp
diff --git
a/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp
b/src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp
index ef3af8ec681fefc767839551d2aa0a006affb61e..566cac8a1d05cf1f804cfeaf4655c40b90d23182 100644
(file)
--- a/
src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp
+++ b/
src/FeaturesPlugin/FeaturesPlugin_RevolutionBoolean.cpp
@@
-1,6
+1,6
@@
// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-// File: FeaturesPlugin_RevolutionBoolean.
h
+// File: FeaturesPlugin_RevolutionBoolean.
cpp
// Created: 11 June 2015
// Author: Dmitry Bobylev
// Created: 11 June 2015
// Author: Dmitry Bobylev
@@
-37,7
+37,9
@@
void FeaturesPlugin_RevolutionBoolean::initMakeSolidsAttributes()
}
//=================================================================================================
}
//=================================================================================================
-ListOfShape FeaturesPlugin_RevolutionBoolean::MakeSolids(const ListOfShape& theFaces)
+void FeaturesPlugin_RevolutionBoolean::makeSolids(const ListOfShape& theFaces,
+ ListOfShape& theResults,
+ ListOfMakeShape& theAlgos)
{
//Getting axis.
std::shared_ptr<GeomAPI_Ax1> anAxis;
{
//Getting axis.
std::shared_ptr<GeomAPI_Ax1> anAxis;
@@
-46,7
+48,7
@@
ListOfShape FeaturesPlugin_RevolutionBoolean::MakeSolids(const ListOfShape& theF
if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) {
anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->value()));
} else if(anObjRef->context() && anObjRef->context()->shape() && anObjRef->context()->shape()->isEdge()) {
if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) {
anEdge = std::shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->value()));
} else if(anObjRef->context() && anObjRef->context()->shape() && anObjRef->context()->shape()->isEdge()) {
- anEdge = std::
make_shared<GeomAPI_Edge>(anObjRef->context()->shape(
));
+ anEdge = std::
shared_ptr<GeomAPI_Edge>(new GeomAPI_Edge(anObjRef->context()->shape()
));
}
if(anEdge) {
anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction()));
}
if(anEdge) {
anAxis = std::shared_ptr<GeomAPI_Ax1>(new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction()));
@@
-86,18
+88,19
@@
ListOfShape FeaturesPlugin_RevolutionBoolean::MakeSolids(const ListOfShape& theF
}
// Revol faces.
}
// Revol faces.
-
ListOfShape aRevolutionList
;
+
theResults.clear()
;
for(ListOfShape::const_iterator aFacesIt = theFaces.begin(); aFacesIt != theFaces.end(); aFacesIt++) {
std::shared_ptr<GeomAPI_Shape> aBaseShape = *aFacesIt;
for(ListOfShape::const_iterator aFacesIt = theFaces.begin(); aFacesIt != theFaces.end(); aFacesIt++) {
std::shared_ptr<GeomAPI_Shape> aBaseShape = *aFacesIt;
-
GeomAlgoAPI_Revolution aRevolAlgo(aBaseShape, anAxis, aToShape, aToAngle, aFromShape, aFromAngle
);
+
std::shared_ptr<GeomAlgoAPI_Revolution> aRevolAlgo = std::shared_ptr<GeomAlgoAPI_Revolution>(new GeomAlgoAPI_Revolution(aBaseShape, anAxis, aToShape, aToAngle, aFromShape, aFromAngle)
);
// Checking that the algorithm worked properly.
// Checking that the algorithm worked properly.
- if(!aRevolAlgo.isDone() || aRevolAlgo.shape()->isNull() || !aRevolAlgo.isValid()) {
+ if(!aRevolAlgo->isDone() || !aRevolAlgo->shape().get() || aRevolAlgo->shape()->isNull() ||
+ !aRevolAlgo->isValid()) {
setError("Revolution algorithm failed");
setError("Revolution algorithm failed");
- return ListOfShape();
+ theResults.clear();
+ return;
}
}
- aRevolutionList.push_back(aRevolAlgo.shape());
+ theResults.push_back(aRevolAlgo->shape());
+ theAlgos.push_back(aRevolAlgo);
}
}
-
- return aRevolutionList;
-}
\ No newline at end of file
+}