Glassvision/IfcOpenShell
1
0
Fork 0
mirror of https://github.com/IfcOpenShell/IfcOpenShell.git synced 2026-10-02 04:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

further optional type changes

Browse Source
This commit is contained in:
Thomas Krijnen
2021-08-07 11:23:41 +02:00
parent 49cf297eee
commit 0e6962c311
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ifcgeom/IfcGeomShapes.cpp
+12 -2
View File
@@ -1531,8 +1531,18 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcSweptDiskSolid* l, TopoDS_Shap
if (!convert_wire(l->Directrix(), wire)) { if (!convert_wire(l->Directrix(), wire)) {
return false; return false;
} }
// Start- EndParam became optional in IFC4
#ifdef SCHEMA_IfcSweptDiskSolid_StartParam_IS_OPTIONAL
auto sp = l->StartParam();
auto ep = l->EndParam();
#else
boost::optional<double> sp, ep;
sp = l->StartParam();
ep = l->EndParam();
#endif
if (count(wire, TopAbs_EDGE) == 1) { if (count(wire, TopAbs_EDGE) == 1 && sp && ep) {
TopoDS_Vertex v0, v1; TopoDS_Vertex v0, v1;
TopExp::Vertices(wire, v0, v1); TopExp::Vertices(wire, v0, v1);
if (v0.IsSame(v1)) { if (v0.IsSame(v1)) {
@@ -1543,7 +1553,7 @@ bool IfcGeom::Kernel::convert(const IfcSchema::IfcSweptDiskSolid* l, TopoDS_Shap
if ((crv->DynamicType() == STANDARD_TYPE(Geom_Circle)) || if ((crv->DynamicType() == STANDARD_TYPE(Geom_Circle)) ||
(crv->DynamicType() == STANDARD_TYPE(Geom_Ellipse))) (crv->DynamicType() == STANDARD_TYPE(Geom_Ellipse)))
{ {
BRepBuilderAPI_MakeEdge me(crv, l->StartParam(), l->EndParam()); BRepBuilderAPI_MakeEdge me(crv, *sp, *ep);
if (me.IsDone()) { if (me.IsDone()) {
auto e2 = me.Edge(); auto e2 = me.Edge();
BRep_Builder B; BRep_Builder B;