X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Placement.cpp;h=0039d750d4ab0d6e7e30a161961d67e15fb3fc7f;hb=21a0c85b52bb93f94680e2342370764e6510e387;hp=1fcfa7618e3d27a44f9e9f4f65b400ca9ad2f7f0;hpb=9ba045c054ba0c390261989e9cc543c878254299;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp index 1fcfa7618..0039d750d 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Placement.cpp @@ -20,10 +20,8 @@ #include #include -#define _MODIFIEDF_TAG 1 -#define _MODIFIEDE_TAG 2 -#define _MODIFIEDV_TAG 3 -#define _FACE 4 +#include + FeaturesPlugin_Placement::FeaturesPlugin_Placement() { } @@ -31,11 +29,9 @@ FeaturesPlugin_Placement::FeaturesPlugin_Placement() void FeaturesPlugin_Placement::initAttributes() { - AttributeSelectionListPtr aSelection = + AttributeSelectionListPtr aSelection = std::dynamic_pointer_cast(data()->addAttribute( OBJECTS_LIST_ID(), ModelAPI_AttributeSelectionList::typeId())); - // extrusion works with faces always - aSelection->setSelectionType("SOLID"); data()->addAttribute(START_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); data()->addAttribute(END_SHAPE_ID(), ModelAPI_AttributeSelection::typeId()); @@ -53,9 +49,11 @@ void FeaturesPlugin_Placement::execute() 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()) { + if(!anObject.get()) { // may be for not-activated parts + eraseResults(); return; } anObjects.push_back(anObject); @@ -69,7 +67,7 @@ void FeaturesPlugin_Placement::execute() } std::shared_ptr aStartShape = anObjRef->value(); if(!aStartShape) { - static const std::string aSelectionError = "The start shape selection is bad"; + static const std::string aSelectionError = "Error: The start shape selection is bad."; setError(aSelectionError); return; } @@ -81,7 +79,7 @@ void FeaturesPlugin_Placement::execute() aStartShapeContext = aContextRes->shape(); } if(!aStartShapeContext.get()) { - static const std::string aContextError = "The start shape selection context is bad"; + static const std::string aContextError = "Error: The start shape selection context is bad."; setError(aContextError); return; } @@ -90,7 +88,7 @@ void FeaturesPlugin_Placement::execute() anObjRef = selection(END_SHAPE_ID()); std::shared_ptr anEndShape = anObjRef->value(); if(!anEndShape) { - static const std::string aSelectionError = "The end shape selection is bad"; + static const std::string aSelectionError = "Error: The end shape selection is bad."; setError(aSelectionError); return; } @@ -101,7 +99,7 @@ void FeaturesPlugin_Placement::execute() anEndShapeContext = aContextRes->shape(); } if(!anEndShapeContext.get()) { - static const std::string aContextError = "The end shape selection context is bad"; + static const std::string aContextError = "Error: The end shape selection context is bad."; setError(aContextError); return; } @@ -112,7 +110,7 @@ void FeaturesPlugin_Placement::execute() if (aShapes[i]->isFace()) { std::shared_ptr aFace(new GeomAPI_Face(aShapes[i])); if (!aFace->isPlanar()) { - static const std::string aPlanarityError = "One of selected faces is not planar"; + static const std::string aPlanarityError = "Error: One of selected faces is not planar."; setError(aPlanarityError); return; } @@ -120,7 +118,7 @@ void FeaturesPlugin_Placement::execute() else if (aShapes[i]->isEdge()) { std::shared_ptr anEdge(new GeomAPI_Edge(aShapes[i])); if (!anEdge->isLine()) { - static const std::string aLinearityError = "One of selected endges is not linear"; + static const std::string aLinearityError = "Error: One of selected endges is not linear."; setError(aLinearityError); return; } @@ -135,7 +133,7 @@ void FeaturesPlugin_Placement::execute() GeomAlgoAPI_Placement aPlacementAlgo( aStartShapeContext, anEndShapeContext, aStartShape, anEndShape, isReverse, isCentering, true); if(!aPlacementAlgo.isDone()) { - static const std::string aFeatureError = "Placement algorithm failed"; + static const std::string aFeatureError = "Error: Placement algorithm failed."; setError(aFeatureError); return; } @@ -147,7 +145,8 @@ void FeaturesPlugin_Placement::execute() for(ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++, aContext++) { - if ((*aContext)->groupName() == ModelAPI_ResultPart::group()) { // for part results just set transformation + // for part results just set transformation + if ((*aContext)->groupName() == ModelAPI_ResultPart::group()) { ResultPartPtr anOrigin = std::dynamic_pointer_cast(*aContext); ResultPartPtr aResultPart = document()->copyPart(anOrigin, data(), aResultIndex); aResultPart->setTrsf(aContextRes, aTrsf); @@ -158,24 +157,25 @@ void FeaturesPlugin_Placement::execute() // Checking that the algorithm worked properly. if(!aTransformAlgo.isDone()) { - static const std::string aFeatureError = "Transform algorithm failed"; + static const std::string aFeatureError = "Error: Transform algorithm failed."; setError(aFeatureError); break; } if(aTransformAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); break; } if(!aTransformAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); break; } //LoadNamingDS - std::shared_ptr aResultBody = document()->createBody(data(), aResultIndex); - LoadNamingDS(aTransformAlgo, aResultBody, aBaseShape); + std::shared_ptr aResultBody = + document()->createBody(data(), aResultIndex); + loadNamingDS(aTransformAlgo, aResultBody, aBaseShape); setResult(aResultBody, aResultIndex); } aResultIndex++; @@ -186,18 +186,17 @@ void FeaturesPlugin_Placement::execute() } //============================================================================ -void FeaturesPlugin_Placement::LoadNamingDS(GeomAlgoAPI_Transform& theTransformAlgo, +void FeaturesPlugin_Placement::loadNamingDS(GeomAlgoAPI_Transform& theTransformAlgo, std::shared_ptr theResultBody, - std::shared_ptr theSlaveObject) + std::shared_ptr theBaseShape) { //load result - theResultBody->storeModified(theSlaveObject, theTransformAlgo.shape()); // the initial Slave, the resulting Slave + theResultBody->storeModified(theBaseShape, theTransformAlgo.shape()); - std::shared_ptr aSubShapes = theTransformAlgo.mapOfShapes(); + std::string aPlacedName = "Placed"; + std::shared_ptr aSubShapes = theTransformAlgo.mapOfSubShapes(); - // put modifed faces in DF - std::string aModName = "Modified"; - theResultBody->loadAndOrientModifiedShapes(theTransformAlgo.makeShape().get(), - theSlaveObject, _FACE, - _MODIFIEDF_TAG, aModName, *aSubShapes.get()); + FeaturesPlugin_Tools::storeModifiedShapes(theTransformAlgo, theResultBody, + theBaseShape, 1, 2, 3, aPlacedName, + *aSubShapes.get()); }