// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-// File: FeaturesPlugin_RevolutionBoolean.h
+// File: FeaturesPlugin_RevolutionBoolean.cpp
// Created: 11 June 2015
// Author: Dmitry Bobylev
data()->addAttribute(CREATION_METHOD(), ModelAPI_AttributeString::typeId());
- data()->addAttribute(TO_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
data()->addAttribute(TO_ANGLE_ID(), ModelAPI_AttributeDouble::typeId());
+ data()->addAttribute(FROM_ANGLE_ID(), ModelAPI_AttributeDouble::typeId());
+
+ data()->addAttribute(TO_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
+ data()->addAttribute(TO_OFFSET_ID(), ModelAPI_AttributeDouble::typeId());
data()->addAttribute(FROM_OBJECT_ID(), ModelAPI_AttributeSelection::typeId());
- data()->addAttribute(FROM_ANGLE_ID(), ModelAPI_AttributeDouble::typeId());
+ data()->addAttribute(FROM_OFFSET_ID(), ModelAPI_AttributeDouble::typeId());
ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), TO_OBJECT_ID());
ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), FROM_OBJECT_ID());
}
//=================================================================================================
-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;
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()));
}
// Getting revolution angles.
- double aFromAngle = real(FROM_ANGLE_ID())->value();
double aToAngle = real(TO_ANGLE_ID())->value();
+ double aFromAngle = real(FROM_ANGLE_ID())->value();
+
+ if(string(CREATION_METHOD())->value() == "ByAngles") {
+ aToAngle = real(TO_ANGLE_ID())->value();
+ aFromAngle = real(FROM_ANGLE_ID())->value();
+ } else {
+ aToAngle = real(TO_OFFSET_ID())->value();
+ aFromAngle = real(FROM_OFFSET_ID())->value();
+ }
// Getting revolution bounding planes.
- std::shared_ptr<GeomAPI_Shape> aFromShape;
std::shared_ptr<GeomAPI_Shape> aToShape;
+ std::shared_ptr<GeomAPI_Shape> aFromShape;
if(string(CREATION_METHOD())->value() == "ByPlanesAndOffsets") {
- anObjRef = selection(FROM_OBJECT_ID());
- if(anObjRef.get() != NULL) {
- aFromShape = std::dynamic_pointer_cast<GeomAPI_Shape>(anObjRef->value());
- if(aFromShape.get() == NULL && anObjRef->context().get() != NULL) {
- aFromShape = anObjRef->context()->shape();
- }
- }
anObjRef = selection(TO_OBJECT_ID());
if(anObjRef.get() != NULL) {
aToShape = std::dynamic_pointer_cast<GeomAPI_Shape>(anObjRef->value());
aToShape = anObjRef->context()->shape();
}
}
+ anObjRef = selection(FROM_OBJECT_ID());
+ if(anObjRef.get() != NULL) {
+ aFromShape = std::dynamic_pointer_cast<GeomAPI_Shape>(anObjRef->value());
+ if(aFromShape.get() == NULL && anObjRef->context().get() != NULL) {
+ aFromShape = anObjRef->context()->shape();
+ }
+ }
}
// Revol faces.
- ListOfShape aRevolutionList;
+ theResults.clear();
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.
- if(!aRevolAlgo.isDone() || aRevolAlgo.shape()->isNull() || !aRevolAlgo.isValid()) {
+ if(!aRevolAlgo->isDone() || !aRevolAlgo->shape().get() || aRevolAlgo->shape()->isNull() ||
+ !aRevolAlgo->isValid()) {
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
+}