-// Copyright (C) 2014-20xx CEA/DEN, EDF R&D
-
-// File: FeaturesPlugin_CompositeSketch.cpp
-// Created: 11 September 2015
-// Author: Dmitry Bobylev
+// Copyright (C) 2014-2023 CEA, EDF
+//
+// 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
+//
#include <FeaturesPlugin_CompositeSketch.h>
+#include <FeaturesPlugin_Tools.h>
#include <ModelAPI_AttributeSelectionList.h>
#include <ModelAPI_AttributeReference.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
-#include <GeomAlgoAPI_CompoundBuilder.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,
+static const std::string COMPOSITESKETCH_VERSION_1("v9.6");
+
+static void storeSubShape(const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+ 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);
+ const std::string& theName);
//=================================================================================================
void FeaturesPlugin_CompositeSketch::initCompositeSketchAttribtues(const int theInitFlags)
// Initialize selection list.
if(theInitFlags & InitBaseObjectsList) {
- data()->addAttribute(BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList::typeId());
+ AttributeSelectionListPtr anObjectsAttr =
+ std::dynamic_pointer_cast<ModelAPI_AttributeSelectionList>(
+ data()->addAttribute(BASE_OBJECTS_ID(), ModelAPI_AttributeSelectionList::typeId()));
+ myCurrentSelectionType = selectionList(BASE_OBJECTS_ID())->selectionType();
+ anObjectsAttr->setWholeResultAllowed(true);
+ if (!anObjectsAttr->isInitialized()) {
+ // new feature, specify the version
+ data()->setVersion(COMPOSITESKETCH_VERSION_1);
+ }
}
}
}
//=================================================================================================
-int FeaturesPlugin_CompositeSketch::numberOfSubs(bool forTree) const
+int FeaturesPlugin_CompositeSketch::numberOfSubs(bool /*forTree*/) const
{
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*/)
{
+ FeaturePtr aSubFeature;
if(theIndex == 0) {
- return std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_ID())->value());
+ aSubFeature =
+ std::dynamic_pointer_cast<ModelAPI_Feature>(data()->reference(SKETCH_ID())->value());
}
-
- return std::shared_ptr<ModelAPI_Feature>();
+ return aSubFeature;
}
//=================================================================================================
//=================================================================================================
bool FeaturesPlugin_CompositeSketch::isSub(ObjectPtr theObject) const
{
+ bool isSubFeature = false;
// Check is this feature of result
FeaturePtr aFeature = std::dynamic_pointer_cast<ModelAPI_Feature>(theObject);
- if(!aFeature.get()) {
- return false;
+ if (aFeature.get()) {
+ ObjectPtr aSub = data()->reference(SKETCH_ID())->value();
+ isSubFeature = aSub == theObject;
}
-
- ObjectPtr aSub = data()->reference(SKETCH_ID())->value();
- return aSub == theObject;
+ return isSubFeature;
}
//=================================================================================================
void FeaturesPlugin_CompositeSketch::getBaseShapes(ListOfShape& theBaseShapesList,
const bool theIsMakeShells)
{
- 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);
- }
- }
- }
- }
-
- // 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());
- }
-}
-
-//=================================================================================================
-bool FeaturesPlugin_CompositeSketch::isMakeShapeValid(
- const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape)
-{
- // Check that algo is done.
- if(!theMakeShape->isDone()) {
- setError("Error: " + getKind() + " algorithm failed.");
- return false;
- }
-
- // Check if shape is not null.
- if(!theMakeShape->shape().get() || theMakeShape->shape()->isNull()) {
- setError("Error: Resulting shape is null.");
- return false;
- }
-
- // Check that resulting shape is valid.
- if(!theMakeShape->isValid()) {
- setError("Error: Resulting shape is not valid.");
- return false;
- }
-
- return true;
+ std::string anError;
+ bool isOk = FeaturesPlugin_Tools::getShape(
+ aBaseObjectsSelectionList, theIsMakeShells, theBaseShapesList, anError);
+ if (!isOk)
+ setError(anError);
}
//=================================================================================================
aResultBody->storeGenerated(theBaseShape, theMakeShape->shape());
// Store generated edges/faces.
- int aGenTag = 1;
- storeGenerationHistory(aResultBody, theBaseShape, theMakeShape, aGenTag);
+ storeGenerationHistory(aResultBody, theBaseShape, theMakeShape);
setResult(aResultBody, theIndex);
}
//=================================================================================================
void FeaturesPlugin_CompositeSketch::storeGenerationHistory(ResultBodyPtr theResultBody,
const GeomShapePtr theBaseShape,
- const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
- int& theTag)
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape)
{
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:
+ 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::VERTEX;
+ aShapeTypeToExplode = GeomAPI_Shape::COMPOUND;
break;
}
case GeomAPI_Shape::FACE:
case GeomAPI_Shape::COMPOUND: {
aShapeTypeToExplode = GeomAPI_Shape::COMPOUND;
}
+ default: // [to avoid compilation warnings]
+ break;
}
- if(aShapeTypeToExplode == GeomAPI_Shape::VERTEX ||
+ if(aShapeTypeToExplode == GeomAPI_Shape::VERTEX ||
aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
- theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(), theBaseShape,
- GeomAPI_Shape::VERTEX,
- theTag++, aGenName + "Edge",
- *aMapOfSubShapes.get());
+ theResultBody->loadGeneratedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::VERTEX);
}
- if(aShapeTypeToExplode == GeomAPI_Shape::EDGE ||
+ if(aShapeTypeToExplode == GeomAPI_Shape::EDGE ||
aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
- theResultBody->loadAndOrientGeneratedShapes(theMakeShape.get(),
- theBaseShape, GeomAPI_Shape::EDGE,
- theTag++, aGenName + "Face",
- *aMapOfSubShapes.get());
+ theResultBody->loadGeneratedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::EDGE);
}
-
- std::shared_ptr<GeomAlgoAPI_MakeSweep> aMakeSweep =
+ std::list<std::shared_ptr<GeomAlgoAPI_MakeSweep> > aSweeps; // all sweeps collected
+ std::shared_ptr<GeomAlgoAPI_MakeSweep> aMakeSweep =
std::dynamic_pointer_cast<GeomAlgoAPI_MakeSweep>(theMakeShape);
if(aMakeSweep.get()) {
+ aSweeps.push_back(aMakeSweep);
+ } else {
+ std::shared_ptr<GeomAlgoAPI_MakeShapeList> aMakeList =
+ std::dynamic_pointer_cast<GeomAlgoAPI_MakeShapeList>(theMakeShape);
+ if (aMakeList.get()) {
+ ListOfMakeShape::const_iterator anIter = aMakeList->list().cbegin();
+ for(; anIter != aMakeList->list().cend(); anIter++) {
+ std::shared_ptr<GeomAlgoAPI_MakeSweep> aSweep =
+ std::dynamic_pointer_cast<GeomAlgoAPI_MakeSweep>(*anIter);
+ if (aSweep.get())
+ aSweeps.push_back(aSweep);
+ }
+ }
+ }
+ std::list<std::shared_ptr<GeomAlgoAPI_MakeSweep> >::iterator aSweep = aSweeps.begin();
+ for(; aSweep != aSweeps.end(); aSweep++) {
// Store from shapes.
- storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes,
- aMakeSweep->fromShapes(), "From_", theTag);
+ storeShapes(theMakeShape, theResultBody, aBaseShapeType, (*aSweep)->fromShapes(), "From_");
// Store to shapes.
- storeShapes(theResultBody, aBaseShapeType, aMapOfSubShapes,
- aMakeSweep->toShapes(), "To_", theTag);
+ storeShapes(theMakeShape, theResultBody, aBaseShapeType, (*aSweep)->toShapes(), "To_");
}
}
//=================================================================================================
-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)
+void FeaturesPlugin_CompositeSketch::storeShapes(
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+ ResultBodyPtr theResultBody,
+ const GeomAPI_Shape::ShapeType theBaseShapeType,
+ const ListOfShape& theShapes,
+ const std::string theName)
{
GeomAPI_Shape::ShapeType aShapeTypeToExplore = GeomAPI_Shape::FACE;
std::string aShapeTypeStr = "Face";
aShapeTypeToExplore = GeomAPI_Shape::COMPOUND;
break;
}
+ default: // [to avoid compilation warnings]
+ 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);
+ storeSubShape(theMakeShape, theResultBody, aShape, aShape->shapeType(), aName);
} else {
std::string aName = theName + aShapeTypeStr;
- storeSubShape(theResultBody, aShape, aShapeTypeToExplore,
- theMapOfSubShapes, aName, aShapeIndex, theTag);
+ storeSubShape(theMakeShape, theResultBody, aShape, aShapeTypeToExplore, aName);
+ if (theBaseShapeType == GeomAPI_Shape::WIRE) { // issue 2289: special names also for vertices
+ aName = theName + "Vertex";
+ storeSubShape(theMakeShape, theResultBody, aShape, GeomAPI_Shape::VERTEX, aName);
+ }
}
}
}
-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 storeSubShape(
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+ ResultBodyPtr theResultBody,
+ const GeomShapePtr theShape,
+ const GeomAPI_Shape::ShapeType theType,
+ const std::string& theName)
{
for(GeomAPI_ShapeExplorer anExp(theShape, theType); anExp.more(); anExp.next()) {
GeomShapePtr aSubShape = anExp.current();
- if(theMapOfSubShapes->isBound(aSubShape)) {
- aSubShape = theMapOfSubShapes->find(aSubShape);
+ if (!theResultBody->generated(aSubShape, theName)) {
+ int aNbSubs = theResultBody->numberOfSubs();
+ if (aNbSubs > 0) {
+ // check the modified shape is in the result body, don't store it if not
+ ListOfShape aNewShapes;
+ theMakeShape->modified(aSubShape, aNewShapes);
+ for (int i = 0; i < aNbSubs; ++i) {
+ ResultBodyPtr aSubRes = theResultBody->subResult(i);
+ GeomShapePtr aShape = aSubRes->shape();
+ ListOfShape::iterator aNewIt = aNewShapes.begin();
+ for (; aNewIt != aNewShapes.end(); ++aNewIt)
+ if (aShape->isSubShape(*aNewIt, false))
+ break;
+ if (aNewIt != aNewShapes.end()) {
+ // store from/to shapes as primitives and then store modification of them by the boolean
+ aSubRes->generated(aSubShape, theName, false);
+ aSubRes->loadModifiedShapes(theMakeShape, aSubShape, theType);
+ }
+ }
+ }
+ else {
+ // store from/to shapes as primitives and then store modification of them by the boolean
+ theResultBody->generated(aSubShape, theName, false);
+ theResultBody->loadModifiedShapes(theMakeShape, aSubShape, theType);
+ }
}
- std::ostringstream aStr;
- aStr << theName << "_" << theShapeIndex++;
- theResultBody->generated(aSubShape, aStr.str(), theTag++);
}
}
