From 6bd6cc0526d241f02a6a9cf0a124c5ebe2ba2216 Mon Sep 17 00:00:00 2001 From: sliptonic Date: Thu, 11 May 2017 09:47:33 -0500 Subject: [PATCH] Path: add cursor waiting decorator to long running functions. Remove obsolete ToolDescription code from label change. --- src/Mod/Path/PathScripts/PathDrilling.py | 8 ++------ src/Mod/Path/PathScripts/PathPocket.py | 3 --- src/Mod/Path/PathScripts/PathSurface.py | 5 +++-- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Mod/Path/PathScripts/PathDrilling.py b/src/Mod/Path/PathScripts/PathDrilling.py index 8655906f7c..df58190634 100644 --- a/src/Mod/Path/PathScripts/PathDrilling.py +++ b/src/Mod/Path/PathScripts/PathDrilling.py @@ -25,14 +25,11 @@ from __future__ import print_function import sys import FreeCAD -# from FreeCAD import Vector import Path import PathScripts.PathLog as PathLog -# import Part from PySide import QtCore, QtGui from PathScripts import PathUtils -from PathScripts.PathUtils import fmt -# from math import pi +from PathScripts.PathUtils import fmt, waiting_effects import ArchPanel @@ -105,9 +102,8 @@ class ObjectDrilling: def onChanged(self, obj, prop): pass - # if prop == "UserLabel": - # obj.Label = obj.UserLabel + " :" + obj.ToolDescription + @waiting_effects def execute(self, obj): PathLog.track() output = "" diff --git a/src/Mod/Path/PathScripts/PathPocket.py b/src/Mod/Path/PathScripts/PathPocket.py index c21bfcc8e7..f4a4c8a8fc 100644 --- a/src/Mod/Path/PathScripts/PathPocket.py +++ b/src/Mod/Path/PathScripts/PathPocket.py @@ -109,9 +109,6 @@ class ObjectPocket: obj.setEditorMode('RampAngle', 2) # make this hidden obj.setEditorMode('RampSize', 2) # make this hidden - if prop == "UserLabel": - obj.Label = obj.UserLabel + " :" + obj.ToolDescription - def __getstate__(self): return None diff --git a/src/Mod/Path/PathScripts/PathSurface.py b/src/Mod/Path/PathScripts/PathSurface.py index 5f5899ffe3..3851e0ab9a 100644 --- a/src/Mod/Path/PathScripts/PathSurface.py +++ b/src/Mod/Path/PathScripts/PathSurface.py @@ -27,6 +27,7 @@ import FreeCAD import Path from PathScripts import PathUtils import PathScripts.PathLog as PathLog +from PathScripts.PathUtils import waiting_effects import sys # xrange is not available in python3 @@ -129,8 +130,7 @@ class ObjectSurface: return None def onChanged(self, obj, prop): - if prop == "UserLabel": - obj.Label = obj.UserLabel + " :" + obj.ToolDescription + pass def _waterline(self, obj, s, bb): import ocl @@ -262,6 +262,7 @@ class ObjectSurface: return output + @waiting_effects def execute(self, obj): import MeshPart FreeCAD.Console.PrintWarning(