From 1005c5c7658963bb069c442102dc7bbfa49d00b5 Mon Sep 17 00:00:00 2001 From: wmayer Date: Thu, 13 Apr 2017 12:29:35 +0200 Subject: [PATCH] polish sewing feature --- src/Mod/Surface/App/FeatureSewing.cpp | 21 ++++++--------------- src/Mod/Surface/App/FeatureSewing.h | 5 ----- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/Mod/Surface/App/FeatureSewing.cpp b/src/Mod/Surface/App/FeatureSewing.cpp index 348e9a08a6..5c4955664f 100644 --- a/src/Mod/Surface/App/FeatureSewing.cpp +++ b/src/Mod/Surface/App/FeatureSewing.cpp @@ -43,13 +43,12 @@ PROPERTY_SOURCE(Surface::Sewing, Part::Feature) Sewing::Sewing() { - ADD_PROPERTY(ShapeList,(0,"TopoDS_Shape")); - - ADD_PROPERTY(Tolerance,(0.0000001)); - ADD_PROPERTY(SewingOption,(true)); - ADD_PROPERTY(DegenerateShape,(true)); - ADD_PROPERTY(CutFreeEdges,(true)); - ADD_PROPERTY(Nonmanifold,(false)); + ADD_PROPERTY_TYPE(ShapeList,(0,""), "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"); } short Sewing::mustExecute() const @@ -73,7 +72,6 @@ App::DocumentObjectExecReturn *Sewing::execute(void) bool opt3 = CutFreeEdges.getValue(); bool opt4 = Nonmanifold.getValue(); - try { BRepBuilderAPI_Sewing builder(atol,opt1,opt2,opt3,opt4); @@ -99,13 +97,6 @@ App::DocumentObjectExecReturn *Sewing::execute(void) builder.Perform(); //Perform Sewing TopoDS_Shape aShape = builder.SewedShape(); //Get Shape - - //printf("number of degenerated shapes: %i\n",builder.NbDegeneratedShapes()); - //printf("number of deleted faces: %i\n",builder.NbDeletedFaces()); - //printf("number of free edges: %i\n",builder.NbFreeEdges()); - //printf("number of multiple edges: %i\n",builder.NbMultipleEdges()); - //printf("number of continuous edges: %i\n",builder.NbContigousEdges()); - if (aShape.IsNull()) return new App::DocumentObjectExecReturn("Resulting shape is null"); this->Shape.setValue(aShape); diff --git a/src/Mod/Surface/App/FeatureSewing.h b/src/Mod/Surface/App/FeatureSewing.h index b826418114..fb4534a079 100644 --- a/src/Mod/Surface/App/FeatureSewing.h +++ b/src/Mod/Surface/App/FeatureSewing.h @@ -49,11 +49,6 @@ public: // recalculate the feature App::DocumentObjectExecReturn *execute(void); short mustExecute() const; - /// returns the type name of the view provider -// const char* getViewProviderName(void) const { -// return "PartGui::ViewProviderSewing"; -// } - }; }//Namespace Surface