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

Use OCCT Handle macro for Handle_ classes

Browse Source 
This is the result of running OCCT's upgrade script provided
with OCCT 7.0. See
https://www.opencascade.com/content/freecad-occt710-and-windows-rtti-data-missing#comment-form
and
https://www.forum.freecadweb.org/viewtopic.php?f=4&t=21405&start=120#p169019
for why this is necessary for OCCT >= 7.1
This commit is contained in:
Peter Lama
2017-04-17 20:33:29 -04:00
committed by wmayer
parent 4564e4f4a4
commit fa4bebf2e0
141 changed files with 2198 additions and 2208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/Mod/Part/App/Part2DObject.cpp
View File

@@ -118,9 +118,9 @@ bool Part2DObject::seekTrimPoints(const std::vector<Geometry *> &geomlist,
Standard_Boolean periodic=Standard_False;
double period = 0;
Handle_Geom2d_Curve primaryCurve;
Handle_Geom_Geometry geom = (geomlist[GeoId])->handle();
Handle_Geom_Curve curve3d = Handle_Geom_Curve::DownCast(geom);
Handle(Geom2d_Curve) primaryCurve;
Handle(Geom_Geometry) geom = (geomlist[GeoId])->handle();
Handle(Geom_Curve) curve3d = Handle(Geom_Curve)::DownCast(geom);
if (curve3d.IsNull())
return false;
else {
@@ -143,12 +143,12 @@ bool Part2DObject::seekTrimPoints(const std::vector<Geometry *> &geomlist,
GeoId2 = -1;
double param1=-1e10,param2=1e10;
gp_Pnt2d p1,p2;
Handle_Geom2d_Curve secondaryCurve;
Handle(Geom2d_Curve) secondaryCurve;
for (int id=0; id < int(geomlist.size()); id++) {
// #0000624: Trim tool doesn't work with construction lines
if (id != GeoId/* && !geomlist[id]->Construction*/) {
geom = (geomlist[id])->handle();
curve3d = Handle_Geom_Curve::DownCast(geom);
curve3d = Handle(Geom_Curve)::DownCast(geom);
if (!curve3d.IsNull()) {
secondaryCurve = GeomAPI::To2d(curve3d, plane);
// perform the curves intersection