From 18cb7ec0398e3124e89af97b17640872e6e7bda4 Mon Sep 17 00:00:00 2001 From: Jeremy Mack Wright Date: Sun, 10 Dec 2017 23:04:51 -0500 Subject: [PATCH 1/2] Fixing line vs linesegment problem in FreeCAD 0.17 --- cadquery/freecad_impl/shapes.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/cadquery/freecad_impl/shapes.py b/cadquery/freecad_impl/shapes.py index 6badc47..9c43052 100644 --- a/cadquery/freecad_impl/shapes.py +++ b/cadquery/freecad_impl/shapes.py @@ -424,12 +424,18 @@ def __init__(self, obj): FreeCADPart.Circle: 'CIRCLE' } + if hasattr(FreeCADPart,"Line"): + self.edgetypes[FreeCADPart.Line] = 'LINE' + if hasattr(FreeCADPart,"LineSegment"): - #FreeCAD <= 0.16 self.edgetypes[FreeCADPart.LineSegment] = 'LINE' - else: - #FreeCAD >= 0.17 - self.edgetypes[FreeCADPart.Line] = 'LINE' + + # if hasattr(FreeCADPart,"LineSegment"): + # #FreeCAD <= 0.16 + # self.edgetypes[FreeCADPart.LineSegment] = 'LINE' + # else: + # #FreeCAD >= 0.17 + # self.edgetypes[FreeCADPart.Line] = 'LINE' # Helps identify this solid through the use of an ID self.label = "" From 270877bbef2df64108f8ff62d926d8ee10d9ac1c Mon Sep 17 00:00:00 2001 From: Jeremy Mack Wright Date: Sun, 10 Dec 2017 23:17:52 -0500 Subject: [PATCH 2/2] Cleaning up commented code. --- cadquery/freecad_impl/shapes.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/cadquery/freecad_impl/shapes.py b/cadquery/freecad_impl/shapes.py index 9c43052..16fa39f 100644 --- a/cadquery/freecad_impl/shapes.py +++ b/cadquery/freecad_impl/shapes.py @@ -430,13 +430,6 @@ def __init__(self, obj): if hasattr(FreeCADPart,"LineSegment"): self.edgetypes[FreeCADPart.LineSegment] = 'LINE' - # if hasattr(FreeCADPart,"LineSegment"): - # #FreeCAD <= 0.16 - # self.edgetypes[FreeCADPart.LineSegment] = 'LINE' - # else: - # #FreeCAD >= 0.17 - # self.edgetypes[FreeCADPart.Line] = 'LINE' - # Helps identify this solid through the use of an ID self.label = ""