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

allow wires as surface input

Browse Source 
Now an arbitrary mixture of edges and wires can be used as input.
However, the total count of edges together with the wire members
can only be 2, 3 or 4.

For some reason, wires do not work in Python script:
test1.BoundaryList = [(Draft.upgrade([bs1a, bs2a]), 'Wire1')]
yields an empty BoundaryList
This commit is contained in:
balazs-bamer
2015-02-07 18:58:25 +01:00
committed by wmayer
parent 4e2eede777
commit ef27ba2c8a
5 changed files with 114 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Surface/App/FeatureBSplineSurf.cpp
View File

@@ -107,10 +107,9 @@ App::DocumentObjectExecReturn *BSplineSurf::execute(void)
GeomFill_FillingStyle fstyle = getFillingStyle();
GeomFill_BSplineCurves aSurfBuilder; //Create Surface Builder
int ncrv = BoundaryList.getSize();
if(ncrv==2) {aSurfBuilder.Init(crvs[0], crvs[1], fstyle);}
else if(ncrv==3) {aSurfBuilder.Init(crvs[0], crvs[1], crvs[2], fstyle);}
else if(ncrv==4) {aSurfBuilder.Init(crvs[0], crvs[1], crvs[2], crvs[3], fstyle);}
if(edgeCount==2) {aSurfBuilder.Init(crvs[0], crvs[1], fstyle);}
else if(edgeCount==3) {aSurfBuilder.Init(crvs[0], crvs[1], crvs[2], fstyle);}
else if(edgeCount==4) {aSurfBuilder.Init(crvs[0], crvs[1], crvs[2], crvs[3], fstyle);}
createFace(aSurfBuilder.Surface());

59
src/Mod/Surface/App/FeatureBSurf.cpp
View File

@@ -33,6 +33,7 @@
#include <GeomFill_BezierCurves.hxx>
#include <Geom_BoundedSurface.hxx>
#include <BRepBuilderAPI_MakeFace.hxx>
#include <TopExp_Explorer.hxx>
#endif
#include <Base/Exception.h>
@@ -82,43 +83,57 @@ void BSurf::getWire(TopoDS_Wire& aWire)
Handle(ShapeExtend_WireData) aWD = new ShapeExtend_WireData;
int boundaryListSize = BoundaryList.getSize();
if(boundaryListSize > 4 || boundaryListSize < 2)
if(boundaryListSize > 4) // if too many not even try
{
Standard_Failure::Raise("Only 2-4 curves are allowed");
return;
}
BRepBuilderAPI_Copy copier;
edgeCount = 0;
for(int i = 0; i < boundaryListSize; i++)
{
Part::TopoShape ts; //Curve TopoShape
TopoDS_Shape sub; //Curve TopoDS_Shape
TopoDS_Edge etmp; //Curve TopoDS_Edge
//Get Edge
App::PropertyLinkSubList::SubSet set = BoundaryList[i];
if(set.obj->getTypeId().isDerivedFrom(Part::Feature::getClassTypeId())) {
ts = static_cast<Part::Feature*>(set.obj)->Shape.getShape();
//we want only the subshape which is linked
sub = ts.getSubShape(set.sub);
// make a copy of the shape and the underlying geometry to avoid to affect the input shapes
BRepBuilderAPI_Copy copy(sub);
sub = copy.Shape();
if(sub.ShapeType() == TopAbs_EDGE) { //Check Shape type and assign edge
etmp = TopoDS::Edge(sub);
const Part::TopoShape &ts = static_cast<Part::Feature*>(set.obj)->Shape.getShape();
if(ts._Shape.ShapeType() == TopAbs_WIRE)
{
const TopoDS_Wire &wire = TopoDS::Wire(ts._Shape);
// resolve the wire, we need edges from now on
for (TopExp_Explorer wireExplorer (wire, TopAbs_EDGE); wireExplorer.More(); wireExplorer.Next())
{
// make a copy of the shape and the underlying geometry to avoid to affect the input shapes
copier.Perform(wireExplorer.Current());
aWD->Add(TopoDS::Edge(copier.Shape()));
edgeCount++;
}
}
else {
Standard_Failure::Raise("Curves must be type TopoDS_Edge");
return; //Raise exception
}
aWD->Add(etmp);
else
{
//we want only the subshape which is linked
const TopoDS_Shape &sub = ts.getSubShape(set.sub);
// make a copy of the shape and the underlying geometry to avoid to affect the input shapes
copier.Perform(sub);
const TopoDS_Shape &copy = copier.Shape();
if(copy.ShapeType() == TopAbs_EDGE) { //Check Shape type and assign edge
aWD->Add(TopoDS::Edge(copy));
edgeCount++;
}
else {
Standard_Failure::Raise("Curves must be of type TopoDS_Edge or TopoDS_Wire");
return; //Raise exception
}
}
}
else{Standard_Failure::Raise("Curve not from Part::Feature");return;}
}
if(edgeCount < 2 || edgeCount > 4)
{
Standard_Failure::Raise("Only 2-4 curves are allowed");
return;
}
//Reorder the curves and fix the wire if required

3
src/Mod/Surface/App/FeatureBSurf.h
View File

@@ -61,6 +61,9 @@ protected:
// corrects the initially invalid fill type
void correcteInvalidFillType();
// number of edges is a result of calculating single and wire edges
int edgeCount;
private:
static const char* FillTypeEnums[];
};

7
src/Mod/Surface/App/FeatureBezSurf.cpp
View File

@@ -89,10 +89,9 @@ App::DocumentObjectExecReturn *BezSurf::execute(void)
GeomFill_FillingStyle fstyle = getFillingStyle();
GeomFill_BezierCurves aSurfBuilder; //Create Surface Builder
int ncrv = BoundaryList.getSize();
if(ncrv==2) {aSurfBuilder.Init(crvs[0], crvs[1], fstyle);}
else if(ncrv==3) {aSurfBuilder.Init(crvs[0], crvs[1], crvs[2], fstyle);}
else if(ncrv==4) {aSurfBuilder.Init(crvs[0], crvs[1], crvs[2], crvs[3], fstyle);}
if(edgeCount==2) {aSurfBuilder.Init(crvs[0], crvs[1], fstyle);}
else if(edgeCount==3) {aSurfBuilder.Init(crvs[0], crvs[1], crvs[2], fstyle);}
else if(edgeCount==4) {aSurfBuilder.Init(crvs[0], crvs[1], crvs[2], crvs[3], fstyle);}
createFace(aSurfBuilder.Surface());