Surface: apply clang format
This commit is contained in:
@@ -22,9 +22,9 @@
|
||||
|
||||
#include "PreCompiled.h"
|
||||
#ifndef _PreComp_
|
||||
# include <BRepBuilderAPI_Sewing.hxx>
|
||||
# include <Precision.hxx>
|
||||
# include <TopoDS.hxx>
|
||||
#include <BRepBuilderAPI_Sewing.hxx>
|
||||
#include <Precision.hxx>
|
||||
#include <TopoDS.hxx>
|
||||
#endif
|
||||
|
||||
#include "FeatureSewing.h"
|
||||
@@ -34,35 +34,40 @@ using namespace Surface;
|
||||
|
||||
PROPERTY_SOURCE(Surface::Sewing, Part::Feature)
|
||||
|
||||
//Initial values
|
||||
// Initial values
|
||||
|
||||
Sewing::Sewing()
|
||||
{
|
||||
ADD_PROPERTY_TYPE(ShapeList,(nullptr,""), "Sewing", App::Prop_None, "Input shapes");
|
||||
ADD_PROPERTY_TYPE(Tolerance,(Precision::Confusion()), "Sewing", App::Prop_None, "Sewing tolerance");
|
||||
ADD_PROPERTY_TYPE(SewingOption,(true), "Sewing", App::Prop_None, "Sewing option");
|
||||
ADD_PROPERTY_TYPE(DegenerateShape,(true), "Sewing", App::Prop_None, "Analysis of degenerated shapes");
|
||||
ADD_PROPERTY_TYPE(CutFreeEdges,(true), "Sewing", App::Prop_None, "Cutting of free edges");
|
||||
ADD_PROPERTY_TYPE(Nonmanifold,(false), "Sewing", App::Prop_None, "Non-manifold processing");
|
||||
ADD_PROPERTY_TYPE(ShapeList, (nullptr, ""), "Sewing", App::Prop_None, "Input shapes");
|
||||
ADD_PROPERTY_TYPE(Tolerance,
|
||||
(Precision::Confusion()),
|
||||
"Sewing",
|
||||
App::Prop_None,
|
||||
"Sewing tolerance");
|
||||
ADD_PROPERTY_TYPE(SewingOption, (true), "Sewing", App::Prop_None, "Sewing option");
|
||||
ADD_PROPERTY_TYPE(DegenerateShape,
|
||||
(true),
|
||||
"Sewing",
|
||||
App::Prop_None,
|
||||
"Analysis of degenerated shapes");
|
||||
ADD_PROPERTY_TYPE(CutFreeEdges, (true), "Sewing", App::Prop_None, "Cutting of free edges");
|
||||
ADD_PROPERTY_TYPE(Nonmanifold, (false), "Sewing", App::Prop_None, "Non-manifold processing");
|
||||
|
||||
ShapeList.setScope(App::LinkScope::Global);
|
||||
}
|
||||
|
||||
short Sewing::mustExecute() const
|
||||
{
|
||||
if (ShapeList.isTouched() ||
|
||||
Tolerance.isTouched() ||
|
||||
SewingOption.isTouched() ||
|
||||
DegenerateShape.isTouched() ||
|
||||
CutFreeEdges.isTouched() ||
|
||||
Nonmanifold.isTouched())
|
||||
if (ShapeList.isTouched() || Tolerance.isTouched() || SewingOption.isTouched()
|
||||
|| DegenerateShape.isTouched() || CutFreeEdges.isTouched() || Nonmanifold.isTouched()) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
App::DocumentObjectExecReturn *Sewing::execute()
|
||||
App::DocumentObjectExecReturn* Sewing::execute()
|
||||
{
|
||||
//Assign Variables
|
||||
// Assign Variables
|
||||
double atol = Tolerance.getValue();
|
||||
bool opt1 = SewingOption.getValue();
|
||||
bool opt2 = DegenerateShape.getValue();
|
||||
@@ -70,17 +75,17 @@ App::DocumentObjectExecReturn *Sewing::execute()
|
||||
bool opt4 = Nonmanifold.getValue();
|
||||
|
||||
try {
|
||||
BRepBuilderAPI_Sewing builder(atol,opt1,opt2,opt3,opt4);
|
||||
BRepBuilderAPI_Sewing builder(atol, opt1, opt2, opt3, opt4);
|
||||
|
||||
std::vector<App::PropertyLinkSubList::SubSet> subset = ShapeList.getSubListValues();
|
||||
for(const auto& it : subset) {
|
||||
for (const auto& it : subset) {
|
||||
// the subset has the documentobject and the element name which belongs to it,
|
||||
// in our case for example the cube object and the "Edge1" string
|
||||
if (it.first->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
|
||||
//we get the shape of the document object which resemble the whole box
|
||||
// we get the shape of the document object which resemble the whole box
|
||||
Part::TopoShape ts = static_cast<Part::Feature*>(it.first)->Shape.getShape();
|
||||
|
||||
//we want only the subshape which is linked
|
||||
// we want only the subshape which is linked
|
||||
for (const auto& jt : it.second) {
|
||||
TopoDS_Shape sub = ts.getSubShape(jt.c_str());
|
||||
builder.Add(sub);
|
||||
@@ -91,11 +96,12 @@ App::DocumentObjectExecReturn *Sewing::execute()
|
||||
}
|
||||
}
|
||||
|
||||
builder.Perform(); //Perform Sewing
|
||||
builder.Perform();// Perform Sewing
|
||||
|
||||
TopoDS_Shape aShape = builder.SewedShape(); //Get Shape
|
||||
if (aShape.IsNull())
|
||||
TopoDS_Shape aShape = builder.SewedShape();// Get Shape
|
||||
if (aShape.IsNull()) {
|
||||
return new App::DocumentObjectExecReturn("Resulting shape is null");
|
||||
}
|
||||
this->Shape.setValue(aShape);
|
||||
return StdReturn;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user