#include <ModelAPI_AttributeDouble.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_ResultBody.h>
-#include <ModelAPI_Session.h>
#include <ModelAPI_ResultPart.h>
#include <GeomAPI_Edge.h>
anObjectsIt++, aContext++) {
std::shared_ptr<GeomAPI_Shape> aBaseShape = *anObjectsIt;
bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group();
- GeomAlgoAPI_Rotation aRotationAlgo(aBaseShape, anAxis, anAngle, isPart);
-
- // Checking that the algorithm worked properly.
- if(!aRotationAlgo.isDone()) {
- static const std::string aFeatureError = "Rotation algorithm failed";
- setError(aFeatureError);
- break;
- }
- if(aRotationAlgo.shape()->isNull()) {
- static const std::string aShapeError = "Resulting shape is Null";
- setError(aShapeError);
- break;
- }
- if(!aRotationAlgo.isValid()) {
- std::string aFeatureError = "Warning: resulting shape is not valid";
- setError(aFeatureError);
- break;
- }
// Setting result.
if (isPart) {
+ std::shared_ptr<GeomAPI_Trsf> aTrsf(new GeomAPI_Trsf());
+ aTrsf->setRotation(anAxis, anAngle);
ResultPartPtr anOrigin = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aContext);
-
- ResultPartPtr aCurrentResult;
- const std::list<std::shared_ptr<ModelAPI_Result> >& aResults = results();
- std::list<std::shared_ptr<ModelAPI_Result> >::const_iterator aResIter = aResults.begin();
- for(int a = 0; aResIter != aResults.end(); aResIter++, a++) {
- if (a == aResultIndex) {
- aCurrentResult = std::dynamic_pointer_cast<ModelAPI_ResultPart>(*aResIter);
- break;
- }
- }
- ResultPartPtr aResultPart = document()->copyPart(aCurrentResult, anOrigin, aResultIndex);
- aResultPart->setTrsf(*aContext, aRotationAlgo.transformation());
+ ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex);
+ aResultPart->setTrsf(*aContext, aTrsf);
setResult(aResultPart);
} else {
+ GeomAlgoAPI_Rotation aRotationAlgo(aBaseShape, anAxis, anAngle);
+
+ // Checking that the algorithm worked properly.
+ if(!aRotationAlgo.isDone()) {
+ static const std::string aFeatureError = "Rotation algorithm failed";
+ setError(aFeatureError);
+ break;
+ }
+ if(aRotationAlgo.shape()->isNull()) {
+ static const std::string aShapeError = "Resulting shape is Null";
+ setError(aShapeError);
+ break;
+ }
+ if(!aRotationAlgo.isValid()) {
+ std::string aFeatureError = "Warning: resulting shape is not valid";
+ setError(aFeatureError);
+ break;
+ }
+
ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
- LoadNamingDS(aRotationAlgo, aResultBody, aBaseShape);
+ loadNamingDS(aRotationAlgo, aResultBody, aBaseShape);
setResult(aResultBody, aResultIndex);
}
aResultIndex++;
removeResults(aResultIndex);
}
-void FeaturesPlugin_Rotation::LoadNamingDS(const GeomAlgoAPI_Rotation& theRotaionAlgo,
+void FeaturesPlugin_Rotation::loadNamingDS(GeomAlgoAPI_Rotation& theRotaionAlgo,
std::shared_ptr<ModelAPI_ResultBody> theResultBody,
std::shared_ptr<GeomAPI_Shape> theBaseShape)
{
// Store result.
theResultBody->storeModified(theBaseShape, theRotaionAlgo.shape());
- std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theRotaionAlgo.mapOfShapes();
+ std::shared_ptr<GeomAPI_DataMapOfShapeShape> aSubShapes = theRotaionAlgo.mapOfSubShapes();
int aRotatedTag = 1;
std::string aRotatedName = "Rotated";
- theResultBody->loadAndOrientModifiedShapes(theRotaionAlgo.makeShape().get(),
+ theResultBody->loadAndOrientModifiedShapes(&theRotaionAlgo,
theBaseShape, GeomAPI_Shape::FACE,
aRotatedTag, aRotatedName, *aSubShapes.get());