kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

TopoShape/Part: Bug fixes; pass Hasher parms, OCCT 7.8 compatibility, ElementMaps correct item count

Browse Source
This commit is contained in:
bgbsww
2024-04-13 18:26:36 -04:00
parent 2eb4689996
commit a88e7baff5
13 changed files with 57 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/App/ElementMap.cpp
View File

@@ -726,8 +726,8 @@ MappedName ElementMap::dehashElementName(const MappedName& name) const
FC_LOG("cannot de-hash id " << id);// NOLINT
return name;
}
MappedName ret(
sid.toString());// FIXME .toString() was missing in original function. is this correct?
MappedName ret(sid);
// sid.toString());// FIXME .toString() was missing in original function. is this correct?
FC_TRACE("de-hash " << name << " -> " << ret);// NOLINT
return ret;
}

11
src/Mod/Part/App/ExtrusionHelper.cpp
View File

@@ -484,7 +484,8 @@ void ExtrusionHelper::createTaperedPrismOffset(TopoDS_Wire sourceWire,
void ExtrusionHelper::makeElementDraft(const ExtrusionParameters& params,
const TopoShape& _shape,
std::vector<TopoShape>& drafts)
std::vector<TopoShape>& drafts,
App::StringHasherRef hasher)
{
double distanceFwd = tan(params.taperAngleFwd) * params.lengthFwd;
double distanceRev = tan(params.taperAngleRev) * params.lengthRev;
@@ -518,7 +519,7 @@ void ExtrusionHelper::makeElementDraft(const ExtrusionParameters& params,
}
else {
unsigned pos = drafts.size();
makeElementDraft(params, outerWire, drafts);
makeElementDraft(params, outerWire, drafts, hasher);
if (drafts.size() != pos + 1) {
Standard_Failure::Raise("Failed to make drafted extrusion");
}
@@ -528,7 +529,7 @@ void ExtrusionHelper::makeElementDraft(const ExtrusionParameters& params,
wires,
"",
TopoShape::SingleShapeCompoundCreationPolicy::returnShape);
makeElementDraft(params, innerWires, inner);
makeElementDraft(params, innerWires, inner, hasher);
if (inner.empty()) {
Standard_Failure::Raise("Failed to make drafted extrusion with inner hole");
}
@@ -550,7 +551,7 @@ void ExtrusionHelper::makeElementDraft(const ExtrusionParameters& params,
}
else if (shape.shapeType() == TopAbs_COMPOUND) {
for (auto& s : shape.getSubTopoShapes()) {
makeElementDraft(params, s, drafts);
makeElementDraft(params, s, drafts, hasher);
}
}
else {
@@ -598,7 +599,7 @@ void ExtrusionHelper::makeElementDraft(const ExtrusionParameters& params,
}
mkGenerator.Build();
drafts.push_back(TopoShape(0).makeElementShape(mkGenerator, list_of_sections));
drafts.push_back(TopoShape(0, hasher).makeElementShape(mkGenerator, list_of_sections));
}
catch (Standard_Failure&) {
throw;

7
src/Mod/Part/App/ExtrusionHelper.h
View File

@@ -29,6 +29,7 @@
#include <TopoDS_Shape.hxx>
#include <Mod/Part/PartGlobal.h>
#include "TopoShape.h"
namespace Part
@@ -88,8 +89,10 @@ public:
TopoDS_Wire& result);
/** Same as makeDraft() with support of element mapping
*/
static void
makeElementDraft(const ExtrusionParameters& params, const TopoShape&, std::vector<TopoShape>&);
static void makeElementDraft(const ExtrusionParameters& params,
const TopoShape&,
std::vector<TopoShape>&,
App::StringHasherRef hasher);
};
} //namespace Part

19
src/Mod/Part/App/FaceMaker.cpp
View File

