-// Copyright (C) 2014-2019 CEA/DEN, EDF R&D
+// 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
//
#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_Revolution.h>
-#include <GeomAlgoAPI_ShapeTools.h>
-#include <GeomAlgoAPI_SketchBuilder.h>
-#include <GeomAPI_PlanarEdges.h>
#include <GeomAPI_ShapeExplorer.h>
-#include <map>
-#include <sstream>
+
+static const std::string COMPOSITESKETCH_VERSION_1("v9.6");
static void storeSubShape(const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
ResultBodyPtr theResultBody,
// 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)
+ bool /*forTree*/)
{
FeaturePtr aSubFeature;
if(theIndex == 0) {
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) {
- GeomShapePtr aFacesCompound = GeomAlgoAPI_CompoundBuilder::compound(aBaseFacesList);
- GeomAlgoAPI_ShapeTools::combineShapes(aFacesCompound, GeomAPI_Shape::SHELL, theBaseShapesList);
- } else {
- theBaseShapesList.insert(theBaseShapesList.end(), aBaseFacesList.begin(),
- aBaseFacesList.end());
- }
+ std::string anError;
+ bool isOk = FeaturesPlugin_Tools::getShape(
+ aBaseObjectsSelectionList, theIsMakeShells, theBaseShapesList, anError);
+ if (!isOk)
+ setError(anError);
}
//=================================================================================================
case GeomAPI_Shape::COMPOUND: {
aShapeTypeToExplode = GeomAPI_Shape::COMPOUND;
}
+ default: // [to avoid compilation warnings]
+ break;
}
- int aLateralIndex = 1;
- int aBaseEdgeIndex = 1;
- int aVertexIndex = 1;
- int aBaseVertexIndex = 1;
-
if(aShapeTypeToExplode == GeomAPI_Shape::VERTEX ||
aShapeTypeToExplode == GeomAPI_Shape::COMPOUND) {
theResultBody->loadGeneratedShapes(theMakeShape, theBaseShape, GeomAPI_Shape::VERTEX);
aShapeTypeToExplore = GeomAPI_Shape::COMPOUND;
break;
}
+ default: // [to avoid compilation warnings]
+ break;
}
// Store shapes.
for(GeomAPI_ShapeExplorer anExp(theShape, theType); anExp.more(); anExp.next()) {
GeomShapePtr aSubShape = anExp.current();
if (!theResultBody->generated(aSubShape, theName)) {
- // 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);
+ 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);
+ }
}
}
}
