X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_Partition.cpp;h=66a64ba435017e15ef2fa1c3853a286f408c3b40;hb=85b662214060cf733b44ac7822e3e4db49e2da4b;hp=44ab7cc84a963cefda27dc903aa8b82d05137dce;hpb=de115f80d6cb61058a53a20ba1a96ad77d35f661;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp b/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp index 44ab7cc84..66a64ba43 100755 --- a/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_Partition.cpp @@ -17,11 +17,14 @@ #include #include +#include #include #include #include #include +#include + //================================================================================================= FeaturesPlugin_Partition::FeaturesPlugin_Partition() { @@ -45,20 +48,6 @@ void FeaturesPlugin_Partition::initAttributes() data()->addAttribute(COMBINE_ID(), ModelAPI_AttributeBoolean::typeId()); } -//================================================================================================= -std::shared_ptr FeaturesPlugin_Partition::getShape(const std::string& theAttrName) -{ - std::shared_ptr aObjRef = - std::dynamic_pointer_cast(data()->attribute(theAttrName)); - if (aObjRef) { - std::shared_ptr aConstr = - std::dynamic_pointer_cast(aObjRef->value()); - if (aConstr) - return aConstr->shape(); - } - return std::shared_ptr(); -} - //================================================================================================= void FeaturesPlugin_Partition::execute() { @@ -76,6 +65,7 @@ void FeaturesPlugin_Partition::execute() } GeomAlgoAPI_MakeShapeList aMakeShapeList; + std::list > aBoundingPoints = GeomAlgoAPI_ShapeTools::getBoundingBox(anObjects, 1.0); // Getting tools. AttributeSelectionListPtr aToolsSelList = selectionList(FeaturesPlugin_Partition::TOOL_LIST_ID()); @@ -86,10 +76,10 @@ void FeaturesPlugin_Partition::execute() // it could be a construction plane ResultPtr aContext = aToolAttr->context(); if(aContext.get()) { - aTool = GeomAlgoAPI_ShapeTools::faceToInfinitePlane(aContext->shape()); + aTool = GeomAlgoAPI_ShapeTools::fitPlaneToBox(aContext->shape(), aBoundingPoints); std::shared_ptr aMkShCustom(new GeomAlgoAPI_MakeShapeCustom); aMkShCustom->addModified(aContext->shape(), aTool); - aMakeShapeList.append(aMkShCustom); + aMakeShapeList.appendAlgo(aMkShCustom); aTools.push_back(aTool); aToolsForNaming.push_back(aContext->shape()); } @@ -103,7 +93,7 @@ void FeaturesPlugin_Partition::execute() bool isCombine = boolean(COMBINE_ID())->value(); if(anObjects.empty()/* || aTools.empty()*/) { - std::string aFeatureError = "Not enough objects for partition operation"; + std::string aFeatureError = "Error: Not enough objects for partition operation."; setError(aFeatureError); return; } @@ -112,30 +102,39 @@ void FeaturesPlugin_Partition::execute() if(isCombine) { // Create single result. - GeomAlgoAPI_Partition aPartitionAlgo(anObjects, aTools); + //if(!aTools.empty()) { + // // This is a workaround for naming. Passing compound of objects as argument instead each object separately. + // std::shared_ptr aCompoud = GeomAlgoAPI_CompoundBuilder::compound(anObjects); + // anObjects.clear(); + // anObjects.push_back(aCompoud); + //} + std::shared_ptr aPartitionAlgo(new GeomAlgoAPI_Partition(anObjects, aTools)); // Checking that the algorithm worked properly. - if (!aPartitionAlgo.isDone()) { - static const std::string aFeatureError = "Partition algorithm failed"; + if (!aPartitionAlgo->isDone()) { + static const std::string aFeatureError = "Error: Partition algorithm failed."; setError(aFeatureError); return; } - if (aPartitionAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + if (aPartitionAlgo->shape()->isNull()) { + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } - if (!aPartitionAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + if (!aPartitionAlgo->isValid()) { + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } - if (GeomAlgoAPI_ShapeTools::volume(aPartitionAlgo.shape()) > 1.e-7) { + if (GeomAlgoAPI_ShapeTools::volume(aPartitionAlgo->shape()) > 1.e-7) { std::shared_ptr aResultBody = document()->createBody(data(), aResultIndex); - aMakeShapeList.append(aPartitionAlgo.makeShape()); - GeomAPI_DataMapOfShapeShape aMapOfShapes = *aPartitionAlgo.mapOfShapes().get(); - loadNamingDS(aResultBody, anObjects.front(), aToolsForNaming, aPartitionAlgo.shape(), aMakeShapeList, aMapOfShapes); + aMakeShapeList.appendAlgo(aPartitionAlgo); + GeomAPI_DataMapOfShapeShape& aMapOfShapes = *aPartitionAlgo->mapOfSubShapes().get(); + std::shared_ptr aBaseShape = anObjects.front(); + anObjects.pop_front(); + aToolsForNaming.insert(aToolsForNaming.end(), anObjects.begin(), anObjects.end()); + loadNamingDS(aResultBody, aBaseShape, aToolsForNaming, aPartitionAlgo->shape(), aMakeShapeList, aMapOfShapes); setResult(aResultBody, aResultIndex); aResultIndex++; } @@ -144,30 +143,31 @@ void FeaturesPlugin_Partition::execute() for (ListOfShape::iterator anObjectsIt = anObjects.begin(); anObjectsIt != anObjects.end(); anObjectsIt++) { std::shared_ptr anObject = *anObjectsIt; ListOfShape aListWithObject; aListWithObject.push_back(anObject); - GeomAlgoAPI_Partition aPartitionAlgo(aListWithObject, aTools); + std::shared_ptr aPartitionAlgo(new GeomAlgoAPI_Partition(aListWithObject, aTools)); // Checking that the algorithm worked properly. - if (!aPartitionAlgo.isDone()) { - static const std::string aFeatureError = "Partition algorithm failed"; + if (!aPartitionAlgo->isDone()) { + static const std::string aFeatureError = "Error: Partition algorithm failed."; setError(aFeatureError); return; } - if (aPartitionAlgo.shape()->isNull()) { - static const std::string aShapeError = "Resulting shape is Null"; + if (aPartitionAlgo->shape()->isNull()) { + static const std::string aShapeError = "Error: Resulting shape is Null."; setError(aShapeError); return; } - if (!aPartitionAlgo.isValid()) { - std::string aFeatureError = "Warning: resulting shape is not valid"; + if (!aPartitionAlgo->isValid()) { + std::string aFeatureError = "Error: Resulting shape is not valid."; setError(aFeatureError); return; } - if (GeomAlgoAPI_ShapeTools::volume(aPartitionAlgo.shape()) > 1.e-7) { + if (GeomAlgoAPI_ShapeTools::volume(aPartitionAlgo->shape()) > 1.e-7) { std::shared_ptr aResultBody = document()->createBody(data(), aResultIndex); - aMakeShapeList.append(aPartitionAlgo.makeShape()); - GeomAPI_DataMapOfShapeShape aMapOfShapes = *aPartitionAlgo.mapOfShapes().get(); - loadNamingDS(aResultBody, anObject, aToolsForNaming, aPartitionAlgo.shape(), aMakeShapeList, aMapOfShapes); + GeomAlgoAPI_MakeShapeList aMakeShapeListCopy = aMakeShapeList; + aMakeShapeListCopy.appendAlgo(aPartitionAlgo); + GeomAPI_DataMapOfShapeShape aMapOfShapes = *aPartitionAlgo->mapOfSubShapes().get(); + loadNamingDS(aResultBody, anObject, aToolsForNaming, aPartitionAlgo->shape(), aMakeShapeListCopy, aMapOfShapes); setResult(aResultBody, aResultIndex); aResultIndex++; } @@ -190,21 +190,28 @@ void FeaturesPlugin_Partition::loadNamingDS(std::shared_ptr if(theBaseShape->isEqual(theResultShape)) { theResultBody->store(theResultShape); } else { - const int aModifyTag = 1; - const int aDeletedTag = 2; - const int aSubsolidsTag = 3; /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids + const int aDeletedTag = 1; + const int aSubsolidsTag = 2; /// sub solids will be placed at labels 3, 4, etc. if result is compound of solids + const int aModifyTag = 100000; + int aModifyToolsTag = 200000; + std::ostringstream aStream; theResultBody->storeModified(theBaseShape, theResultShape, aSubsolidsTag); std::string aModName = "Modified"; theResultBody->loadAndOrientModifiedShapes(&theMakeShape, theBaseShape, GeomAPI_Shape::FACE, - aModifyTag, aModName, theMapOfShapes); + aModifyTag, aModName, theMapOfShapes, true); theResultBody->loadDeletedShapes(&theMakeShape, theBaseShape, GeomAPI_Shape::FACE, aDeletedTag); + int anIndex = 1; for(ListOfShape::const_iterator anIter = theTools.begin(); anIter != theTools.end(); anIter++) { + aStream.str(std::string()); + aStream.clear(); + aStream << aModName << "_" << anIndex++; theResultBody->loadAndOrientModifiedShapes(&theMakeShape, *anIter, GeomAPI_Shape::FACE, - aModifyTag, aModName, theMapOfShapes); + aModifyToolsTag, aStream.str(), theMapOfShapes, true); theResultBody->loadDeletedShapes(&theMakeShape, *anIter, GeomAPI_Shape::FACE, aDeletedTag); + aModifyToolsTag += 10000; } } }