@@ -61,9 +61,12 @@ void Part::FaceMaker::addTopoShape(const TopoShape& shape) {
break;
case TopAbs_WIRE:
this->myWires.push_back(TopoDS::Wire(sh));
this->myTopoWires.push_back(shape);
break;
case TopAbs_EDGE:
this->myWires.push_back(BRepBuilderAPI_MakeWire(TopoDS::Edge(sh)).Wire());
this->myTopoWires.push_back(shape);
this->myTopoWires.back().setShape(this->myWires.back(), false);
break;
case TopAbs_FACE:
this->myInputFaces.push_back(sh);
@@ -186,6 +189,7 @@ void Part::FaceMaker::postBuild() {
if(!op)
op = Part::OpCodes::Face;
const auto &faces = this->myTopoShape.getSubTopoShapes(TopAbs_FACE);
std::set<Data::MappedName> namesUsed;
// name the face using the edges of its outer wire
for(auto &face : faces) {
++index;
@@ -208,10 +212,25 @@ void Part::FaceMaker::postBuild() {
std::vector<Data::MappedName> names;
Data::ElementIDRefs sids;
#ifdef FC_USE_TNP_FIX
// To avoid name collision, we keep track of any used names to make sure
// to use at least 'minElementNames' number of unused element names to
// generate the face name.
int nameCount = 0;
for (const auto &e : edgeNames) {
names.push_back(e.name);
sids += e.sids;
if (namesUsed.insert(e.name).second) {
if (++nameCount >= minElementNames)
break;
}
}
#else
// We just use the first source element name to make the face name more
// stable
names.push_back(edgeNames.begin()->name);
sids = edgeNames.begin()->sids;
#endif
this->myTopoShape.setElementComboName(
Data::IndexedName::fromConst("Face",index),names,op,nullptr,&sids);
}

2
src/Mod/Part/App/FaceMaker.h
View File

@@ -107,10 +107,12 @@ public:
protected:
std::vector<TopoShape> mySourceShapes; //wire or compound
std::vector<TopoDS_Wire> myWires; //wires from mySourceShapes
std::vector<TopoShape> myTopoWires;
std::vector<TopoDS_Compound> myCompounds; //compounds, for recursive processing
std::vector<TopoDS_Shape> myShapesToReturn;
std::vector<TopoDS_Shape> myInputFaces;
TopoShape myTopoShape;
int minElementNames = 1;
/**
* @brief Build_Essence: build routine that can assume there is no nesting.

2
src/Mod/Part/App/FeatureExtrusion.cpp
View File

@@ -320,7 +320,7 @@ void Extrusion::extrudeShape(TopoShape &result, const TopoShape &source, const E
Base::SignalException se;
#endif
std::vector<TopoShape> drafts;
ExtrusionHelper::makeElementDraft(params, myShape, drafts);
ExtrusionHelper::makeElementDraft(params, myShape, drafts, result.Hasher);
if (drafts.empty()) {
Standard_Failure::Raise("Drafting shape failed");
}

3
src/Mod/Part/App/FeatureOffset.cpp
View File

@@ -28,6 +28,7 @@
#include <App/Link.h>
#include "FeatureOffset.h"
#include <App/Document.h>
using namespace Part;
@@ -96,7 +97,7 @@ App::DocumentObjectExecReturn *Offset::execute()
if(shape.isNull())
return new App::DocumentObjectExecReturn("Invalid source link");
auto join = static_cast<JoinType>(Join.getValue());
this->Shape.setValue(TopoShape(0).makeElementOffset(
this->Shape.setValue(TopoShape(0, getDocument()->getStringHasher()).makeElementOffset(
shape,offset,tol,inter,self,mode,join,fill ? FillType::fill : FillType::noFill));
#endif
return App::DocumentObject::StdReturn;

3
src/Mod/Part/App/PartFeatures.cpp
View File

@@ -45,6 +45,7 @@
#include <App/Link.h>
#include <App/Document.h>
#include "PartFeatures.h"
#include "TopoShapeOpCode.h"
@@ -837,7 +838,7 @@ App::DocumentObjectExecReturn* Thickness::execute()
short join = (short)Join.getValue();
#ifdef FC_USE_TNP_FIX
this->Shape.setValue(TopoShape(0)
this->Shape.setValue(TopoShape(0,getDocument()->getStringHasher())
.makeElementThickSolid(base,
shapes,
thickness,

4
src/Mod/Part/App/TopoShapeExpansion.cpp
View File

@@ -1435,7 +1435,6 @@ TopoShape& TopoShape::makeShapeWithElementMap(const TopoDS_Shape& shape,
if (otherMap.count() == 0) {
continue;
}
for (int i = 1; i <= otherMap.count(); i++) {
const auto& otherElement = otherMap.find(incomingShape._Shape, i);
// Find all new objects that are a modification of the old object
@@ -1754,7 +1753,6 @@ TopoShape& TopoShape::makeShapeWithElementMap(const TopoDS_Shape& shape,
elementMap()
->encodeElementName(element[0], first_name, ss, &sids, Tag, op, first_key.tag);
elementMap()->setElementName(element, first_name, Tag, &sids);
if (!delayed && first_key.shapetype < 3) {
newNames.erase(itName);
}
@@ -1852,7 +1850,7 @@ TopoShape& TopoShape::makeShapeWithElementMap(const TopoDS_Shape& shape,
elementMap()->encodeElementName(indexedName[0], newName, ss, &sids, Tag, op);
elementMap()->setElementName(indexedName, newName, Tag, &sids);
}
}
}
}

4
src/Mod/Part/App/TopoShapePyImp.cpp
View File

@@ -122,7 +122,11 @@ static Py_hash_t _TopoShapeHash(PyObject* self)
"This reference is no longer valid!");
return 0;
}
#if OCC_VERSION_HEX >= 0x070800
return std::hash<TopoDS_Shape> {}(static_cast<TopoShapePy*>(self)->getTopoShapePtr()->getShape());
#else
return static_cast<TopoShapePy*>(self)->getTopoShapePtr()->getShape().HashCode(INT_MAX);
#endif
}
struct TopoShapePyInit

6
src/Mod/PartDesign/App/FeatureExtrude.cpp
View File

@@ -555,7 +555,7 @@ App::DocumentObjectExecReturn* FeatureExtrude::buildExtrusion(ExtrudeOptions opt
}
sketchshape.move(invObjLoc);
TopoShape prism(0);
TopoShape prism(0, getDocument()->getStringHasher());
if (method == "UpToFirst" || method == "UpToLast" || method == "UpToFace") {
// Note: This will return an unlimited planar face if support is a datum plane
@@ -663,7 +663,7 @@ App::DocumentObjectExecReturn* FeatureExtrude::buildExtrusion(ExtrudeOptions opt
params.dir.Reverse();
}
std::vector<TopoShape> drafts;
Part::ExtrusionHelper::makeElementDraft(params, sketchshape, drafts);
Part::ExtrusionHelper::makeElementDraft(params, sketchshape, drafts, getDocument()->getStringHasher());
if (drafts.empty()) {
return new App::DocumentObjectExecReturn(
QT_TRANSLATE_NOOP("Exception", "Padding with draft angle failed"));
@@ -693,7 +693,7 @@ App::DocumentObjectExecReturn* FeatureExtrude::buildExtrusion(ExtrudeOptions opt
prism.Tag = -this->getID();
// Let's call algorithm computing a fuse operation:
TopoShape result(0);
TopoShape result(0, getDocument()->getStringHasher());
try {
const char* maker;
switch (getAddSubType()) {

14
src/Mod/PartDesign/PartDesignTests/TestTopologicalNamingProblem.py
View File

@@ -437,17 +437,22 @@ class TestTopologicalNamingProblem(unittest.TestCase):
# Act
pad = self.Doc.addObject('PartDesign::Pad', 'Pad')
pad.Profile = sketch
pad.BaseFeature = sketch
body.addObject(sketch)
body.addObject(pad)
self.Doc.recompute()
# Assert
self.assertEqual(len(body.Shape.childShapes()), 1)
self.assertEqual(body.Shape.childShapes()[0].ElementMapSize, 26)
# self.assertEqual(len(body.Shape.childShapes()), 1)
if App.GuiUp:
# Todo: This triggers a 'hasher mismatch' warning in TopoShape::mapSubElement as called by
# flushElementMap. This appears to be the case whenever you have a parent with a hasher
# that has children without hashmaps. The warning seems to be spurious in this case, but
# perhaps there is a solution involving setting hashmaps on all elements.
self.assertEqual(body.Shape.childShapes()[0].ElementMapSize, 30)
else:
self.assertEqual(body.Shape.childShapes()[0].ElementMapSize, 26)
self.assertEqual(body.Shape.ElementMapSize,30)
self.assertEqual(sketch.Shape.ElementMapSize,12)
self.assertEqual(pad.Shape.ElementMapSize,30)
self.assertEqual(pad.Shape.childShapes()[0].ElementMapSize,30)
# Todo: Assert that the names in the ElementMap are good; in particular that they are hashed with a # starting
def testPartDesignElementMapRevolution(self):
@@ -584,7 +589,6 @@ class TestTopologicalNamingProblem(unittest.TestCase):
self.assertEqual(pad.Shape.ElementMapSize, 30) # The sketch plus the pad in the map
# TODO: differing results between main and LS3 on these values. Does it matter?
# self.assertEqual(body.Shape.ElementMapSize,0) # 8?
# self.Doc.recompute()
# self.assertEqual(body.Shape.ElementMapSize,30) # 26
def testPlaneElementMap(self):

2
src/Mod/Sketcher/App/SketchObject.cpp
View File

@@ -299,7 +299,7 @@ void SketchObject::buildShape()
Shape.setValue(Part::TopoShape());
return;
}
Part::TopoShape result(0);
Part::TopoShape result(0, getDocument()->getStringHasher());
if (vertices.empty()) {
// Notice here we supply op code Part::OpCodes::Sketch to makEWires().
result.makeElementWires(shapes,Part::OpCodes::Sketch);