X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Rotation.cpp;h=1c6daf73293bd2b355a9114436552e0632f7fd92;hb=2714903267d23cd0c81166c506fb3edd1e069d40;hp=3d3076ab5d085516c6cce484a267717f3b2c636f;hpb=ac59b45bd9d2b7015a0b6618a4cf2ac1c5f67784;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp index 3d3076ab5..1c6daf732 100755 --- a/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Rotation.cpp @@ -1,18 +1,38 @@ -// Copyright (C) 2014-20xx CEA/DEN, EDF R&D - -// File: FeaturesPlugin_Rotation.cpp -// Created: 12 May 2015 -// Author: Dmitry Bobylev +// Copyright (C) 2014-2017 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 +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. +// +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. +// +// 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 +// +// See http://www.salome-platform.org/ or +// email : webmaster.salome@opencascade.com +// #include #include #include +#include #include #include +#include + #include #include +#include + +#include //================================================================================================= FeaturesPlugin_Rotation::FeaturesPlugin_Rotation() @@ -22,28 +42,54 @@ FeaturesPlugin_Rotation::FeaturesPlugin_Rotation() //================================================================================================= void FeaturesPlugin_Rotation::initAttributes() { - AttributeSelectionListPtr aSelection = + data()->addAttribute(FeaturesPlugin_Rotation::CREATION_METHOD(), + ModelAPI_AttributeString::typeId()); + + AttributeSelectionListPtr aSelection = std::dynamic_pointer_cast(data()->addAttribute( FeaturesPlugin_Rotation::OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); - // revolution works with faces always - aSelection->setSelectionType("SOLID"); - data()->addAttribute(FeaturesPlugin_Rotation::AXIS_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(FeaturesPlugin_Rotation::AXIS_OBJECT_ID(), + ModelAPI_AttributeSelection::typeId()); data()->addAttribute(FeaturesPlugin_Rotation::ANGLE_ID(), ModelAPI_AttributeDouble::typeId()); + + data()->addAttribute(FeaturesPlugin_Rotation::CENTER_POINT_ID(), + ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(FeaturesPlugin_Rotation::START_POINT_ID(), + ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(FeaturesPlugin_Rotation::END_POINT_ID(), + ModelAPI_AttributeSelection::typeId()); } //================================================================================================= void FeaturesPlugin_Rotation::execute() +{ + AttributeStringPtr aMethodTypeAttr = string(FeaturesPlugin_Rotation::CREATION_METHOD()); + std::string aMethodType = aMethodTypeAttr->value(); + + if (aMethodType == CREATION_METHOD_BY_ANGLE()) { + performTranslationByAxisAndAngle(); + } + + if (aMethodType == CREATION_METHOD_BY_THREE_POINTS()) { + performTranslationByThreePoints(); + } +} + +//================================================================================================= +void FeaturesPlugin_Rotation::performTranslationByAxisAndAngle() { // Getting objects. ListOfShape anObjects; std::list aContextes; - AttributeSelectionListPtr anObjectsSelList = selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID()); + AttributeSelectionListPtr anObjectsSelList = + selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID()); if (anObjectsSelList->size() == 0) { return; } for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) { - std::shared_ptr anObjectAttr = anObjectsSelList->value(anObjectsIndex); + std::shared_ptr anObjectAttr = + anObjectsSelList->value(anObjectsIndex); std::shared_ptr anObject = anObjectAttr->value(); if(!anObject.get()) { return; @@ -55,15 +101,17 @@ void FeaturesPlugin_Rotation::execute() //Getting axis. std::shared_ptr anAxis; std::shared_ptr anEdge; - std::shared_ptr anObjRef = selection(FeaturesPlugin_Rotation::AXIS_OBJECT_ID()); + std::shared_ptr anObjRef = + selection(FeaturesPlugin_Rotation::AXIS_OBJECT_ID()); if(anObjRef && anObjRef->value() && anObjRef->value()->isEdge()) { anEdge = std::shared_ptr(new GeomAPI_Edge(anObjRef->value())); - } else if (anObjRef && !anObjRef->value() && anObjRef->context() && + } else if (anObjRef && !anObjRef->value() && anObjRef->context() && anObjRef->context()->shape() && anObjRef->context()->shape()->isEdge()) { anEdge = std::shared_ptr(new GeomAPI_Edge(anObjRef->context()->shape())); } if(anEdge) { - anAxis = std::shared_ptr(new GeomAPI_Ax1(anEdge->line()->location(), anEdge->line()->direction())); + anAxis = std::shared_ptr(new GeomAPI_Ax1(anEdge->line()->location(), + anEdge->line()->direction())); } // Getting angle. @@ -72,7 +120,7 @@ void FeaturesPlugin_Rotation::execute() // Rotating each object. int aResultIndex = 0; std::list::iterator aContext = aContextes.begin(); - for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); + for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++, aContext++) { std::shared_ptr aBaseShape = *anObjectsIt; bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group(); @@ -84,10 +132,17 @@ void FeaturesPlugin_Rotation::execute() ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); aResultPart->setTrsf(*aContext, aTrsf); - setResult(aResultPart); + setResult(aResultPart, aResultIndex); } else { GeomAlgoAPI_Rotation aRotationAlgo(aBaseShape, anAxis, anAngle); + if (!aRotationAlgo.check()) { + setError(aRotationAlgo.getError()); + return; + } + + aRotationAlgo.build(); + // Checking that the algorithm worked properly. if(!aRotationAlgo.isDone()) { static const std::string aFeatureError = "Error: Rotation algorithm failed."; @@ -116,6 +171,108 @@ void FeaturesPlugin_Rotation::execute() removeResults(aResultIndex); } +//================================================================================================= +void FeaturesPlugin_Rotation::performTranslationByThreePoints() +{ + // Getting objects. + ListOfShape anObjects; + std::list aContextes; + AttributeSelectionListPtr anObjectsSelList = + selectionList(FeaturesPlugin_Rotation::OBJECTS_LIST_ID()); + if (anObjectsSelList->size() == 0) { + return; + } + for(int anObjectsIndex = 0; anObjectsIndex < anObjectsSelList->size(); anObjectsIndex++) { + std::shared_ptr anObjectAttr = + anObjectsSelList->value(anObjectsIndex); + std::shared_ptr anObject = anObjectAttr->value(); + if(!anObject.get()) { + return; + } + anObjects.push_back(anObject); + aContextes.push_back(anObjectAttr->context()); + } + + // Getting the center point and two points (start and end) + std::shared_ptr aCenterPoint; + std::shared_ptr aStartPoint; + std::shared_ptr anEndPoint; + std::shared_ptr aCenterRef = + selection(FeaturesPlugin_Rotation::CENTER_POINT_ID()); + std::shared_ptr aStartPointRef = + selection(FeaturesPlugin_Rotation::START_POINT_ID()); + std::shared_ptr anEndPointRef = + selection(FeaturesPlugin_Rotation::END_POINT_ID()); + if ((aCenterRef.get() != NULL) && (aStartPointRef.get() != NULL) + && (anEndPointRef.get() != NULL)) { + GeomShapePtr aCenterShape = aCenterRef->value(); + if (!aCenterShape.get()) + aCenterShape = aCenterRef->context()->shape(); + GeomShapePtr aStartShape = aStartPointRef->value(); + if (!aStartShape.get()) + aStartShape = aStartPointRef->context()->shape(); + GeomShapePtr anEndShape = anEndPointRef->value(); + if (!anEndShape.get()) + anEndShape = anEndPointRef->context()->shape(); + if (aStartShape && anEndShape && aCenterShape) { + aCenterPoint = GeomAlgoAPI_PointBuilder::point(aCenterShape); + aStartPoint = GeomAlgoAPI_PointBuilder::point(aStartShape); + anEndPoint = GeomAlgoAPI_PointBuilder::point(anEndShape); + } + } + + // Rotating each object. + int aResultIndex = 0; + std::list::iterator aContext = aContextes.begin(); + for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); + anObjectsIt++, aContext++) { + std::shared_ptr aBaseShape = *anObjectsIt; + bool isPart = (*aContext)->groupName() == ModelAPI_ResultPart::group(); + + // Setting result. + if (isPart) { + std::shared_ptr aTrsf(new GeomAPI_Trsf()); + aTrsf->setRotation(aCenterPoint, aStartPoint, anEndPoint); + ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); + ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); + aResultPart->setTrsf(*aContext, aTrsf); + setResult(aResultPart, aResultIndex); + } else { + GeomAlgoAPI_Rotation aRotationAlgo(aBaseShape, aCenterPoint, aStartPoint, anEndPoint); + + if (!aRotationAlgo.check()) { + setError(aRotationAlgo.getError()); + return; + } + + aRotationAlgo.build(); + + // Checking that the algorithm worked properly. + if(!aRotationAlgo.isDone()) { + static const std::string aFeatureError = "Error: Rotation algorithm failed."; + setError(aFeatureError); + break; + } + if(aRotationAlgo.shape()->isNull()) { + static const std::string aShapeError = "Error : Resulting shape is Null."; + setError(aShapeError); + break; + } + if(!aRotationAlgo.isValid()) { + std::string aFeatureError = "Error: Resulting shape is not valid."; + setError(aFeatureError); + break; + } + + ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex); + loadNamingDS(aRotationAlgo, aResultBody, aBaseShape); + setResult(aResultBody, aResultIndex); + } + aResultIndex++; + } +} + +//================================================================================================= void FeaturesPlugin_Rotation::loadNamingDS(GeomAlgoAPI_Rotation& theRotaionAlgo, std::shared_ptr theResultBody, std::shared_ptr theBaseShape) @@ -123,12 +280,10 @@ void FeaturesPlugin_Rotation::loadNamingDS(GeomAlgoAPI_Rotation& theRotaionAlgo, // Store result. theResultBody->storeModified(theBaseShape, theRotaionAlgo.shape()); - std::shared_ptr aSubShapes = theRotaionAlgo.mapOfSubShapes(); - - int aRotatedTag = 1; std::string aRotatedName = "Rotated"; - theResultBody->loadAndOrientModifiedShapes(&theRotaionAlgo, - theBaseShape, GeomAPI_Shape::FACE, - aRotatedTag, aRotatedName, *aSubShapes.get()); + std::shared_ptr aSubShapes = theRotaionAlgo.mapOfSubShapes(); + FeaturesPlugin_Tools::storeModifiedShapes(theRotaionAlgo, theResultBody, + theBaseShape, 1, 2, 3, aRotatedName, + *aSubShapes.get()); }