#include <GeomAlgoAPI_GlueFaces.h>
#include <GeomAlgoAPI_Tools.h>
+#include <sstream>
+
//==================================================================================================
FeaturesPlugin_GlueFaces::FeaturesPlugin_GlueFaces()
ResultBodyPtr aResultBody = document()->createBody(data(), anIndex);
aResultBody->storeModified(aShapes, aResult, aGluingAlgo);
+ // Ensure the result body is named after this feature
+ std::wstring aBaseName = feature(aResultBody)->data()->name();
+ std::wostringstream aNameStr;
+ aNameStr << aBaseName << "_" << (anIndex+1);
+ std::wstring aName = aNameStr.str();
+ aResultBody->data()->setName(aName);
+
setResult(aResultBody, anIndex);
}
// Consider the list of input shapes the same as the result, if
// * the total number of faces did NOT change.
- int nbInputFaces = 0;
+ int nbInputFaces = 0, nbInputEdges = 0;
for (ListOfShape::const_iterator anIt = theInputs.cbegin();
anIt != theInputs.cend();
++anIt)
if (aShape.get())
{
nbInputFaces += aShape->subShapes(GeomAPI_Shape::FACE, true).size();
+ nbInputEdges += aShape->subShapes(GeomAPI_Shape::EDGE, true).size();
}
}
- int nbResultFaces = 0;
+ int nbResultFaces = 0, nbResultEdges = 0;
nbResultFaces = theResult->subShapes(GeomAPI_Shape::FACE, true).size();
- return(0 < nbResultFaces && nbResultFaces < nbInputFaces);
+ nbResultEdges = theResult->subShapes(GeomAPI_Shape::EDGE, true).size();
+ return(0 < nbResultFaces && ((nbResultFaces < nbInputFaces) || (nbResultFaces == nbInputFaces && nbResultEdges < nbInputEdges)));
}
//=================================================================================================
--- /dev/null
+# 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
+# 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
+#
+
+from salome.shaper import model
+from GeomAPI import GeomAPI_Shape
+
+aShapeTypes = {
+ GeomAPI_Shape.SOLID: "GeomAPI_Shape.SOLID",
+ GeomAPI_Shape.FACE: "GeomAPI_Shape.FACE",
+ GeomAPI_Shape.EDGE: "GeomAPI_Shape.EDGE",
+ GeomAPI_Shape.VERTEX: "GeomAPI_Shape.VERTEX"}
+
+def testNbUniqueSubShapes(theFeature, theShapeType, theExpectedNbSubShapes):
+ """ Tests number of unique feature sub-shapes of passed type for each result.
+ :param theFeature: feature to test.
+ :param theShapeType: shape type of sub-shapes to test.
+ :param theExpectedNbSubShapes: list of sub-shapes numbers. Size of list should be equal to len(theFeature.results()).
+ """
+ aResults = theFeature.feature().results()
+ aNbResults = len(aResults)
+ aListSize = len(theExpectedNbSubShapes)
+ assert (aNbResults == aListSize), "Number of results: {} not equal to list size: {}.".format(aNbResults, aListSize)
+ for anIndex in range(0, aNbResults):
+ aNbResultSubShapes = 0
+ anExpectedNbSubShapes = theExpectedNbSubShapes[anIndex]
+ aNbResultSubShapes = aResults[anIndex].shape().subShapes(theShapeType, True).size()
+ assert (aNbResultSubShapes == anExpectedNbSubShapes), "Number of sub-shapes of type {} for result[{}]: {}. Expected: {}.".format(aShapeTypes[theShapeType], anIndex, aNbResultSubShapes, anExpectedNbSubShapes)
+
+def testCompound(theFeature,theModel,NbSubRes,NbSolid,NbFace,NbEdge,NbVertex):
+ """ Tests numbers of unique sub-shapes in compound result
+ """
+ aResults = theFeature.feature().results()
+ aNbResults = len(aResults)
+ assert (aNbResults == 1), "Number of results: {} not equal to 1.".format(aNbResults)
+ assert aResults[0].shape().isCompound(), "Result shape type: {}. Expected: COMPOUND.".format(aResults[0].shape().shapeTypeStr())
+ theModel.testNbSubResults(theFeature, NbSubRes)
+ testNbUniqueSubShapes(theFeature, GeomAPI_Shape.SOLID, NbSolid)
+ testNbUniqueSubShapes(theFeature, GeomAPI_Shape.FACE, NbFace)
+ testNbUniqueSubShapes(theFeature, GeomAPI_Shape.EDGE, NbEdge)
+ testNbUniqueSubShapes(theFeature, GeomAPI_Shape.VERTEX, NbVertex)
+
+# Create document
+model.begin()
+partSet = model.moduleDocument()
+Part_1 = model.addPart(partSet)
+Part_1_doc = Part_1.document()
+
+# =============================================================================
+# Prepare all input shapes
+# =============================================================================
+Box_1 = model.addBox(Part_1_doc, 10, 10, 10)
+Box_2 = model.addBox(Part_1_doc, 10, 10, 10)
+Translation_1 = model.addTranslation(Part_1_doc, [model.selection("SOLID", "Box_2_1")], axis = model.selection("EDGE", "PartSet/OX"), distance = 10, keepSubResults = True)
+Copy_1_objects = [model.selection("FACE", "Box_1_1/Top"),
+ model.selection("FACE", "Translation_1_1/MF:Translated&Box_2_1/Top"),
+ model.selection("FACE", "Translation_1_1/MF:Translated&Box_2_1/Left")]
+Copy_1 = model.addCopy(Part_1_doc, Copy_1_objects, 1)
+Copy_1.result().setName("Box_1_1_1")
+Copy_1.results()[1].setName("Translation_1_1_1")
+Copy_1.results()[2].setName("Translation_1_1_2")
+model.do()
+
+# =============================================================================
+# Test 1. Glue faces of 2 adjacent solids
+# =============================================================================
+GlueFaces_1 = model.addGlueFaces(Part_1_doc, [model.selection("SOLID", "Translation_1_1"), model.selection("SOLID", "Box_1_1")], 1e-07, True)
+model.do()
+
+# gluing successful
+testCompound(GlueFaces_1, model, [2], [2], [11], [20], [12])
+
+# =============================================================================
+# Test 2. Glue faces for 2 faces with 1 common edge only
+# =============================================================================
+GlueFaces_2 = model.addGlueFaces(Part_1_doc, [model.selection("FACE", "Box_1_1_1"), model.selection("FACE", "Translation_1_1_1")], 1e-07, True)
+GlueFaces_2.result().setName("GlueFaces_2_1")
+GlueFaces_2.result().subResult(0).setName("GlueFaces_2_1_1")
+GlueFaces_2.result().subResult(1).setName("GlueFaces_2_1_2")
+model.do()
+
+# gluing successful
+testCompound(GlueFaces_2, model, [2], [0], [2], [7], [6])
+
+# =============================================================================
+# Test 3. Glue faces for 1 solid and 1 faces with 1 common edge
+# =============================================================================
+Recover_1 = model.addRecover(Part_1_doc, GlueFaces_1, [Box_1.result()])
+GlueFaces_3 = model.addGlueFaces(Part_1_doc, [model.selection("FACE", "Translation_1_1_2"), model.selection("SOLID", "Recover_1_1")], 1e-07, True)
+GlueFaces_3.result().setName("GlueFaces_3_1")
+GlueFaces_3.result().subResult(0).setName("GlueFaces_3_1_1")
+GlueFaces_3.result().subResult(1).setName("GlueFaces_3_1_2")
+model.end()
+
+# no faces glued
+testCompound(GlueFaces_3, model, [2], [1], [7], [15], [10])
