ForkMaster/netgen
1
0
Fork 0
mirror of https://github.com/NGSolve/netgen.git synced 2024-12-24 21:10:33 +05:00
Code Issues Packages Projects Releases Wiki Activity

Workplane - finish wire without closing

Browse Source
This commit is contained in:
Joachim Schoeberl 2021-08-18 16:40:16 +02:00
parent eda914281a
commit 18c30805ab
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
libsrc/occ/python_occ_shapes.cpp
View File

@ -191,7 +191,18 @@ public:
// surf = GC_MakePlane (gp_Ax1(axis.Location(), axis.Direction())); // surf = GC_MakePlane (gp_Ax1(axis.Location(), axis.Direction()));
surf = new Geom_Plane(axis); surf = new Geom_Plane(axis);
} }
auto Finish()
{
if (!startvertex.IsNull())
{
wires.push_back (wire_builder.Wire());
wire_builder = BRepBuilderAPI_MakeWire();
startvertex.Nullify();
}
return shared_from_this();
}
auto MoveTo (double h, double v) auto MoveTo (double h, double v)
{ {
@ -248,7 +259,7 @@ public:
OCCGeometry::global_shape_properties[edge.TShape()].name = name; OCCGeometry::global_shape_properties[edge.TShape()].name = name;
wire_builder.Add(edge); wire_builder.Add(edge);
if (closing) Close(); if (closing) Finish();
return shared_from_this(); return shared_from_this();
} }
@ -361,11 +372,8 @@ public:
//update localpos.Direction() //update localpos.Direction()
Rotate(angle*180/M_PI); Rotate(angle*180/M_PI);
if (closing) if (closing)
{ Finish();
cout << "call close from arc" << endl;
Close();
cout << "close is back" << endl;
}
return shared_from_this(); return shared_from_this();
} }
@ -453,27 +461,18 @@ public:
return shared_from_this(); return shared_from_this();
*/ */
} }
shared_ptr<WorkPlane> Close () shared_ptr<WorkPlane> Close ()
{ {
cout << "close called" << endl;
if (startpnt.Distance(localpos.Location()) > 1e-10) if (startpnt.Distance(localpos.Location()) > 1e-10)
{ {
cout << "generate closing line" << endl;
LineTo (startpnt.X(), startpnt.Y()); LineTo (startpnt.X(), startpnt.Y());
return shared_from_this(); return shared_from_this();
} }
if (!startvertex.IsNull()) if (!startvertex.IsNull())
{ Finish();
cout << "I am actually closing" << endl;
wires.push_back (wire_builder.Wire());
wire_builder = BRepBuilderAPI_MakeWire();
startvertex.Nullify();
cout << "complete" << endl;
}
cout << "close returning" << endl;
return shared_from_this(); return shared_from_this();
} }
@ -1613,6 +1612,7 @@ DLL_HEADER void ExportNgOCCShapes(py::module &m)
.def("Offset", &WorkPlane::Offset) .def("Offset", &WorkPlane::Offset)
.def("Reverse", &WorkPlane::Reverse) .def("Reverse", &WorkPlane::Reverse)
.def("Close", &WorkPlane::Close) .def("Close", &WorkPlane::Close)
.def("Finish", &WorkPlane::Finish)
.def("Last", &WorkPlane::Last) .def("Last", &WorkPlane::Last)
.def("Face", &WorkPlane::Face) .def("Face", &WorkPlane::Face)
.def("Wires", &WorkPlane::Wires) .def("Wires", &WorkPlane::Wires)