X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FFeaturesPlugin%2FFeaturesPlugin_CompositeSketch.cpp;h=06320e03c71610916e502b84e3993381f73101af;hb=0fc732191ab734b184641afda92d024f80da812d;hp=665840127a26a3c281e21ebedd53e324efe4b6f7;hpb=fc6f3b77fd3c3affe39aa3357433cfd4effb22a2;p=modules%2Fshaper.git diff --git a/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp b/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp index 665840127..06320e03c 100644 --- a/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp +++ b/src/FeaturesPlugin/FeaturesPlugin_CompositeSketch.cpp @@ -25,6 +25,14 @@ #include #include +static void storeSubShape(ResultBodyPtr theResultBody, + const GeomShapePtr theShape, + const GeomAPI_Shape::ShapeType theType, + const std::shared_ptr theMapOfSubShapes, + const std::string theName, + int& theShapeIndex, + int& theTag); + //================================================================================================= void FeaturesPlugin_CompositeSketch::initCompositeSketchAttribtues(const int theInitFlags) { @@ -61,7 +69,8 @@ int FeaturesPlugin_CompositeSketch::numberOfSubs(bool forTree) const } //================================================================================================= -std::shared_ptr FeaturesPlugin_CompositeSketch::subFeature(const int theIndex, bool forTree) +std::shared_ptr FeaturesPlugin_CompositeSketch::subFeature(const int theIndex, + bool forTree) { if(theIndex == 0) { return std::dynamic_pointer_cast(data()->reference(SKETCH_ID())->value()); @@ -134,22 +143,20 @@ void FeaturesPlugin_CompositeSketch::getBaseShapes(ListOfShape& theBaseShapesLis GeomShapePtr aBaseShape = aBaseObjectSelection->value(); if(aBaseShape.get() && !aBaseShape->isNull()) { GeomAPI_Shape::ShapeType aST = aBaseShape->shapeType(); - if(aST != GeomAPI_Shape::VERTEX && aST != GeomAPI_Shape::EDGE && aST != GeomAPI_Shape::WIRE && - aST != GeomAPI_Shape::FACE && aST != GeomAPI_Shape::SHELL) { + if(aST == GeomAPI_Shape::SOLID || aST == GeomAPI_Shape::COMPSOLID) { setError("Error: Selected shapes has unsupported type."); return; } - if(aST == GeomAPI_Shape::WIRE) { - ResultConstructionPtr aConstruction = - std::dynamic_pointer_cast(aBaseObjectSelection->context()); - if(aConstruction.get() && !aBaseShape->isEqual(aConstruction->shape())) { - // It is a wire on the sketch, store it to make face later. - aSketchWiresMap[aConstruction].push_back(aBaseShape); - continue; - } + ResultConstructionPtr aConstruction = + std::dynamic_pointer_cast(aBaseObjectSelection->context()); + if(aConstruction.get() && !aBaseShape->isEqual(aConstruction->shape()) && + aST == GeomAPI_Shape::WIRE) { + // It is a wire on the sketch, store it to make face later. + aSketchWiresMap[aConstruction].push_back(aBaseShape); + continue; } else { - aST == GeomAPI_Shape::FACE ? aBaseFacesList.push_back(aBaseShape) : - theBaseShapesList.push_back(aBaseShape); + aST == GeomAPI_Shape::FACE ? aBaseFacesList.push_back(aBaseShape) : + theBaseShapesList.push_back(aBaseShape); } } else { // This may be the whole sketch result selected, check and get faces. @@ -165,7 +172,8 @@ void FeaturesPlugin_CompositeSketch::getBaseShapes(ListOfShape& theBaseShapesLis aBaseShape = aConstruction->shape(); if(aBaseShape.get() && !aBaseShape->isNull()) { GeomAPI_Shape::ShapeType aST = aBaseShape->shapeType(); - if(aST != GeomAPI_Shape::VERTEX && aST != GeomAPI_Shape::EDGE && aST != GeomAPI_Shape::WIRE && + if(aST != GeomAPI_Shape::VERTEX && aST != GeomAPI_Shape::EDGE && + aST != GeomAPI_Shape::WIRE && aST != GeomAPI_Shape::FACE && aST != GeomAPI_Shape::SHELL) { setError("Error: Selected shapes has unsupported type."); return; @@ -201,20 +209,23 @@ void FeaturesPlugin_CompositeSketch::getBaseShapes(ListOfShape& theBaseShapesLis } // Searching faces with common edges. - if(theIsMakeShells) { + if(theIsMakeShells && aBaseFacesList.size() > 1) { ListOfShape aShells; ListOfShape aFreeFaces; GeomShapePtr aFacesCompound = GeomAlgoAPI_CompoundBuilder::compound(aBaseFacesList); - GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, aShells, aFreeFaces); + GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, + aShells, aFreeFaces); theBaseShapesList.insert(theBaseShapesList.end(), aFreeFaces.begin(), aFreeFaces.end()); theBaseShapesList.insert(theBaseShapesList.end(), aShells.begin(), aShells.end()); } else { - theBaseShapesList.insert(theBaseShapesList.end(), aBaseFacesList.begin(), aBaseFacesList.end()); + theBaseShapesList.insert(theBaseShapesList.end(), aBaseFacesList.begin(), + aBaseFacesList.end()); } } //================================================================================================= -bool FeaturesPlugin_CompositeSketch::isMakeShapeValid(const std::shared_ptr theMakeShape) +bool FeaturesPlugin_CompositeSketch::isMakeShapeValid( + const std::shared_ptr theMakeShape) { // Check that algo is done. if(!theMakeShape->isDone()) { @@ -239,11 +250,11 @@ bool FeaturesPlugin_CompositeSketch::isMakeShapeValid(const std::shared_ptr theMakeShape, - const int theResultIndex) + const std::shared_ptr theMakeShape, + const int theIndex) { // Create result body. - ResultBodyPtr aResultBody = document()->createBody(data(), theResultIndex); + ResultBodyPtr aResultBody = document()->createBody(data(), theIndex); // Store generated shape. aResultBody->storeGenerated(theBaseShape, theMakeShape->shape()); @@ -252,67 +263,82 @@ void FeaturesPlugin_CompositeSketch::storeResult(const GeomShapePtr theBaseShape int aGenTag = 1; storeGenerationHistory(aResultBody, theBaseShape, theMakeShape, aGenTag); - setResult(aResultBody, theResultIndex); + setResult(aResultBody, theIndex); } //================================================================================================= void FeaturesPlugin_CompositeSketch::storeGenerationHistory(ResultBodyPtr theResultBody, - const GeomShapePtr theBaseShape, - const std::shared_ptr theMakeShape, - int& theTag) + const GeomShapePtr theBaseShape, + const std::shared_ptr theMakeShape, + int& theTag) { GeomAPI_Shape::ShapeType aBaseShapeType = theBaseShape->shapeType(); - GeomAPI_Shape::ShapeType aShapeTypeToExplode; + GeomAPI_Shape::ShapeType aShapeTypeToExplode = GeomAPI_Shape::SHAPE; std::string aGenName = "Generated_"; std::shared_ptr aMapOfSubShapes = theMakeShape->mapOfSubShapes(); switch(aBaseShapeType) { - case GeomAPI_Shape::VERTEX: { - aShapeTypeToExplode = GeomAPI_Shape::VERTEX; - aGenName += "Edge"; - break; - } case GeomAPI_Shape::EDGE: case GeomAPI_Shape::WIRE: { - std::shared_ptr aV1, aV2; - GeomAlgoAPI_ShapeTools::findBounds(theBaseShape, aV1, aV2); - ListOfShape aV1History, aV2History; - theMakeShape->generated(aV1, aV1History); - theMakeShape->generated(aV2, aV2History); - if(!aV1History.empty()) { - theResultBody->generated(aV1, aV1History.front(), aGenName + "Edge_1", theTag++); - } - if(!aV2History.empty()) { - theResultBody->generated(aV2, aV2History.front(), aGenName + "Edge_2", theTag++); - } + //std::shared_ptr aV1, aV2; + //GeomAlgoAPI_ShapeTools::findBounds(theBaseShape, aV1, aV2); + //ListOfShape aV1History, aV2History; + //theMakeShape->generated(aV1, aV1History); + //theMakeShape->generated(aV2, aV2History); + //if(!aV1History.empty()) { + // theResultBody->generated(aV1, aV1History.front(), aGenName + "Edge_1", theTag++); + //} + //if(!aV2History.empty()) { + // theResultBody->generated(aV2, aV2History.front(), aGenName + "Edge_2", theTag++); + //} + aShapeTypeToExplode = GeomAPI_Shape::VERTEX; + break; } case GeomAPI_Shape::FACE: case GeomAPI_Shape::SHELL: { aShapeTypeToExplode = GeomAPI_Shape::EDGE; - aGenName += "Face"; break; } + case GeomAPI_Shape::COMPOUND: { + aShapeTypeToExplode = GeomAPI_Shape::COMPOUND; + } } - theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), theBaseShape, aShapeTypeToExplode, - theTag++, aGenName, *aMapOfSubShapes.get()); - std::shared_ptr aMakeSweep = std::dynamic_pointer_cast(theMakeShape); + if(aShapeTypeToExplode == GeomAPI_Shape::VERTEX || + aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) { + theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), theBaseShape, + GeomAPI_Shape::VERTEX, + theTag++, aGenName + "Edge", + *aMapOfSubShapes.get()); + } + if(aShapeTypeToExplode == GeomAPI_Shape::EDGE || + aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) { + theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), + theBaseShape, GeomAPI_Shape::EDGE, + theTag++, aGenName + "Face", + *aMapOfSubShapes.get()); + } + + std::shared_ptr aMakeSweep = + std::dynamic_pointer_cast(theMakeShape); if(aMakeSweep.get()) { // Store from shapes. - storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes, aMakeSweep->fromShapes(), "From_", theTag); + storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes, + aMakeSweep->fromShapes(), "From_", theTag); // Store to shapes. - storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes, aMakeSweep->toShapes(), "To_", theTag); + storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes, + aMakeSweep->toShapes(), "To_", theTag); } } //================================================================================================= void FeaturesPlugin_CompositeSketch::storeShapes(ResultBodyPtr theResultBody, - const GeomAPI_Shape::ShapeType theBaseShapeType, - const std::shared_ptr theMapOfSubShapes, - const ListOfShape& theShapes, - const std::string theName, - int& theTag) + const GeomAPI_Shape::ShapeType theBaseShapeType, + const std::shared_ptr theMapOfSubShapes, + const ListOfShape& theShapes, + const std::string theName, + int& theTag) { GeomAPI_Shape::ShapeType aShapeTypeToExplore = GeomAPI_Shape::FACE; std::string aShapeTypeStr = "Face"; @@ -334,21 +360,50 @@ void FeaturesPlugin_CompositeSketch::storeShapes(ResultBodyPtr theResultBody, aShapeTypeStr = "Face"; break; } + case GeomAPI_Shape::COMPOUND: { + aShapeTypeToExplore = GeomAPI_Shape::COMPOUND; + break; + } } // Store shapes. int aShapeIndex = 1; - std::string aName = theName + aShapeTypeStr; + int aFaceIndex = 1; for(ListOfShape::const_iterator anIt = theShapes.cbegin(); anIt != theShapes.cend(); ++anIt) { GeomShapePtr aShape = *anIt; - for(GeomAPI_ShapeExplorer anExp(aShape, aShapeTypeToExplore); anExp.more(); anExp.next()) { - GeomShapePtr aSubShape = anExp.current(); - if(theMapOfSubShapes->isBound(aSubShape)) { - aSubShape = theMapOfSubShapes->find(aSubShape); - } - std::ostringstream aStr; - aStr << aName << "_" << aShapeIndex++; - theResultBody->generated(aSubShape, aStr.str(), theTag++); + + if(aShapeTypeToExplore == GeomAPI_Shape::COMPOUND) { + std::string aName = theName + (aShape->shapeType() == GeomAPI_Shape::EDGE ? "Edge" : "Face"); + storeSubShape(theResultBody, + aShape, + aShape->shapeType(), + theMapOfSubShapes, + aName, + aShape->shapeType() == GeomAPI_Shape::EDGE ? aShapeIndex : aFaceIndex, + theTag); + } else { + std::string aName = theName + aShapeTypeStr; + storeSubShape(theResultBody, aShape, aShapeTypeToExplore, + theMapOfSubShapes, aName, aShapeIndex, theTag); } } -} \ No newline at end of file +} + +void storeSubShape(ResultBodyPtr theResultBody, + const GeomShapePtr theShape, + const GeomAPI_Shape::ShapeType theType, + const std::shared_ptr theMapOfSubShapes, + const std::string theName, + int& theShapeIndex, + int& theTag) +{ + for(GeomAPI_ShapeExplorer anExp(theShape, theType); anExp.more(); anExp.next()) { + GeomShapePtr aSubShape = anExp.current(); + if(theMapOfSubShapes->isBound(aSubShape)) { + aSubShape = theMapOfSubShapes->find(aSubShape); + } + std::ostringstream aStr; + aStr << theName << "_" << theShapeIndex++; + theResultBody->generated(aSubShape, aStr.str(), theTag++); + } +}