-// Copyright (C) 2014-2017 CEA/DEN, EDF R&D
+// Copyright (C) 2014-2022 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
//
// 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
+// 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>
+// See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
//
#include "FeaturesPlugin_Extrusion.h"
#include <ModelAPI_AttributeString.h>
#include <ModelAPI_Session.h>
#include <ModelAPI_Validator.h>
+#include <ModelAPI_Tools.h>
#include <GeomAlgoAPI_Prism.h>
#include <GeomAlgoAPI_Tools.h>
//=================================================================================================
void FeaturesPlugin_Extrusion::execute()
{
- ListOfShape aBaseShapesList;
+ ListOfShape aBaseShapesList, aBoundaryShapes;
ListOfMakeShape aMakeShapesList;
// Make extrusions.
- if(!makeExtrusions(aBaseShapesList, aMakeShapesList)) {
+ if(!makeExtrusions(aBaseShapesList, aBoundaryShapes, aMakeShapesList)) {
return;
}
ListOfMakeShape::const_iterator anAlgoIt = aMakeShapesList.cbegin();
for(; aBaseIt != aBaseShapesList.cend() && anAlgoIt != aMakeShapesList.cend();
++aBaseIt, ++anAlgoIt) {
- storeResult(*aBaseIt, *anAlgoIt, aResultIndex++);
+ if (aBoundaryShapes.empty())
+ storeResult(*aBaseIt, *anAlgoIt, aResultIndex++);
+ else
+ storeResultWithBoundaries(*aBaseIt, aBoundaryShapes, *anAlgoIt, aResultIndex++);
}
removeResults(aResultIndex);
//=================================================================================================
bool FeaturesPlugin_Extrusion::makeExtrusions(ListOfShape& theBaseShapes,
+ ListOfShape& theBoundaryShapes,
ListOfMakeShape& theMakeShapes)
{
theMakeShapes.clear();
getBaseShapes(theBaseShapes);
//Getting direction.
- static const std::string aSelectionError = "Error: The direction shape selection is bad.";
- AttributeSelectionPtr aSelection = selection(DIRECTION_OBJECT_ID());
- GeomShapePtr aShape = aSelection->value();
- if (!aShape.get()) {
- if (aSelection->context().get()) {
- aShape = aSelection->context()->shape();
- }
- }
-
- GeomEdgePtr anEdge;
- if (aShape.get()) {
- if (aShape->isEdge())
- {
- anEdge = aShape->edge();
- }
- else if (aShape->isCompound())
- {
- GeomAPI_ShapeIterator anIt(aShape);
- anEdge = anIt.current()->edge();
- }
- }
-
std::shared_ptr<GeomAPI_Dir> aDir;
- if(anEdge.get()) {
- if(anEdge->isLine()) {
- aDir = anEdge->line()->direction();
- }
- }
+ getDirection(aDir);
// Getting sizes.
double aToSize = 0.0;
double aFromSize = 0.0;
-
- if(string(CREATION_METHOD())->value() == CREATION_METHOD_BY_SIZES()) {
- aToSize = real(TO_SIZE_ID())->value();
- aFromSize = real(FROM_SIZE_ID())->value();
- } else {
- aToSize = real(TO_OFFSET_ID())->value();
- aFromSize = real(FROM_OFFSET_ID())->value();
- }
+ getSizes(aToSize, aFromSize);
// Getting bounding planes.
GeomShapePtr aToShape;
GeomShapePtr aFromShape;
if(string(CREATION_METHOD())->value() == CREATION_METHOD_BY_PLANES()) {
- aSelection = selection(TO_OBJECT_ID());
+ AttributeSelectionPtr aSelection = selection(TO_OBJECT_ID());
if(aSelection.get()) {
aToShape = std::dynamic_pointer_cast<GeomAPI_Shape>(aSelection->value());
if(!aToShape.get() && aSelection->context().get()) {
}
}
}
+ if (aToShape && !aToShape->isPlanar())
+ theBoundaryShapes.push_back(aToShape);
+ if (aFromShape && !aFromShape->isPlanar())
+ theBoundaryShapes.push_back(aFromShape);
// Generating result for each base shape.
std::string anError;
return true;
}
+
+//=================================================================================================
+void FeaturesPlugin_Extrusion::storeResultWithBoundaries(
+ const GeomShapePtr theBaseShape,
+ const ListOfShape& theBoundaryShapes,
+ const std::shared_ptr<GeomAlgoAPI_MakeShape> theMakeShape,
+ const int theIndex)
+{
+ // Create result body.
+ ResultBodyPtr aResultBody = document()->createBody(data(), theIndex);
+
+ // Store modified shapes.
+ ModelAPI_Tools::loadModifiedShapes(aResultBody, theBoundaryShapes, ListOfShape(),
+ theMakeShape, theMakeShape->shape());
+
+ // Store generated edges/faces.
+ storeGenerationHistory(aResultBody, theBaseShape, theMakeShape);
+
+ setResult(aResultBody, theIndex);
+}
+
+//=================================================================================================
+void FeaturesPlugin_Extrusion::getDirection(std::shared_ptr<GeomAPI_Dir>& theDir)
+{
+ static const std::string aSelectionError = "Error: The direction shape selection is bad.";
+ AttributeSelectionPtr aSelection = selection(DIRECTION_OBJECT_ID());
+ GeomShapePtr aShape = aSelection->value();
+ if (!aShape.get()) {
+ if (aSelection->context().get()) {
+ aShape = aSelection->context()->shape();
+ }
+ }
+
+ GeomEdgePtr anEdge;
+ if (aShape.get()) {
+ if (aShape->isEdge())
+ {
+ anEdge = aShape->edge();
+ }
+ else if (aShape->isCompound())
+ {
+ GeomAPI_ShapeIterator anIt(aShape);
+ anEdge = anIt.current()->edge();
+ }
+ }
+
+ if (anEdge.get()) {
+ if (anEdge->isLine()) {
+ theDir = anEdge->line()->direction();
+ }
+ }
+}
+
+//=================================================================================================
+void FeaturesPlugin_Extrusion::getSizes(double& theToSize, double& theFromSize)
+{
+ if (string(CREATION_METHOD())->value() == CREATION_METHOD_BY_SIZES()) {
+ theToSize = real(TO_SIZE_ID())->value();
+ theFromSize = real(FROM_SIZE_ID())->value();
+ } else if (string(CREATION_METHOD())->value() == CREATION_METHOD_BY_PLANES()) {
+ theToSize = real(TO_OFFSET_ID())->value();
+ theFromSize = real(FROM_OFFSET_ID())->value();
+ } else {
+ }
+}
