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

Part: fix typos in make* functions

Browse Source
This commit is contained in:
wmayer
2022-02-16 12:48:02 +01:00
parent 8f1c5ae76d
commit 95f583a677
8 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/PartDesign/App/FeatureDressUp.cpp
View File

@@ -256,7 +256,7 @@ void DressUp::getAddSubShape(Part::TopoShape &addShape, Part::TopoShape &subShap
// Make a compound to contain both additive and subtractive shape,
// bceause a dressing (e.g. a fillet) can either be additive or
// subtractive. And the dressup feature can contain mixture of both.
AddSubShape.setValue(Part::TopoShape().makECompound(shapes));
AddSubShape.setValue(Part::TopoShape().makeCompound(shapes));
} catch (Standard_Failure &e) {
FC_THROWM(Base::CADKernelError, "Failed to calculate AddSub shape: "

8
src/Mod/PartDesign/App/FeatureSketchBased.cpp
View File

@@ -193,7 +193,7 @@ Part::TopoShape ProfileBased::getProfileShape() const
std::vector<Part::TopoShape> shapes;
for (auto& sub : Profile.getSubValues(true))
shapes.emplace_back(shape.getSubShape(sub.c_str()));
shape = Part::TopoShape().makECompound(shapes);
shape = Part::TopoShape().makeCompound(shapes);
}
return shape;
}
@@ -216,16 +216,16 @@ TopoDS_Shape ProfileBased::getVerifiedFace(bool silent) const {
auto faces = shape.getSubTopoShapes(TopAbs_FACE);
if (faces.empty()) {
if (!shape.hasSubShape(TopAbs_WIRE))
shape = shape.makEWires();
shape = shape.makeWires();
if (shape.hasSubShape(TopAbs_WIRE))
shape = shape.makEFace(0, "Part::FaceMakerBullseye");
shape = shape.makeFace(0, "Part::FaceMakerBullseye");
else
err = "Cannot make face from profile";
}
else if (faces.size() == 1)
shape = faces.front();
else
shape = TopoShape().makECompound(faces);
shape = TopoShape().makeCompound(faces);
}
if (!err)
return shape.getShape();

4
src/Mod/PartDesign/App/FeatureTransformed.cpp
View File

@@ -239,9 +239,9 @@ App::DocumentObjectExecReturn *Transformed::execute(void)
return new App::DocumentObjectExecReturn("Shape of addsub feature is empty");
gp_Trsf trsf = feature->getLocation().Transformation().Multiplied(trsfInv);
if (!fuseShape.isNull())
fuseShape = fuseShape.makETransform(trsf);
fuseShape = fuseShape.makeTransform(trsf);
if (!cutShape.isNull())
cutShape = cutShape.makETransform(trsf);
cutShape = cutShape.makeTransform(trsf);
}
else {
return new App::DocumentObjectExecReturn("Only additive and subtractive features can be transformed");

12
src/Mod/PartDesign/App/ShapeBinder.cpp
View File

@@ -660,7 +660,7 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
else {
for(size_t i=0;i<shapes.size();++i) {
auto &shape = shapes[i];
shape = shape.makETransform(*shapeMats[i]);
shape = shape.makeTransform(*shapeMats[i]);
// if(shape.Hasher
// && shape.getElementMapSize()
// && shape.Hasher != getDocument()->getStringHasher())
@@ -676,7 +676,7 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
return;
}
result.makECompound(shapes);
result.makeCompound(shapes);
bool fused = false;
if(Fuse.getValue()) {
@@ -692,11 +692,11 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
}
if(solids.size()) {
solid.fuse(solids);
result = solid.makERefine();
result = solid.makeRefine();
fused = true;
} else if (!solid.isNull()) {
// wrap the single solid in compound to keep its placement
result.makECompound({solid});
result.makeCompound({solid});
fused = true;
}
}
@@ -705,9 +705,9 @@ void SubShapeBinder::update(SubShapeBinder::UpdateOption options) {
&& !result.hasSubShape(TopAbs_FACE)
&& result.hasSubShape(TopAbs_EDGE))
{
result = result.makEWires();
result = result.makeWires();
try {
result = result.makEFace(0);
result = result.makeFace(0);
}catch(...){}
}