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

Toponaming/Part: Remove makeElementShape and cleanup opcode code

Browse Source
This commit is contained in:
bgbsww
2024-02-18 16:37:09 -05:00
committed by Chris Hennes
parent 2d0ef0e659
commit 0065c9cce7
13 changed files with 97 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/Mod/Part/App/FeaturePartBoolean.cpp
View File

@@ -33,6 +33,7 @@
#include <Base/Parameter.h>
#include "FeaturePartBoolean.h"
#include "TopoShapeOpCode.h"
#include "modelRefine.h"
@@ -70,6 +71,11 @@ short Boolean::mustExecute() const
return 0;
}
const char *Boolean::opCode() const
{
return Part::OpCodes::Boolean;
}
App::DocumentObjectExecReturn* Boolean::execute()
{
try {
@@ -82,13 +88,16 @@ App::DocumentObjectExecReturn* Boolean::execute()
if (!base || !tool) {
return new App::DocumentObjectExecReturn("Linked object is not a Part object");
}
std::vector<TopoShape> shapes;
shapes.reserve(2);
// Now, let's get the TopoDS_Shape
TopoDS_Shape BaseShape = Feature::getShape(base);
shapes.push_back(Feature::getTopoShape(Base.getValue()));
auto BaseShape = shapes[0].getShape();
if (BaseShape.IsNull()) {
throw NullShapeException("Base shape is null");
}
TopoDS_Shape ToolShape = Feature::getShape(tool);
shapes.push_back(Feature::getTopoShape(Tool.getValue()));
auto ToolShape = shapes[1].getShape();
if (ToolShape.IsNull()) {
throw NullShapeException("Tool shape is null");
}
@@ -123,8 +132,8 @@ App::DocumentObjectExecReturn* Boolean::execute()
}
#ifndef FC_USE_TNP_FIX
std::vector<ShapeHistory> history;
history.push_back(buildHistory(*mkBool.get(), TopAbs_FACE, resShape, BaseShape));
history.push_back(buildHistory(*mkBool.get(), TopAbs_FACE, resShape, ToolShape));
history.push_back(buildHistory(*mkBool, TopAbs_FACE, resShape, BaseShape));
history.push_back(buildHistory(*mkBool, TopAbs_FACE, resShape, ToolShape));
if (this->Refine.getValue()) {
try {
@@ -144,7 +153,7 @@ App::DocumentObjectExecReturn* Boolean::execute()
this->History.setValues(history);
return App::DocumentObject::StdReturn;
#else
TopoShape res(0, getDocument()->getStringHasher());
TopoShape res(0);
res.makeElementShape(*mkBool, shapes, opCode());
if (this->Refine.getValue()) {
res = res.makeElementRefine();