From 0b0c3b2b2ee29e9355c5b143af95d44ff4620f7e Mon Sep 17 00:00:00 2001 From: sliptonic Date: Sat, 8 Jul 2017 15:16:03 -0500 Subject: [PATCH] Path: fix #3048 Visibility on recompute is now preserved --- src/Mod/Path/PathScripts/PathDrilling.py | 18 ++++++++++-------- src/Mod/Path/PathScripts/PathEngrave.py | 2 +- src/Mod/Path/PathScripts/PathMillFace.py | 1 - src/Mod/Path/PathScripts/PathPocket.py | 1 - src/Mod/Path/PathScripts/PathProfile.py | 1 - src/Mod/Path/PathScripts/PathProfileEdges.py | 1 - 6 files changed, 11 insertions(+), 13 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathDrilling.py b/src/Mod/Path/PathScripts/PathDrilling.py index 84675f470d..27ff53d000 100644 --- a/src/Mod/Path/PathScripts/PathDrilling.py +++ b/src/Mod/Path/PathScripts/PathDrilling.py @@ -105,6 +105,13 @@ class ObjectDrilling: @waiting_effects def execute(self, obj): PathLog.track() + + if not obj.Active: + path = Path.Path("(inactive operation)") + obj.Path = path + obj.ViewObject.Visibility = False + return + output = "" if obj.Comment != "": output += '(' + str(obj.Comment)+')\n' @@ -210,15 +217,10 @@ class ObjectDrilling: output += "G80\n" - if obj.Active: - path = Path.Path(output) - obj.Path = path - obj.ViewObject.Visibility = True + path = Path.Path(output) + obj.Path = path + # obj.ViewObject.Visibility = True - else: - path = Path.Path("(inactive operation)") - obj.Path = path - obj.ViewObject.Visibility = False def findHeights(self, obj, bobj, hole): try: diff --git a/src/Mod/Path/PathScripts/PathEngrave.py b/src/Mod/Path/PathScripts/PathEngrave.py index ca8e9bed42..acf86a9ee0 100644 --- a/src/Mod/Path/PathScripts/PathEngrave.py +++ b/src/Mod/Path/PathScripts/PathEngrave.py @@ -157,7 +157,7 @@ class ObjectPathEngrave: path = Path.Path(output) obj.Path = path - obj.ViewObject.Visibility = True + #obj.ViewObject.Visibility = True def buildpathocc(self, obj, wires): PathLog.track() diff --git a/src/Mod/Path/PathScripts/PathMillFace.py b/src/Mod/Path/PathScripts/PathMillFace.py index 8a7966fe94..ac027da82b 100644 --- a/src/Mod/Path/PathScripts/PathMillFace.py +++ b/src/Mod/Path/PathScripts/PathMillFace.py @@ -319,7 +319,6 @@ class ObjectFace: path = Path.Path(commandlist) obj.Path = path - obj.ViewObject.Visibility = True class _ViewProviderFace: diff --git a/src/Mod/Path/PathScripts/PathPocket.py b/src/Mod/Path/PathScripts/PathPocket.py index 0bc9c435bd..2b333b9ea5 100644 --- a/src/Mod/Path/PathScripts/PathPocket.py +++ b/src/Mod/Path/PathScripts/PathPocket.py @@ -326,7 +326,6 @@ class ObjectPocket: path = Path.Path(commandlist) obj.Path = path - obj.ViewObject.Visibility = True PathLog.debug(simlist) simshape = None diff --git a/src/Mod/Path/PathScripts/PathProfile.py b/src/Mod/Path/PathScripts/PathProfile.py index 442e19754e..bab6bf6481 100644 --- a/src/Mod/Path/PathScripts/PathProfile.py +++ b/src/Mod/Path/PathScripts/PathProfile.py @@ -361,7 +361,6 @@ class ObjectProfile: path = Path.Path(commandlist) obj.Path = path - obj.ViewObject.Visibility = True class _ViewProviderProfile: diff --git a/src/Mod/Path/PathScripts/PathProfileEdges.py b/src/Mod/Path/PathScripts/PathProfileEdges.py index 716c53a495..c1bc5706f7 100644 --- a/src/Mod/Path/PathScripts/PathProfileEdges.py +++ b/src/Mod/Path/PathScripts/PathProfileEdges.py @@ -288,7 +288,6 @@ class ObjectProfile: path = Path.Path(commandlist) obj.Path = path - obj.ViewObject.Visibility = True return sim