X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Placement.cpp;h=a8e4b4138432ec11bf105c68f40cee609bba59ca;hb=1f41ff707094ce873abe9bbb95faaa363665a205;hp=d069858d45e3c528412516c8e6b3c73911cc7f88;hpb=98713097930edb46d37ffb835d685ec2ef9439dc;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp index d069858d4..a8e4b4138 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp @@ -8,14 +8,17 @@ #include #include +#include #include #include #include +#include #include #include #include #include +#include #define _MODIFIEDF_TAG 1 #define _MODIFIEDE_TAG 2 @@ -27,71 +30,85 @@ FeaturesPlugin_Placement::FeaturesPlugin_Placement() void FeaturesPlugin_Placement::initAttributes() { - /* Modification for specification of 1.3.0 + AttributeSelectionListPtr aSelection = std::dynamic_pointer_cast(data()->addAttribute( - FeaturesPlugin_Placement::LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); + OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); // extrusion works with faces always aSelection->setSelectionType("SOLID"); - */ - data()->addAttribute(FeaturesPlugin_Placement::BASE_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(FeaturesPlugin_Placement::ATTRACT_OBJECT_ID(), ModelAPI_AttributeSelection::typeId()); - data()->addAttribute(FeaturesPlugin_Placement::REVERSE_ID(), ModelAPI_AttributeBoolean::typeId()); - data()->addAttribute(FeaturesPlugin_Placement::CENTERING_ID(), ModelAPI_AttributeBoolean::typeId()); + + data()->addAttribute(START_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(END_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); + data()->addAttribute(REVERSE_ID(), ModelAPI_AttributeBoolean::typeId()); + data()->addAttribute(CENTERING_ID(), ModelAPI_AttributeBoolean::typeId()); } void FeaturesPlugin_Placement::execute() { - // Verify the base face - std::shared_ptr anObjRef = std::dynamic_pointer_cast< - ModelAPI_AttributeSelection>(data()->attribute(FeaturesPlugin_Placement::BASE_OBJECT_ID())); - if (!anObjRef) + // Getting objects. + ListOfShape anObjects; + std::list aContextes; + AttributeSelectionListPtr anObjectsSelList = selectionList(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()) { // may be for not-activated parts + eraseResults(); + return; + } + anObjects.push_back(anObject); + aContextes.push_back(anObjectAttr->context()); + } - std::shared_ptr aBaseShape = - std::dynamic_pointer_cast(anObjRef->value()); - if (!aBaseShape) + // Verify the start shape + AttributeSelectionPtr anObjRef = selection(START_SHAPE_ID()); + if(!anObjRef) { return; + } + std::shared_ptr aStartShape = anObjRef->value(); + if(!aStartShape) { + static const std::string aSelectionError = "The start shape selection is bad"; + setError(aSelectionError); + return; + } + - std::shared_ptr aBaseObject; + std::shared_ptr aStartShapeContext; ResultPtr aContextRes = anObjRef->context(); - if (aContextRes) { - if (aContextRes->groupName() == ModelAPI_ResultBody::group()) - aBaseObject = std::dynamic_pointer_cast(aContextRes)->shape(); - else if (aContextRes->groupName() == ModelAPI_ResultConstruction::group()) - aBaseObject = std::dynamic_pointer_cast(aContextRes)->shape(); + if (aContextRes.get()) { + aStartShapeContext = aContextRes->shape(); } - if (!aBaseObject) { - static const std::string aContextError = "The selection context is bad"; + if(!aStartShapeContext.get()) { + static const std::string aContextError = "The start shape selection context is bad"; setError(aContextError); return; } - // Verify the attractive face - anObjRef = std::dynamic_pointer_cast( - data()->attribute(FeaturesPlugin_Placement::ATTRACT_OBJECT_ID())); - - std::shared_ptr aSlaveShape = - std::dynamic_pointer_cast(anObjRef->value()); - if (!aSlaveShape) + // Verify the end shape + anObjRef = selection(END_SHAPE_ID()); + std::shared_ptr anEndShape = anObjRef->value(); + if(!anEndShape) { + static const std::string aSelectionError = "The end shape selection is bad"; + setError(aSelectionError); return; + } - std::shared_ptr aSlaveObject; + std::shared_ptr anEndShapeContext; aContextRes = anObjRef->context(); - if (aContextRes) { - if (aContextRes->groupName() == ModelAPI_ResultBody::group()) - aSlaveObject = std::dynamic_pointer_cast(aContextRes)->shape(); - else if (aContextRes->groupName() == ModelAPI_ResultConstruction::group()) - aSlaveObject = std::dynamic_pointer_cast(aContextRes)->shape(); + if(aContextRes.get()) { + anEndShapeContext = aContextRes->shape(); } - if (!aSlaveObject) { - static const std::string aContextError = "The selection context is bad"; + if(!anEndShapeContext.get()) { + static const std::string aContextError = "The end shape selection context is bad"; setError(aContextError); return; } // Verify planarity of faces and linearity of edges - std::shared_ptr aShapes[2] = {aBaseShape, aSlaveShape}; + std::shared_ptr aShapes[2] = {aStartShape, anEndShape}; for (int i = 0; i < 2; i++) { if (aShapes[i]->isFace()) { std::shared_ptr aFace(new GeomAPI_Face(aShapes[i])); @@ -112,52 +129,76 @@ void FeaturesPlugin_Placement::execute() } // Flags of the Placement - AttributeBooleanPtr aBoolAttr = std::dynamic_pointer_cast( - data()->attribute(FeaturesPlugin_Placement::REVERSE_ID())); - bool isReverse = aBoolAttr->value(); - aBoolAttr = std::dynamic_pointer_cast( - data()->attribute(FeaturesPlugin_Placement::CENTERING_ID())); - bool isCentering = aBoolAttr->value(); - - std::shared_ptr aResultBody = document()->createBody(data()); - GeomAlgoAPI_Placement aFeature(aSlaveObject, aBaseObject, aSlaveShape, aBaseShape, isReverse, isCentering); - if(!aFeature.isDone()) { + bool isReverse = boolean(REVERSE_ID())->value(); + bool isCentering = boolean(CENTERING_ID())->value(); + + // Getting transformation. + GeomAlgoAPI_Placement aPlacementAlgo( + aStartShapeContext, anEndShapeContext, aStartShape, anEndShape, isReverse, isCentering, true); + if(!aPlacementAlgo.isDone()) { static const std::string aFeatureError = "Placement algorithm failed"; setError(aFeatureError); return; } + std::shared_ptr aTrsf = aPlacementAlgo.transformation(); + + // Applying transformation to each object. + int aResultIndex = 0; + std::list::iterator aContext = aContextes.begin(); + for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); + anObjectsIt++, aContext++) { + + if ((*aContext)->groupName() == ModelAPI_ResultPart::group()) { // for part results just set transformation + ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); + ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); + aResultPart->setTrsf(aContextRes, aTrsf); + setResult(aResultPart, aResultIndex); + } else { + std::shared_ptr aBaseShape = *anObjectsIt; + GeomAlgoAPI_Transform aTransformAlgo(aBaseShape, aTrsf); + + // Checking that the algorithm worked properly. + if(!aTransformAlgo.isDone()) { + static const std::string aFeatureError = "Transform algorithm failed"; + setError(aFeatureError); + break; + } + if(aTransformAlgo.shape()->isNull()) { + static const std::string aShapeError = "Resulting shape is Null"; + setError(aShapeError); + break; + } + if(!aTransformAlgo.isValid()) { + std::string aFeatureError = "Warning: resulting shape is not valid"; + setError(aFeatureError); + break; + } - // Check if shape is valid - if (aFeature.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; - setError(aShapeError); - return; + //LoadNamingDS + std::shared_ptr aResultBody = document()->createBody(data(), aResultIndex); + LoadNamingDS(aTransformAlgo, aResultBody, aBaseShape); + setResult(aResultBody, aResultIndex); + } + aResultIndex++; } - if(!aFeature.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; - setError(aFeatureError); - return; - } - //LoadNamingDS - LoadNamingDS(aFeature, aResultBody, aSlaveObject); - setResult(aResultBody); + // Remove the rest results if there were produced in the previous pass. + removeResults(aResultIndex); } //============================================================================ -void FeaturesPlugin_Placement::LoadNamingDS( - GeomAlgoAPI_Placement& theFeature, - std::shared_ptr theResultBody, - std::shared_ptr theSlaveObject) +void FeaturesPlugin_Placement::LoadNamingDS(GeomAlgoAPI_Transform& theTransformAlgo, + std::shared_ptr theResultBody, + std::shared_ptr theSlaveObject) { //load result - theResultBody->storeModified(theSlaveObject, theFeature.shape()); // the initial Slave, the resulting Slave + theResultBody->storeModified(theSlaveObject, theTransformAlgo.shape()); // the initial Slave, the resulting Slave + + std::shared_ptr aSubShapes = theTransformAlgo.mapOfShapes(); - GeomAPI_DataMapOfShapeShape* aSubShapes = new GeomAPI_DataMapOfShapeShape(); - theFeature.mapOfShapes(*aSubShapes); - // put modifed faces in DF std::string aModName = "Modified"; - theResultBody->loadAndOrientModifiedShapes(theFeature.makeShape(), theSlaveObject, _FACE, _MODIFIEDF_TAG, aModName, *aSubShapes); - + theResultBody->loadAndOrientModifiedShapes(theTransformAlgo.makeShape().get(), + theSlaveObject, _FACE, + _MODIFIEDF_TAG, aModName, *aSubShapes.get()); }