-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: FeaturesPlugin_CompositeSketch.cpp
-// Created: 11 September 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<mailto:webmaster.salome@opencascade.com>
+//
#include <FeaturesPlugin_CompositeSketch.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_AttributeReference.h>
#include <ModelAPI_BodyBuilder.h>
-#include <ModelAPI_ResultBody.h>
#include <ModelAPI_ResultConstruction.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
#include <GeomAlgoAPI_Prism.h>
#include <GeomAlgoAPI_Revolution.h>
#include <GeomAlgoAPI_ShapeTools.h>
+#include <GeomAlgoAPI_SketchBuilder.h>
+
+#include <GeomAPI_PlanarEdges.h>
+#include <GeomAPI_ShapeExplorer.h>
+#include <map>
#include <sstream>
+static void storeSubShape(ResultBodyPtr theResultBody,
+ const GeomShapePtr theShape,
+ const GeomAPI_Shape::ShapeType theType,
+ const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theMapOfSubShapes,
+ const std::string theName,
+ int& theShapeIndex,
+ int& theTag);
+
//=================================================================================================
-void FeaturesPlugin_CompositeSketch::initAttributes()
+void FeaturesPlugin_CompositeSketch::initCompositeSketchAttribtues(const int theInitFlags)
{
- data()->addAttribute(SKETCH_OBJECT_ID(), ModelAPI_AttributeReference::typeId());
- data()->addAttribute(SKETCH_SELECTION_ID(), ModelAPI_AttributeSelection::typeId());
- ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SKETCH_SELECTION_ID());
+ // Initialize sketch launcher.
+ if(theInitFlags & InitSketchLauncher) {
+ data()->addAttribute(SKETCH_ID(), ModelAPI_AttributeReference::typeId());
+ ModelAPI_Session::get()->validators()->registerNotObligatory(getKind(), SKETCH_ID());
+ }
- initMakeSolidsAttributes();
+ // Initialize selection list.
+ if(theInitFlags & InitBaseObjectsList) {
+ data()->addAttribute(BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList::typeId());
+ }
}
//=================================================================================================
std::shared_ptr<ModelAPI_Feature> FeaturesPlugin_CompositeSketch::addFeature(std::string theID)
{
- std::shared_ptr<ModelAPI_Feature> aNew = document()->addFeature(theID, false);
- if (aNew) {
- data()->reference(SKETCH_OBJECT_ID())->setValue(aNew);
+ FeaturePtr aNew = document()->addFeature(theID, false);
+ if(aNew) {
+ data()->reference(SKETCH_ID())->setValue(aNew);
}
- // set as current also after it becomes sub to set correctly enabled for other sketch subs
+
+ // Set as current also after it becomes sub to set correctly enabled for other sketch subs.
document()->setCurrentFeature(aNew, false);
return aNew;
}
//=================================================================================================
int FeaturesPlugin_CompositeSketch::numberOfSubs(bool forTree) const
{
- ObjectPtr aObj = data()->reference(SKETCH_OBJECT_ID())->value();
- return aObj.get()? 1 : 0;
+ ObjectPtr aObj = data()->reference(SKETCH_ID())->value();
+ return aObj.get() ? 1 : 0;
}
//=================================================================================================
-std::shared_ptr<ModelAPI_Feature> FeaturesPlugin_CompositeSketch::subFeature(const int theIndex, bool forTree)
+std::shared_ptr<ModelAPI_Feature> FeaturesPlugin_CompositeSketch::subFeature(const int theIndex,
+ bool forTree)
{
- if (theIndex == 0)
- return std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_OBJECT_ID())->value());
+ if(theIndex == 0) {
+ return std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_ID())->value());
+ }
+
return std::shared_ptr<ModelAPI_Feature>();
}
//=================================================================================================
int FeaturesPlugin_CompositeSketch::subFeatureId(const int theIndex) const
{
- if (theIndex == 0) {
- FeaturePtr aFeature =
- std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_OBJECT_ID())->value());
- if (aFeature.get())
+ if(theIndex == 0) {
+ FeaturePtr aFeature =
+ std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_ID())->value());
+ if(aFeature.get()) {
return aFeature->data()->featureId();
+ }
}
+
return -1;
}
//=================================================================================================
bool FeaturesPlugin_CompositeSketch::isSub(ObjectPtr theObject) const
{
- // check is this feature of result
+ // Check is this feature of result
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
- if (!aFeature)
+ if(!aFeature.get()) {
return false;
-
- ObjectPtr aSub = data()->reference(SKETCH_OBJECT_ID())->value();
+ }
+
+ ObjectPtr aSub = data()->reference(SKETCH_ID())->value();
return aSub == theObject;
}
//=================================================================================================
void FeaturesPlugin_CompositeSketch::removeFeature(std::shared_ptr<ModelAPI_Feature> theFeature)
{
+ AttributeSelectionListPtr aBaseObjectsSelectionList = selectionList(BASE_OBJECTS_ID());
+ if(aBaseObjectsSelectionList.get() && aBaseObjectsSelectionList->size() > 0) {
+ aBaseObjectsSelectionList->clear();
+ }
+
+ reference(SKETCH_ID())->setValue(ObjectPtr());
}
//=================================================================================================
-void FeaturesPlugin_CompositeSketch::erase()
+void FeaturesPlugin_CompositeSketch::getBaseShapes(ListOfShape& theBaseShapesList,
+ const bool theIsMakeShells)
{
- if (data().get() && data()->isValid()) { // on abort of sketch of this composite it may be invalid
- FeaturePtr aSketch =
- std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_OBJECT_ID())->value());
- if (aSketch.get() && aSketch->data()->isValid()) {
- document()->removeFeature(aSketch);
+ theBaseShapesList.clear();
+
+ ListOfShape aBaseFacesList;
+ std::map<ResultConstructionPtr, ListOfShape> aSketchWiresMap;
+ AttributeSelectionListPtr aBaseObjectsSelectionList = selectionList(BASE_OBJECTS_ID());
+ if(!aBaseObjectsSelectionList.get()) {
+ setError("Error: Could not get base objects selection list.");
+ return;
+ }
+ if(aBaseObjectsSelectionList->size() == 0) {
+ setError("Error: Base objects list is empty.");
+ return;
+ }
+ for(int anIndex = 0; anIndex < aBaseObjectsSelectionList->size(); anIndex++) {
+ AttributeSelectionPtr aBaseObjectSelection = aBaseObjectsSelectionList->value(anIndex);
+ if(!aBaseObjectSelection.get()) {
+ setError("Error: Selected base object is empty.");
+ return;
+ }
+ GeomShapePtr aBaseShape = aBaseObjectSelection->value();
+ if(aBaseShape.get() && !aBaseShape->isNull()) {
+ GeomAPI_Shape::ShapeType aST = aBaseShape->shapeType();
+ if(aST == GeomAPI_Shape::SOLID || aST == GeomAPI_Shape::COMPSOLID) {
+ setError("Error: Selected shapes has unsupported type.");
+ return;
+ }
+ ResultConstructionPtr aConstruction =
+ std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(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);
+ }
+ } else {
+ // This may be the whole sketch result selected, check and get faces.
+ ResultConstructionPtr aConstruction =
+ std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aBaseObjectSelection->context());
+ if(!aConstruction.get()) {
+ setError("Error: Selected sketches does not have results.");
+ return;
+ }
+ int aFacesNum = aConstruction->facesNum();
+ if(aFacesNum == 0) {
+ // Probably it can be construction.
+ 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 &&
+ aST != GeomAPI_Shape::FACE && aST != GeomAPI_Shape::SHELL) {
+ setError("Error: Selected shapes has unsupported type.");
+ return;
+ }
+ aST == GeomAPI_Shape::FACE ? aBaseFacesList.push_back(aBaseShape) :
+ theBaseShapesList.push_back(aBaseShape);
+ }
+ } else {
+ for(int aFaceIndex = 0; aFaceIndex < aFacesNum; aFaceIndex++) {
+ GeomShapePtr aBaseFace = aConstruction->face(aFaceIndex);
+ if(!aBaseFace.get() || aBaseFace->isNull()) {
+ setError("Error: One of the faces on selected sketch is null.");
+ return;
+ }
+ aBaseFacesList.push_back(aBaseFace);
+ }
+ }
}
}
- ModelAPI_CompositeFeature::erase();
-}
+ // Make faces from sketch wires.
+ for(std::map<ResultConstructionPtr, ListOfShape>::const_iterator anIt = aSketchWiresMap.cbegin();
+ anIt != aSketchWiresMap.cend(); ++anIt) {
+ const std::shared_ptr<GeomAPI_PlanarEdges> aSketchPlanarEdges =
+ std::dynamic_pointer_cast<GeomAPI_PlanarEdges>((*anIt).first->shape());
+ const ListOfShape& aWiresList = (*anIt).second;
+ ListOfShape aFaces;
+ GeomAlgoAPI_ShapeTools::makeFacesWithHoles(aSketchPlanarEdges->origin(),
+ aSketchPlanarEdges->norm(),
+ aWiresList,
+ aFaces);
+ aBaseFacesList.insert(aBaseFacesList.end(), aFaces.begin(), aFaces.end());
+ }
+
+ // Searching faces with common edges.
+ if(theIsMakeShells && aBaseFacesList.size() > 1) {
+ ListOfShape aShells;
+ ListOfShape aFreeFaces;
+ GeomShapePtr aFacesCompound = GeomAlgoAPI_CompoundBuilder::compound(aBaseFacesList);
+ 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());
+ }
+}
//=================================================================================================
-void FeaturesPlugin_CompositeSketch::execute()
+bool FeaturesPlugin_CompositeSketch::isMakeShapeValid(
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape)
{
- // Getting faces to create solids.
- std::shared_ptr<ModelAPI_Feature> aSketchFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(
- reference(SKETCH_OBJECT_ID())->value());
- if(!aSketchFeature || aSketchFeature->results().empty()) {
- return;
- }
- ResultPtr aSketchRes = aSketchFeature->results().front();
- ResultConstructionPtr aConstruction = std::dynamic_pointer_cast<ModelAPI_ResultConstruction>(aSketchRes);
- if(!aConstruction.get()) {
- return;
+ // Check that algo is done.
+ if(!theMakeShape->isDone()) {
+ setError("Error: " + getKind() + " algorithm failed.");
+ return false;
}
- if (!selection(SKETCH_SELECTION_ID())->isInitialized() || selection(SKETCH_SELECTION_ID())->context() != aSketchRes) {
- selection(SKETCH_SELECTION_ID())->setValue(aSketchRes, std::shared_ptr<GeomAPI_Shape>());
- }
- int aSketchFacesNum = aConstruction->facesNum();
- if(aSketchFacesNum == 0) {
- return;
+ // Check if shape is not null.
+ if(!theMakeShape->shape().get() || theMakeShape->shape()->isNull()) {
+ setError("Error: Resulting shape is null.");
+ return false;
}
- ListOfShape aFacesList;
- for(int aFaceIndex = 0; aFaceIndex < aSketchFacesNum; aFaceIndex++) {
- std::shared_ptr<GeomAPI_Shape> aFace = std::dynamic_pointer_cast<GeomAPI_Shape>(aConstruction->face(aFaceIndex));
- aFacesList.push_back(aFace);
+
+ // Check that resulting shape is valid.
+ if(!theMakeShape->isValid()) {
+ setError("Error: Resulting shape is not valid.");
+ return false;
}
- // Searching faces with common edges.
- ListOfShape aShells;
- ListOfShape aFreeFaces;
- std::shared_ptr<GeomAPI_Shape> aFacesCompound = GeomAlgoAPI_CompoundBuilder::compound(aFacesList);
- GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, aShells, aFreeFaces);
- aShells.insert(aShells.end(), aFreeFaces.begin(), aFreeFaces.end());
-
- // Generating result for each shell and face.
- int aErrorsNum = 0;
- int aResultIndex = 0;
- for(ListOfShape::const_iterator anIter = aShells.cbegin(); anIter != aShells.cend(); anIter++) {
- std::shared_ptr<GeomAPI_Shape> aResult;
- ListOfShape aFromFaces, aToFaces;
- std::shared_ptr<GeomAlgoAPI_MakeShape> aMakeShape;
- std::shared_ptr<GeomAPI_DataMapOfShapeShape> aDataMap;
-
- std::shared_ptr<GeomAPI_Shape> aBaseFace = *anIter;
- makeSolid(aBaseFace, aResult, aFromFaces, aToFaces, aMakeShape, aDataMap);
- if(!aResult.get()) {
- aErrorsNum++;
- continue;
+ return true;
+}
+
+//=================================================================================================
+void FeaturesPlugin_CompositeSketch::storeResult(const GeomShapePtr theBaseShape,
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+ const int theIndex)
+{
+ // Create result body.
+ ResultBodyPtr aResultBody = document()->createBody(data(), theIndex);
+
+ // Store generated shape.
+ aResultBody->storeGenerated(theBaseShape, theMakeShape->shape());
+
+ // Store generated edges/faces.
+ int aGenTag = 1;
+ storeGenerationHistory(aResultBody, theBaseShape, theMakeShape, aGenTag);
+
+ setResult(aResultBody, theIndex);
+}
+
+//=================================================================================================
+void FeaturesPlugin_CompositeSketch::storeGenerationHistory(ResultBodyPtr theResultBody,
+ const GeomShapePtr theBaseShape,
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+ int& theTag)
+{
+ GeomAPI_Shape::ShapeType aBaseShapeType = theBaseShape->shapeType();
+ GeomAPI_Shape::ShapeType aShapeTypeToExplode = GeomAPI_Shape::SHAPE;
+ std::string aGenName = "Generated_";
+
+ std::shared_ptr<GeomAPI_DataMapOfShapeShape> aMapOfSubShapes = theMakeShape->mapOfSubShapes();
+ switch(aBaseShapeType) {
+ case GeomAPI_Shape::EDGE: {
+ aShapeTypeToExplode = GeomAPI_Shape::VERTEX;
+ break;
+ }
+ case GeomAPI_Shape::WIRE: {
+ //std::shared_ptr<GeomAPI_Vertex> 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::COMPOUND;
+ break;
+ }
+ case GeomAPI_Shape::FACE:
+ case GeomAPI_Shape::SHELL: {
+ aShapeTypeToExplode = GeomAPI_Shape::EDGE;
+ break;
+ }
+ case GeomAPI_Shape::COMPOUND: {
+ aShapeTypeToExplode = GeomAPI_Shape::COMPOUND;
}
+ }
- ResultBodyPtr aResultBody = document()->createBody(data(), aResultIndex);
- loadNamingDS(aResultBody, aBaseFace, aResult, aFromFaces, aToFaces, aMakeShape, aDataMap);
- setResult(aResultBody, aResultIndex);
- aResultIndex++;
+ 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());
}
+ // issue #2197: make naming of edges generated from vertices
+ if (aShapeTypeToExplode == GeomAPI_Shape::EDGE) {
+ GeomAPI_DataMapOfShapeShape aFacesFromFromEdges;
+ GeomAPI_ShapeExplorer anEdgeExp(theBaseShape, GeomAPI_Shape::EDGE);
+ for(; anEdgeExp.more(); anEdgeExp.next()) {
+ ListOfShape aGenerated;
+ theMakeShape->generated(anEdgeExp.current(), aGenerated);
+ ListOfShape::iterator aGenIter = aGenerated.begin();
+ for(; aGenIter != aGenerated.end(); aGenIter++) {
+ GeomShapePtr aGen = *aGenIter;
+ if (aGen.get() && !aGen->isNull()) {
+ if ((*aGenIter)->shapeType() == GeomAPI_Shape::FACE) { // normal case
+ aFacesFromFromEdges.bind(aGen, anEdgeExp.current());
+ }
+ }
+ }
+ }
+
+ // closed revolution of 1-3 faces can not distinguish lateral and base edges
+ if (aFacesFromFromEdges.size() <= 3) {
+ bool isClosed = false; // lateral edges are closed (in full revolution)
+ GeomAPI_DataMapOfShapeShape anEdgesFromVertices;
+ GeomAPI_ShapeExplorer aVertExp(theBaseShape, GeomAPI_Shape::VERTEX);
+ for(; aVertExp.more(); aVertExp.next()) {
+ ListOfShape aGenerated;
+ theMakeShape->generated(aVertExp.current(), aGenerated);
+ ListOfShape::iterator aGenIter = aGenerated.begin();
+ for(; aGenIter != aGenerated.end(); aGenIter++) {
+ std::shared_ptr<GeomAPI_Shape> aGenerated = *aGenIter;
+ if (anEdgesFromVertices.isBound(aGenerated)) // already here
+ continue;
+ std::ostringstream aStream;
+ aStream<<"Lateral_"<<theTag++;
+ theResultBody->generated(aGenerated, aStream.str(), theTag++);
- if(aErrorsNum > 0) {
- std::ostringstream aStringStream;
- aStringStream << "Warning: could not create solid(s) from " << aErrorsNum << " face(s).";
- setError(aStringStream.str());
+ anEdgesFromVertices.bind(aGenerated, aVertExp.current());
+ std::shared_ptr<GeomAPI_Edge> anEdge(new GeomAPI_Edge(aGenerated));
+ isClosed = isClosed || anEdge->isClosed();
+ }
+ }
+ if (isClosed) {
+ GeomAPI_ShapeExplorer anEdgesExp(theMakeShape->shape(), GeomAPI_Shape::EDGE);
+ for(; anEdgesExp.more(); anEdgesExp.next()) {
+ if (!anEdgesFromVertices.isBound(anEdgesExp.current())) {
+ // found a base edge
+ std::ostringstream aStream;
+ aStream<<"Base_Edge_"<<theTag++;
+ theResultBody->generated(anEdgesExp.current(), aStream.str(), theTag++);
+ // only one orientation is needed
+ anEdgesFromVertices.bind(anEdgesExp.current(), anEdgesExp.current());
+ }
+ }
+ } else if (aFacesFromFromEdges.size() == 1) { // 2233: sphere created by the revolution:
+ // vertices at degenerated edges will have the same name
+ GeomAPI_DataMapOfShapeShape aVertices;
+ GeomAPI_ShapeExplorer aVertExp(theMakeShape->shape(), GeomAPI_Shape::VERTEX);
+ for(int anIndex = 1; aVertExp.more(); aVertExp.next()) {
+ if (!aVertices.isBound(aVertExp.current())) {
+ // found a base edge
+ std::ostringstream aStream;
+ aStream<<"Vertex_"<<theTag++;
+ theResultBody->generated(aVertExp.current(), aStream.str(), theTag++);
+ // only one orientation is needed
+ aVertices.bind(aVertExp.current(), aVertExp.current());
+ }
+ }
+ }
+ } else { // issue #2197, test case 4 : edges that produce fully-revolved face,
+ // but contain only 2 edges (on apex of revolution)
+ GeomAPI_ShapeExplorer anEdgeExp(theBaseShape, GeomAPI_Shape::EDGE);
+ for(; anEdgeExp.more(); anEdgeExp.next()) {
+ ListOfShape aGenerated;
+ theMakeShape->generated(anEdgeExp.current(), aGenerated);
+ ListOfShape::iterator aGenIter = aGenerated.begin();
+ for(; aGenIter != aGenerated.end(); aGenIter++) {
+ GeomShapePtr aGen = (*aGenIter);
+ if (aGen.get() && !aGen->isNull()) {
+ GeomAPI_ShapeExplorer aFaceEdgeExp(aGen, GeomAPI_Shape::EDGE);
+ int aNumEdges = 0;
+ int aNumClosed = 0;
+ GeomShapePtr aNotClosedEdge;
+ GeomEdgePtr aDegenerateEdge;
+ GeomAPI_DataMapOfShapeShape alreadyIterated;
+ for(; aFaceEdgeExp.more(); aFaceEdgeExp.next()) {
+ std::shared_ptr<GeomAPI_Edge> anEdge(new GeomAPI_Edge(aFaceEdgeExp.current()));
+ if (anEdge->isDegenerated()) {
+ aDegenerateEdge = anEdge;
+ continue;
+ }
+ if (alreadyIterated.isBound(anEdge))
+ continue;
+ alreadyIterated.bind(anEdge, anEdge);
+ aNumEdges++;
+ if (anEdge->isClosed()) {
+ aNumClosed++;
+ } else {
+ aNotClosedEdge = anEdge;
+ }
+ }
+ if (aNumEdges == 2 && aNumClosed == 1) {
+ std::ostringstream aStream;
+ aStream<<"Base_Edge_"<<theTag++;
+ theResultBody->generated(aNotClosedEdge, aStream.str(), theTag++);
+ if (aDegenerateEdge.get()) { // export vertex of the degenerated edge (apex) #2520
+ GeomAPI_ShapeExplorer anEdgeExp(aDegenerateEdge, GeomAPI_Shape::VERTEX);
+ if (anEdgeExp.more()) {
+ std::ostringstream aStream;
+ aStream << "Base_Vertex_" << theTag++;
+ theResultBody->generated(anEdgeExp.current(), aStream.str(), theTag++);
+ }
+ }
+ }
+ }
+ }
+ }
+ }
}
- // Remove the rest results if there were produced in the previous pass.
- removeResults(aResultIndex);
+ std::shared_ptr<GeomAlgoAPI_MakeSweep> aMakeSweep =
+ std::dynamic_pointer_cast<GeomAlgoAPI_MakeSweep>(theMakeShape);
+ if(aMakeSweep.get()) {
+ // Store from shapes.
+ storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes,
+ aMakeSweep->fromShapes(), "From_", theTag);
+
+ // Store to shapes.
+ storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes,
+ aMakeSweep->toShapes(), "To_", theTag);
+ }
}
//=================================================================================================
-void FeaturesPlugin_CompositeSketch::loadNamingDS(std::shared_ptr<ModelAPI_ResultBody> theResultBody,
- const std::shared_ptr<GeomAPI_Shape>& theBaseShape,
- const std::shared_ptr<GeomAPI_Shape>& theResult,
- const ListOfShape& theFromFaces,
- const ListOfShape& theToFaces,
- const std::shared_ptr<GeomAlgoAPI_MakeShape>& theMakeShape,
- const std::shared_ptr<GeomAPI_DataMapOfShapeShape>& theDataMap)
+void FeaturesPlugin_CompositeSketch::storeShapes(ResultBodyPtr theResultBody,
+ const GeomAPI_Shape::ShapeType theBaseShapeType,
+ const std::shared_ptr<GeomAPI_DataMapOfShapeShape> theMapOfSubShapes,
+ const ListOfShape& theShapes,
+ const std::string theName,
+ int& theTag)
{
- //load result
- theResultBody->storeGenerated(theBaseShape, theResult);
-
- //Insert lateral face : Face from Edge
- const std::string aLatName = "LateralFace";
- const int aLatTag = 1;
- theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), theBaseShape, GeomAPI_Shape::EDGE, aLatTag, aLatName, *theDataMap);
-
- //Insert to faces
- const std::string aToName = "ToFace";
- int aToTag = 2;
- for(ListOfShape::const_iterator anIt = theToFaces.cbegin(); anIt != theToFaces.cend(); anIt++) {
- std::shared_ptr<GeomAPI_Shape> aToFace = *anIt;
- if(theDataMap->isBound(aToFace)) {
- aToFace = theDataMap->find(aToFace);
+ GeomAPI_Shape::ShapeType aShapeTypeToExplore = GeomAPI_Shape::FACE;
+ std::string aShapeTypeStr = "Face";
+ switch(theBaseShapeType) {
+ case GeomAPI_Shape::VERTEX: {
+ aShapeTypeToExplore = GeomAPI_Shape::VERTEX;
+ aShapeTypeStr = "Vertex";
+ break;
+ }
+ case GeomAPI_Shape::EDGE:
+ case GeomAPI_Shape::WIRE: {
+ aShapeTypeToExplore = GeomAPI_Shape::EDGE;
+ aShapeTypeStr = "Edge";
+ break;
+ }
+ case GeomAPI_Shape::FACE:
+ case GeomAPI_Shape::SHELL: {
+ aShapeTypeToExplore = GeomAPI_Shape::FACE;
+ aShapeTypeStr = "Face";
+ break;
+ }
+ case GeomAPI_Shape::COMPOUND: {
+ aShapeTypeToExplore = GeomAPI_Shape::COMPOUND;
+ break;
+ }
+ }
+
+ // Store shapes.
+ int aShapeIndex = 1;
+ int aFaceIndex = 1;
+ for(ListOfShape::const_iterator anIt = theShapes.cbegin(); anIt != theShapes.cend(); ++anIt) {
+ GeomShapePtr aShape = *anIt;
+
+ 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);
+ if (theBaseShapeType == GeomAPI_Shape::WIRE) { // issue 2289: special names also for vertices
+ aName = theName + "Vertex";
+ storeSubShape(theResultBody, aShape, GeomAPI_Shape::VERTEX,
+ theMapOfSubShapes, aName, aShapeIndex, theTag);
+ }
}
- theResultBody->generated(aToFace, aToName, aToTag++);
}
+}
- //Insert from faces
- const std::string aFromName = "FromFace";
- int aFromTag = aToTag > 10000 ? aToTag : 10000;
- for(ListOfShape::const_iterator anIt = theFromFaces.cbegin(); anIt != theFromFaces.cend(); anIt++) {
- std::shared_ptr<GeomAPI_Shape> aFromFace = *anIt;
- if(theDataMap->isBound(aFromFace)) {
- aFromFace = theDataMap->find(aFromFace);
+void storeSubShape(ResultBodyPtr theResultBody,
+ const GeomShapePtr theShape,
+ const GeomAPI_Shape::ShapeType theType,
+ const std::shared_ptr<GeomAPI_DataMapOfShapeShape> 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);
}
- theResultBody->generated(aFromFace, aFromName, aFromTag++);
+ std::ostringstream aStr;
+ aStr << theName << "_" << theShapeIndex++;
+ theResultBody->generated(aSubShape, aStr.str(), theTag++);
}
}
