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

Toponaming: Remove all FC_USE_TNP_FIX protected old code

Browse Source
This commit is contained in:
bgbsww
2024-05-20 21:57:39 -04:00
committed by Chris Hennes
parent 60640fa441
commit ecf7e51ab3
52 changed files with 22 additions and 4760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

115
src/Mod/Part/App/FeaturePartFuse.cpp
View File

@@ -90,120 +90,6 @@ short MultiFuse::mustExecute() const
App::DocumentObjectExecReturn *MultiFuse::execute()
{
#ifndef FC_USE_TNP_FIX
std::vector<TopoDS_Shape> shapes;
std::vector<App::DocumentObject*> obj = Shapes.getValues();
std::vector<App::DocumentObject*>::iterator it;
for (it = obj.begin(); it != obj.end(); ++it) {
shapes.push_back(Feature::getShape(*it));
}
bool argumentsAreInCompound = false;
TopoDS_Shape compoundOfArguments;
//if only one source shape, and it is a compound - fuse children of the compound
if (shapes.size() == 1){
compoundOfArguments = shapes[0];
if (compoundOfArguments.ShapeType() == TopAbs_COMPOUND){
shapes.clear();
TopoDS_Iterator it2(compoundOfArguments);
for (; it2.More(); it2.Next()) {
const TopoDS_Shape& aChild = it2.Value();
shapes.push_back(aChild);
}
argumentsAreInCompound = true;
}
}
if (shapes.size() >= 2) {
try {
std::vector<ShapeHistory> history;
BRepAlgoAPI_Fuse mkFuse;
TopTools_ListOfShape shapeArguments,shapeTools;
const TopoDS_Shape& shape = shapes.front();
if (shape.IsNull())
throw Base::RuntimeError("Input shape is null");
shapeArguments.Append(shape);
for (auto it2 = shapes.begin()+1; it2 != shapes.end(); ++it2) {
if (it2->IsNull())
throw Base::RuntimeError("Input shape is null");
shapeTools.Append(*it2);
}
mkFuse.SetArguments(shapeArguments);
mkFuse.SetTools(shapeTools);
mkFuse.SetRunParallel(true);
mkFuse.Build();
if (!mkFuse.IsDone())
throw Base::RuntimeError("MultiFusion failed");
TopoDS_Shape resShape = mkFuse.Shape();
for (const auto & it2 : shapes) {
history.push_back(buildHistory(mkFuse, TopAbs_FACE, resShape, it2));
}
if (resShape.IsNull())
throw Base::RuntimeError("Resulting shape is null");
Base::Reference<ParameterGrp> hGrp = App::GetApplication().GetUserParameter()
.GetGroup("BaseApp")->GetGroup("Preferences")->GetGroup("Mod/Part/Boolean");
if (hGrp->GetBool("CheckModel", true)) {
BRepCheck_Analyzer aChecker(resShape);
if (! aChecker.IsValid() ) {
return new App::DocumentObjectExecReturn("Resulting shape is invalid");
}
}
if (this->Refine.getValue()) {
try {
TopoDS_Shape oldShape = resShape;
BRepBuilderAPI_RefineModel mkRefine(oldShape);
resShape = mkRefine.Shape();
ShapeHistory hist = buildHistory(mkRefine, TopAbs_FACE, resShape, oldShape);
for (auto & jt : history)
jt = joinHistory(jt, hist);
}
catch (Standard_Failure&) {
// do nothing
}
}
this->Shape.setValue(resShape);
if (argumentsAreInCompound){
//combine histories of every child of source compound into one
ShapeHistory overallHist;
TopTools_IndexedMapOfShape facesOfCompound;
TopAbs_ShapeEnum type = TopAbs_FACE;
TopExp::MapShapes(compoundOfArguments, type, facesOfCompound);
for (std::size_t iChild = 0; iChild < history.size(); iChild++){ //loop over children of source compound
//for each face of a child, find the inex of the face in compound, and assign the corresponding right-hand-size of the history
TopTools_IndexedMapOfShape facesOfChild;
TopExp::MapShapes(shapes[iChild], type, facesOfChild);
for(std::pair<const int,ShapeHistory::List> &histitem: history[iChild].shapeMap){ //loop over elements of history - that is - over faces of the child of source compound
int iFaceInChild = histitem.first;
ShapeHistory::List &iFacesInResult = histitem.second;
const TopoDS_Shape& srcFace = facesOfChild(iFaceInChild + 1); //+1 to convert our 0-based to OCC 1-bsed conventions
int iFaceInCompound = facesOfCompound.FindIndex(srcFace)-1;
overallHist.shapeMap[iFaceInCompound] = iFacesInResult; //this may overwrite existing info if the same face is used in several children of compound. This shouldn't be a problem, because the histories should match anyway...
}
}
history.clear();
history.push_back(overallHist);
}
this->History.setValues(history);
}
catch (Standard_Failure& e) {
return new App::DocumentObjectExecReturn(e.GetMessageString());
}
}
else {
throw Base::CADKernelError("Not enough shape objects linked");
}
return App::DocumentObject::StdReturn;
#else
std::vector<TopoShape> shapes;
std::vector<App::DocumentObject*> obj = Shapes.getValues();
@@ -331,5 +217,4 @@ App::DocumentObjectExecReturn *MultiFuse::execute()
else {
throw Base::CADKernelError("Not enough shape objects linked");
}
#endif
}