From af1dacf57f365a4d40f5535081c430259e8caac3 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Mon, 28 Sep 2020 12:12:51 -0500 Subject: [PATCH] rename OTHER --- src/Mod/Path/PathScripts/PathVcarve.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathVcarve.py b/src/Mod/Path/PathScripts/PathVcarve.py index 6501cdc802..7a6298d653 100644 --- a/src/Mod/Path/PathScripts/PathVcarve.py +++ b/src/Mod/Path/PathScripts/PathVcarve.py @@ -45,7 +45,7 @@ EXTERIOR1 = 1 EXTERIOR2 = 4 TWIN = 2 COLINEAR = 3 -OTHER = 5 +SECONDARY = 5 if True: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) @@ -58,6 +58,7 @@ else: def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) +VD = [] class ObjectVcarve(PathEngraveBase.ObjectOp): '''Proxy class for Vcarve operation.''' @@ -215,6 +216,7 @@ class ObjectVcarve(PathEngraveBase.ObjectOp): return path + VD.clear() pathlist = [] pathlist.append(Path.Command("(starting)")) for f in Faces: @@ -224,7 +226,7 @@ class ObjectVcarve(PathEngraveBase.ObjectOp): vd.construct() for e in vd.Edges: - e.Color = PRIMARY if e.isPrimary() else OTHER + e.Color = PRIMARY if e.isPrimary() else SECONDARY vd.colorExterior(EXTERIOR1) vd.colorExterior(EXTERIOR2, lambda v: not f.isInside(v.toGeom(f.BoundBox.ZMin), @@ -236,6 +238,7 @@ class ObjectVcarve(PathEngraveBase.ObjectOp): for wire in getWires(edgelist): pathlist.extend(cutWire(wire)) + VD.append((f, vd, getWires(edgelist))) self.commandlist = pathlist