diff --git a/src/Mod/Path/PathScripts/PathAdaptive.py b/src/Mod/Path/PathScripts/PathAdaptive.py index 45ffc5b5e2..3aabe56051 100644 --- a/src/Mod/Path/PathScripts/PathAdaptive.py +++ b/src/Mod/Path/PathScripts/PathAdaptive.py @@ -94,7 +94,7 @@ def GenerateGCode(op,obj,adaptiveResults, helixDiameter): if len(adaptiveResults) == 0 or len(adaptiveResults[0]["AdaptivePaths"]) == 0: return - minLiftDistance = op.tool.Diameter + # minLiftDistance = op.tool.Diameter helixRadius = 0 for region in adaptiveResults: p1 = region["HelixCenterPoint"] @@ -126,7 +126,7 @@ def GenerateGCode(op,obj,adaptiveResults, helixDiameter): finish_step = obj.FinishDepth.Value if hasattr(obj, "FinishDepth") else 0.0 if finish_step > stepDown: finish_step = stepDown - + depth_params = PathUtils.depth_params( clearance_height=obj.ClearanceHeight.Value, safe_height=obj.SafeHeight.Value, @@ -213,13 +213,13 @@ def GenerateGCode(op,obj,adaptiveResults, helixDiameter): x = region["HelixCenterPoint"][0] + r y = region["HelixCenterPoint"][1] - + curDep = passStartDepth while curDep > (passEndDepth + depthPerOneCircle): op.commandlist.append(Path.Command("G2", { "X": x - (2*r), "Y": y, "Z": curDep - (depthPerOneCircle/2), "I": -r, "F": op.horizFeed})) op.commandlist.append(Path.Command("G2", { "X": x, "Y": y, "Z": curDep - depthPerOneCircle, "I": r, "F": op.horizFeed})) curDep = curDep - depthPerOneCircle - + lastStep = curDep - passEndDepth if lastStep > (depthPerOneCircle/2): op.commandlist.append(Path.Command("G2", { "X": x - (2*r), "Y": y, "Z": curDep - (lastStep/2), "I": -r, "F": op.horizFeed})) @@ -252,7 +252,7 @@ def GenerateGCode(op,obj,adaptiveResults, helixDiameter): x = pt[0] y = pt[1] - dist = math.sqrt((x-lx)*(x-lx) + (y-ly)*(y-ly)) + # dist = math.sqrt((x-lx)*(x-lx) + (y-ly)*(y-ly)) if motionType == area.AdaptiveMotionType.Cutting: z = passEndDepth diff --git a/src/Mod/Path/PathScripts/PathAreaOp.py b/src/Mod/Path/PathScripts/PathAreaOp.py index 2459548993..ec48aa6c21 100644 --- a/src/Mod/Path/PathScripts/PathAreaOp.py +++ b/src/Mod/Path/PathScripts/PathAreaOp.py @@ -56,7 +56,9 @@ __createdDate__ = "2017" __scriptVersion__ = "2g testing" __lastModified__ = "2019-06-13 15:37 CST" -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule() else: @@ -738,7 +740,7 @@ class ObjectOp(PathOp.ObjectOp): if not FreeCAD.ActiveDocument.getObject('xAxCyl'): xAx = 'xAxCyl' yAx = 'yAxCyl' - zAx = 'zAxCyl' + # zAx = 'zAxCyl' FreeCAD.ActiveDocument.addObject("App::DocumentObjectGroup", "visualAxis") if FreeCAD.GuiUp: FreeCADGui.ActiveDocument.getObject('visualAxis').Visibility = False @@ -772,20 +774,20 @@ class ObjectOp(PathOp.ObjectOp): cylGui.Visibility = False vaGrp.addObject(cyl) - if False: - FreeCAD.ActiveDocument.addObject("Part::Cylinder", zAx) - cyl = FreeCAD.ActiveDocument.getObject(zAx) - cyl.Label = zAx - cyl.Radius = self.yRotRad - cyl.Height = 0.01 - # cyl.Placement = FreeCAD.Placement(FreeCAD.Vector(0,0,0),FreeCAD.Rotation(FreeCAD.Vector(1,0,0),90)) - cyl.purgeTouched() - if FreeCAD.GuiUp: - cylGui = FreeCADGui.ActiveDocument.getObject(zAx) - cylGui.ShapeColor = (0.000, 0.000, 0.498) - cylGui.Transparency = 85 - cylGui.Visibility = False - vaGrp.addObject(cyl) +# if False: +# FreeCAD.ActiveDocument.addObject("Part::Cylinder", zAx) +# cyl = FreeCAD.ActiveDocument.getObject(zAx) +# cyl.Label = zAx +# cyl.Radius = self.yRotRad +# cyl.Height = 0.01 +# # cyl.Placement = FreeCAD.Placement(FreeCAD.Vector(0,0,0),FreeCAD.Rotation(FreeCAD.Vector(1,0,0),90)) +# cyl.purgeTouched() +# if FreeCAD.GuiUp: +# cylGui = FreeCADGui.ActiveDocument.getObject(zAx) +# cylGui.ShapeColor = (0.000, 0.000, 0.498) +# cylGui.Transparency = 85 +# cylGui.Visibility = False +# vaGrp.addObject(cyl) def useTempJobClones(self, cloneName): '''useTempJobClones(cloneName) diff --git a/src/Mod/Path/PathScripts/PathCircularHoleBase.py b/src/Mod/Path/PathScripts/PathCircularHoleBase.py index 033427d7e4..de3050af29 100644 --- a/src/Mod/Path/PathScripts/PathCircularHoleBase.py +++ b/src/Mod/Path/PathScripts/PathCircularHoleBase.py @@ -29,8 +29,6 @@ import Part import PathScripts.PathLog as PathLog import PathScripts.PathOp as PathOp import PathScripts.PathUtils as PathUtils -import string -import sys from PySide import QtCore @@ -44,8 +42,9 @@ __doc__ = "Base class an implementation for operations on circular holes." def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) +LOGLEVEL = False -if False: +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py b/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py index 7a137e9010..9c226ed130 100644 --- a/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py +++ b/src/Mod/Path/PathScripts/PathCircularHoleBaseGui.py @@ -34,7 +34,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Implementation of circular hole specific base geometry page controller." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -146,7 +148,7 @@ class TaskPanelHoleGeometryPage(PathOpGui.TaskPanelBaseGeometryPage): '''checkeChanged() ... callback when checked status of a base feature changed''' PathLog.track() disabled = [] - for i in xrange(0, self.form.baseList.rowCount()): + for i in range(0, self.form.baseList.rowCount()): item = self.form.baseList.item(i, 0) if item.checkState() != QtCore.Qt.Checked: disabled.append(item.data(self.DataFeatureName)) diff --git a/src/Mod/Path/PathScripts/PathDeburr.py b/src/Mod/Path/PathScripts/PathDeburr.py index 71b80209a7..3a93a477de 100644 --- a/src/Mod/Path/PathScripts/PathDeburr.py +++ b/src/Mod/Path/PathScripts/PathDeburr.py @@ -32,7 +32,9 @@ import math from PySide import QtCore -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -147,5 +149,5 @@ def Create(name, obj=None): '''Create(name) ... Creates and returns a Deburr operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectDeburr(obj, name) + obj.Proxy = ObjectDeburr(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathDeburrGui.py b/src/Mod/Path/PathScripts/PathDeburrGui.py index a71a24c29e..9016a04be5 100644 --- a/src/Mod/Path/PathScripts/PathDeburrGui.py +++ b/src/Mod/Path/PathScripts/PathDeburrGui.py @@ -28,7 +28,6 @@ import PathScripts.PathDeburr as PathDeburr import PathScripts.PathGui as PathGui import PathScripts.PathLog as PathLog import PathScripts.PathOpGui as PathOpGui -import PathScripts.PathSelection as PathSelection from PySide import QtCore, QtGui @@ -37,7 +36,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Deburr operation page controller and command implementation." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathDressupAxisMap.py b/src/Mod/Path/PathScripts/PathDressupAxisMap.py index 4b6cadb413..ba743f4d74 100644 --- a/src/Mod/Path/PathScripts/PathDressupAxisMap.py +++ b/src/Mod/Path/PathScripts/PathDressupAxisMap.py @@ -31,7 +31,6 @@ from PySide import QtCore if FreeCAD.GuiUp: import FreeCADGui - from PySide import QtGui """Axis remapping Dressup object and FreeCAD command. This dressup remaps one axis of motion to another. For example, you can re-map the Y axis to A to control a 4th axis rotary.""" diff --git a/src/Mod/Path/PathScripts/PathDressupDogbone.py b/src/Mod/Path/PathScripts/PathDressupDogbone.py index 14c2d9d46d..a350f9f458 100644 --- a/src/Mod/Path/PathScripts/PathDressupDogbone.py +++ b/src/Mod/Path/PathScripts/PathDressupDogbone.py @@ -39,7 +39,9 @@ from PySide import QtCore LOG_MODULE = PathLog.thisModule() -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, LOG_MODULE) PathLog.setLevel(PathLog.Level.DEBUG, LOG_MODULE) else: diff --git a/src/Mod/Path/PathScripts/PathDressupDragknife.py b/src/Mod/Path/PathScripts/PathDressupDragknife.py index b9a12da0e8..69ed200f05 100644 --- a/src/Mod/Path/PathScripts/PathDressupDragknife.py +++ b/src/Mod/Path/PathScripts/PathDressupDragknife.py @@ -34,7 +34,6 @@ import PathScripts.PathUtils as PathUtils if FreeCAD.GuiUp: import FreeCADGui - from PySide import QtGui # Qt translation handling def translate(context, text, disambig=None): diff --git a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py index e1056bf5d1..e257191503 100644 --- a/src/Mod/Path/PathScripts/PathDressupHoldingTags.py +++ b/src/Mod/Path/PathScripts/PathDressupHoldingTags.py @@ -31,8 +31,6 @@ import PathScripts.PathUtil as PathUtil import PathScripts.PathUtils as PathUtils import copy import math -import sys -import traceback from PathScripts.PathDressupTagPreferences import HoldingTagPreferences from PathScripts.PathUtils import waiting_effects @@ -40,7 +38,9 @@ from PySide import QtCore """Holding Tags Dressup object and FreeCAD command""" -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule() else: @@ -552,7 +552,7 @@ class PathData: wire = Part.Wire(bottom) if wire.isClosed(): return wire - except Exception as e: + except Exception: #if sys.version_info.major < 3: # traceback.print_exc(e) #else: diff --git a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py index 637917bfef..77c527f30a 100644 --- a/src/Mod/Path/PathScripts/PathDressupLeadInOut.py +++ b/src/Mod/Path/PathScripts/PathDressupLeadInOut.py @@ -38,7 +38,6 @@ from PySide import QtCore if FreeCAD.GuiUp: import FreeCADGui - from PySide import QtGui # Qt translation handling def translate(text, context="Path_DressupLeadInOut", disambig=None): diff --git a/src/Mod/Path/PathScripts/PathDressupRampEntry.py b/src/Mod/Path/PathScripts/PathDressupRampEntry.py index 4095631657..121a83c6d8 100644 --- a/src/Mod/Path/PathScripts/PathDressupRampEntry.py +++ b/src/Mod/Path/PathScripts/PathDressupRampEntry.py @@ -34,7 +34,6 @@ from PySide import QtCore if FreeCAD.GuiUp: import FreeCADGui - from PySide import QtGui # Qt translation handling diff --git a/src/Mod/Path/PathScripts/PathDressupTagGui.py b/src/Mod/Path/PathScripts/PathDressupTagGui.py index ea8b92a4dd..123ea61197 100644 --- a/src/Mod/Path/PathScripts/PathDressupTagGui.py +++ b/src/Mod/Path/PathScripts/PathDressupTagGui.py @@ -21,12 +21,8 @@ # * USA * # * * # *************************************************************************** -# import Draft import FreeCAD import FreeCADGui -# import Path -# import PathScripts -# import PathScripts.PathDressupTag as PathDressupTag import PathScripts.PathGeom as PathGeom import PathScripts.PathGetPoint as PathGetPoint import PathScripts.PathDressupHoldingTags as PathDressupTag diff --git a/src/Mod/Path/PathScripts/PathDrilling.py b/src/Mod/Path/PathScripts/PathDrilling.py index 918d85bdbd..ab7e1090b2 100644 --- a/src/Mod/Path/PathScripts/PathDrilling.py +++ b/src/Mod/Path/PathScripts/PathDrilling.py @@ -24,7 +24,6 @@ from __future__ import print_function -import ArchPanel import FreeCAD import Path import PathScripts.PathCircularHoleBase as PathCircularHoleBase @@ -32,7 +31,6 @@ import PathScripts.PathLog as PathLog import PathScripts.PathOp as PathOp import PathScripts.PathUtils as PathUtils -from PathScripts.PathUtils import fmt, waiting_effects from PySide import QtCore __title__ = "Path Drilling Operation" @@ -40,7 +38,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Path Drilling operation." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathDrillingGui.py b/src/Mod/Path/PathScripts/PathDrillingGui.py index 74446595f3..3415e76f0a 100644 --- a/src/Mod/Path/PathScripts/PathDrillingGui.py +++ b/src/Mod/Path/PathScripts/PathDrillingGui.py @@ -30,14 +30,16 @@ import PathScripts.PathGui as PathGui import PathScripts.PathLog as PathLog import PathScripts.PathOpGui as PathOpGui -from PySide import QtCore, QtGui +from PySide import QtCore __title__ = "Path Drilling Operation UI." __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "UI and Command for Path Drilling Operation." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathEngrave.py b/src/Mod/Path/PathScripts/PathEngrave.py index 50b28e45d7..82fa24ac17 100644 --- a/src/Mod/Path/PathScripts/PathEngrave.py +++ b/src/Mod/Path/PathScripts/PathEngrave.py @@ -35,7 +35,9 @@ from PySide import QtCore __doc__ = "Class and implementation of Path Engrave operation" -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -142,5 +144,5 @@ def Create(name, obj=None): '''Create(name) ... Creates and returns an Engrave operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectEngrave(obj, name) + obj.Proxy = ObjectEngrave(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathEngraveBase.py b/src/Mod/Path/PathScripts/PathEngraveBase.py index 0dda0f47e6..5a750f5480 100644 --- a/src/Mod/Path/PathScripts/PathEngraveBase.py +++ b/src/Mod/Path/PathScripts/PathEngraveBase.py @@ -23,20 +23,19 @@ # *************************************************************************** import DraftGeomUtils -import FreeCAD -import Part import Path import PathScripts.PathGeom as PathGeom import PathScripts.PathLog as PathLog import PathScripts.PathOp as PathOp -import PathScripts.PathUtils as PathUtils import copy from PySide import QtCore __doc__ = "Base class for all ops in the engrave family." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathEngraveGui.py b/src/Mod/Path/PathScripts/PathEngraveGui.py index b87cafd63a..fea4881416 100644 --- a/src/Mod/Path/PathScripts/PathEngraveGui.py +++ b/src/Mod/Path/PathScripts/PathEngraveGui.py @@ -27,7 +27,6 @@ import FreeCADGui import PathScripts.PathEngrave as PathEngrave import PathScripts.PathLog as PathLog import PathScripts.PathOpGui as PathOpGui -import PathScripts.PathSelection as PathSelection import PathScripts.PathUtils as PathUtils from PySide import QtCore, QtGui @@ -37,7 +36,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Engrave operation page controller and command implementation." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathFixture.py b/src/Mod/Path/PathScripts/PathFixture.py index f348ee5c57..1d383753ce 100644 --- a/src/Mod/Path/PathScripts/PathFixture.py +++ b/src/Mod/Path/PathScripts/PathFixture.py @@ -82,10 +82,6 @@ class _ViewProviderFixture: def getIcon(self): # optional return ":/icons/Path-Datums.svg" -# def attach(self): #optional -# # this is executed on object creation and object load from file -# pass - def onChanged(self, vobj, prop): # optional mode = 2 vobj.setEditorMode('LineWidth', mode) diff --git a/src/Mod/Path/PathScripts/PathGeom.py b/src/Mod/Path/PathScripts/PathGeom.py index d69b179662..e712ed9993 100644 --- a/src/Mod/Path/PathScripts/PathGeom.py +++ b/src/Mod/Path/PathScripts/PathGeom.py @@ -38,7 +38,9 @@ __doc__ = "Functions to extract and convert between Path.Command and Part.Edge a Tolerance = 0.000001 -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -405,7 +407,7 @@ def arcToHelix(edge, z0, z1): p1 = edge.valueAt(edge.FirstParameter) - p2 = edge.valueAt(edge.LastParameter) + # p2 = edge.valueAt(edge.LastParameter) cmd = cmdsForEdge(edge)[0] params = cmd.Parameters @@ -459,7 +461,7 @@ def splitEdgeAt(edge, pt): p1 = edge.valueAt(edge.FirstParameter) p2 = pt p3 = edge.valueAt(edge.LastParameter) - edges = [] + # edges = [] if type(edge.Curve) == Part.Line or type(edge.Curve) == Part.LineSegment: # it's a line diff --git a/src/Mod/Path/PathScripts/PathGui.py b/src/Mod/Path/PathScripts/PathGui.py index f962b7d74b..a6911be5a6 100644 --- a/src/Mod/Path/PathScripts/PathGui.py +++ b/src/Mod/Path/PathScripts/PathGui.py @@ -23,7 +23,6 @@ # *************************************************************************** import FreeCAD -import FreeCADGui import PathScripts.PathGeom as PathGeom import PathScripts.PathLog as PathLog import PySide @@ -37,7 +36,9 @@ __doc__ = "A collection of helper and utility functions for the Path GUI." def translate(context, text, disambig=None): return PySide.QtCore.QCoreApplication.translate(context, text, disambig) -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathGuiInit.py b/src/Mod/Path/PathScripts/PathGuiInit.py index 009797eab7..151eea982d 100644 --- a/src/Mod/Path/PathScripts/PathGuiInit.py +++ b/src/Mod/Path/PathScripts/PathGuiInit.py @@ -25,7 +25,9 @@ import PathScripts import PathScripts.PathLog as PathLog -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -69,7 +71,7 @@ def Startup(): try: import ocl from PathScripts import PathSurfaceGui - except: + except ImportError: import FreeCAD FreeCAD.Console.PrintError("OpenCamLib is not working!\n") pass diff --git a/src/Mod/Path/PathScripts/PathHelix.py b/src/Mod/Path/PathScripts/PathHelix.py index 52a6a0ac39..cfb9667384 100644 --- a/src/Mod/Path/PathScripts/PathHelix.py +++ b/src/Mod/Path/PathScripts/PathHelix.py @@ -23,7 +23,6 @@ # *************************************************************************** import FreeCAD -import Part import Path import PathScripts.PathCircularHoleBase as PathCircularHoleBase @@ -203,7 +202,7 @@ def Create(name, obj = None): '''Create(name) ... Creates and returns a Helix operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectHelix(obj, name) + obj.Proxy = ObjectHelix(obj, name) if obj.Proxy: - proxy.findAllHoles(obj) + obj.Proxy.findAllHoles(obj) return obj diff --git a/src/Mod/Path/PathScripts/PathHelixGui.py b/src/Mod/Path/PathScripts/PathHelixGui.py index 9f13e291cb..9069e91a8b 100644 --- a/src/Mod/Path/PathScripts/PathHelixGui.py +++ b/src/Mod/Path/PathScripts/PathHelixGui.py @@ -29,11 +29,13 @@ import PathScripts.PathHelix as PathHelix import PathScripts.PathLog as PathLog import PathScripts.PathOpGui as PathOpGui -from PySide import QtCore, QtGui +from PySide import QtCore __doc__ = "Helix operation page controller and command implementation." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathIconViewProvider.py b/src/Mod/Path/PathScripts/PathIconViewProvider.py index 36fffe5418..096629be43 100644 --- a/src/Mod/Path/PathScripts/PathIconViewProvider.py +++ b/src/Mod/Path/PathScripts/PathIconViewProvider.py @@ -31,7 +31,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "ViewProvider who's main and only task is to assign an icon." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathJob.py b/src/Mod/Path/PathScripts/PathJob.py index fc830e883d..96ac044904 100644 --- a/src/Mod/Path/PathScripts/PathJob.py +++ b/src/Mod/Path/PathScripts/PathJob.py @@ -37,7 +37,9 @@ import json from PathScripts.PathPostProcessor import PostProcessor from PySide import QtCore -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -227,7 +229,7 @@ class ObjectJob: if obj.Operations.ViewObject: try: obj.Operations.ViewObject.DisplayMode - except: + except Exception: name = obj.Operations.Name label = obj.Operations.Label ops = FreeCAD.ActiveDocument.addObject("Path::FeatureCompoundPython", "Operations") diff --git a/src/Mod/Path/PathScripts/PathJobCmd.py b/src/Mod/Path/PathScripts/PathJobCmd.py index 20e4f79d62..347191835f 100644 --- a/src/Mod/Path/PathScripts/PathJobCmd.py +++ b/src/Mod/Path/PathScripts/PathJobCmd.py @@ -38,7 +38,9 @@ from PySide import QtCore, QtGui def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathJobDlg.py b/src/Mod/Path/PathScripts/PathJobDlg.py index 6d2fe32a06..240da5512c 100644 --- a/src/Mod/Path/PathScripts/PathJobDlg.py +++ b/src/Mod/Path/PathScripts/PathJobDlg.py @@ -22,7 +22,6 @@ # * * # *************************************************************************** -import FreeCAD import FreeCADGui import PathScripts.PathJob as PathJob import PathScripts.PathLog as PathLog @@ -39,7 +38,9 @@ from collections import Counter def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathJobGui.py b/src/Mod/Path/PathScripts/PathJobGui.py index 25b5edf58b..01fa39ef4b 100644 --- a/src/Mod/Path/PathScripts/PathJobGui.py +++ b/src/Mod/Path/PathScripts/PathJobGui.py @@ -52,8 +52,9 @@ from pivy import coin def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) +LOGLEVEL = False -if False: +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -328,7 +329,7 @@ class StockFromBaseBoundBoxEdit(StockEdit): stock.ExtZneg = FreeCAD.Units.Quantity(self.form.stockExtZneg.text()) if 'zpos' in fields: stock.ExtZpos = FreeCAD.Units.Quantity(self.form.stockExtZpos.text()) - except: + except Exception: pass def getFields(self, obj, fields=['xneg', 'xpos', 'yneg', 'ypos', 'zneg', 'zpos']): @@ -419,7 +420,7 @@ class StockCreateBoxEdit(StockEdit): obj.Stock.Height = FreeCAD.Units.Quantity(self.form.stockBoxHeight.text()) else: PathLog.error(translate('PathJob', 'Stock not a box!')) - except: + except Exception: pass def setFields(self, obj): @@ -453,7 +454,7 @@ class StockCreateCylinderEdit(StockEdit): obj.Stock.Height = FreeCAD.Units.Quantity(self.form.stockCylinderHeight.text()) else: PathLog.error(translate('PathJob', 'Stock not a cylinder!')) - except: + except Exception: pass def setFields(self, obj): @@ -623,7 +624,7 @@ class TaskPanel: if self.form.wcslist.item(i).checkState() == QtCore.Qt.CheckState.Checked: flist.append(self.form.wcslist.item(i).text()) self.obj.Fixtures = flist - except: + except Exception: FreeCAD.Console.PrintWarning("The Job was created without fixture support. Please delete and recreate the job\r\n") self.updateTooltips() @@ -829,7 +830,7 @@ class TaskPanel: elif 'Number' == prop: try: tc.ToolNumber = int(item.text()) - except: + except Exception: pass item.setText("%d" % tc.ToolNumber) elif 'Spindle' == prop: @@ -841,7 +842,7 @@ class TaskPanel: speed = -speed tc.SpindleDir = rot tc.SpindleSpeed = speed - except: + except Exception: pass item.setText("%s%g" % ('+' if tc.SpindleDir == 'Forward' else '-', tc.SpindleSpeed)) elif 'HorizFeed' == prop or 'VertFeed' == prop: @@ -853,14 +854,14 @@ class TaskPanel: elif FreeCAD.Units.Unit() == val.Unit: val = FreeCAD.Units.Quantity(item.text() + vUnit) setattr(tc, prop, val) - except: + except Exception: pass item.setText("%g" % getattr(tc, prop).getValueAs(vUnit)) else: try: val = FreeCAD.Units.Quantity(item.text()) setattr(tc, prop, val) - except: + except Exception: pass item.setText("%g" % getattr(tc, prop).Value) diff --git a/src/Mod/Path/PathScripts/PathMillFace.py b/src/Mod/Path/PathScripts/PathMillFace.py index 6b0ca54f09..181f386ad5 100644 --- a/src/Mod/Path/PathScripts/PathMillFace.py +++ b/src/Mod/Path/PathScripts/PathMillFace.py @@ -38,7 +38,9 @@ __url__ = "http://www.freecadweb.org" __doc__ = "Class and implementation of Mill Facing operation." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -146,5 +148,5 @@ def Create(name, obj = None): '''Create(name) ... Creates and returns a Mill Facing operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectFace(obj, name) + obj.Proxy = ObjectFace(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathOp.py b/src/Mod/Path/PathScripts/PathOp.py index 3ec0b372b9..1c97bb2cc7 100644 --- a/src/Mod/Path/PathScripts/PathOp.py +++ b/src/Mod/Path/PathScripts/PathOp.py @@ -26,7 +26,6 @@ import FreeCAD import Path import PathScripts.PathGeom as PathGeom import PathScripts.PathLog as PathLog -import PathScripts.PathSetupSheet as PathSetupSheet import PathScripts.PathUtil as PathUtil import PathScripts.PathUtils as PathUtils @@ -38,7 +37,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Base class and properties implementation for all Path operations." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule() else: diff --git a/src/Mod/Path/PathScripts/PathOpGui.py b/src/Mod/Path/PathScripts/PathOpGui.py index fd28dfcd08..dd1feff1d1 100644 --- a/src/Mod/Path/PathScripts/PathOpGui.py +++ b/src/Mod/Path/PathScripts/PathOpGui.py @@ -43,7 +43,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Base classes and framework for Path operation's UI" -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathOpTools.py b/src/Mod/Path/PathScripts/PathOpTools.py index d548228924..8490b6825f 100644 --- a/src/Mod/Path/PathScripts/PathOpTools.py +++ b/src/Mod/Path/PathScripts/PathOpTools.py @@ -24,7 +24,6 @@ import FreeCAD import Part -import Path import PathScripts.PathGeom as PathGeom import PathScripts.PathLog as PathLog import math @@ -36,7 +35,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Collection of functions used by various Path operations. The functions are specific to Path and the algorithms employed by Path's operations." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -203,7 +204,7 @@ def offsetWire(wire, base, offset, forward): PathLog.track('closed - inside') try: owire = wire.makeOffset2D(-offset) - except: + except Exception: # most likely offsetting didn't work because the wire is a hole # and the offset is too big - making the hole vanish return None diff --git a/src/Mod/Path/PathScripts/PathPocket.py b/src/Mod/Path/PathScripts/PathPocket.py index 7a1ffd09d4..9c505d81c2 100644 --- a/src/Mod/Path/PathScripts/PathPocket.py +++ b/src/Mod/Path/PathScripts/PathPocket.py @@ -24,18 +24,18 @@ import FreeCAD import Part -import PathScripts.PathGeom as PathGeom import PathScripts.PathLog as PathLog import PathScripts.PathOp as PathOp import PathScripts.PathPocketBase as PathPocketBase import PathScripts.PathUtils as PathUtils -import sys from PySide import QtCore __doc__ = "Class and implementation of the Pocket operation." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -100,5 +100,5 @@ def Create(name, obj = None): '''Create(name) ... Creates and returns a Pocket operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectPocket(obj, name) + obj.Proxy = ObjectPocket(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathPocketBase.py b/src/Mod/Path/PathScripts/PathPocketBase.py index 5fcfc70c76..5ce785b343 100644 --- a/src/Mod/Path/PathScripts/PathPocketBase.py +++ b/src/Mod/Path/PathScripts/PathPocketBase.py @@ -33,7 +33,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Base class and implementation for Path pocket operations." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathPocketBaseGui.py b/src/Mod/Path/PathScripts/PathPocketBaseGui.py index 8e1615aa34..5cc4c1ecef 100644 --- a/src/Mod/Path/PathScripts/PathPocketBaseGui.py +++ b/src/Mod/Path/PathScripts/PathPocketBaseGui.py @@ -24,13 +24,10 @@ import FreeCAD import FreeCADGui -import PathScripts.PathLog as PathLog import PathScripts.PathGui as PathGui import PathScripts.PathOpGui as PathOpGui -import PathScripts.PathPocket as PathPocket -import PathScripts.PathSelection as PathSelection -from PySide import QtCore, QtGui +from PySide import QtCore #, QtGui __title__ = "Path Pocket Base Operation UI" __author__ = "sliptonic (Brad Collette)" @@ -73,9 +70,9 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): if not (FeatureOutline & self.pocketFeatures()): form.useOutline.hide() - if True: - # currently doesn't have an effect or is experimental - form.minTravel.hide() + # if True: + # # currently doesn't have an effect or is experimental + # form.minTravel.hide() return form diff --git a/src/Mod/Path/PathScripts/PathPocketShape.py b/src/Mod/Path/PathScripts/PathPocketShape.py index da1950dc6c..ef426887f3 100644 --- a/src/Mod/Path/PathScripts/PathPocketShape.py +++ b/src/Mod/Path/PathScripts/PathPocketShape.py @@ -52,15 +52,15 @@ __created__ = "2017" __scriptVersion__ = "2g testing" __lastModified__ = "2019-06-12 23:29 CST" -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule()) # Qt translation handling - - def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) @@ -469,20 +469,20 @@ class ObjectPocket(PathPocketBase.ObjectPocket): # Eif # Efor # Efor - if False: - if False: - (Tags, Grps) = self.sortTuplesByIndex(allTuples, 2) # return (TagList, GroupList) - subList = [] - for o in range(0, len(Tags)): - subList = [] - for (base, sub, tag, angle, axis, stock) in Grps[o]: - subList.append(sub) - pair = base, subList, angle, axis, stock - baseSubsTuples.append(pair) - if False: - for (bs, sb, tg, agl, ax, stk) in allTuples: - pair = bs, [sb], agl, ax, stk - baseSubsTuples.append(pair) + # if False: + # if False: + # (Tags, Grps) = self.sortTuplesByIndex(allTuples, 2) # return (TagList, GroupList) + # subList = [] + # for o in range(0, len(Tags)): + # subList = [] + # for (base, sub, tag, angle, axis, stock) in Grps[o]: + # subList.append(sub) + # pair = base, subList, angle, axis, stock + # baseSubsTuples.append(pair) + # if False: + # for (bs, sb, tg, agl, ax, stk) in allTuples: + # pair = bs, [sb], agl, ax, stk + # baseSubsTuples.append(pair) # ---------------------------------------------------------------------- for o in baseSubsTuples: diff --git a/src/Mod/Path/PathScripts/PathPocketShapeGui.py b/src/Mod/Path/PathScripts/PathPocketShapeGui.py index b574feeb6b..ff4b4ee96c 100644 --- a/src/Mod/Path/PathScripts/PathPocketShapeGui.py +++ b/src/Mod/Path/PathScripts/PathPocketShapeGui.py @@ -28,11 +28,9 @@ import Part import PathScripts.PathGeom as PathGeom import PathScripts.PathGui as PathGui import PathScripts.PathLog as PathLog -import PathScripts.PathOp as PathOp import PathScripts.PathOpGui as PathOpGui import PathScripts.PathPocketShape as PathPocketShape import PathScripts.PathPocketBaseGui as PathPocketBaseGui -import PathScripts.PathUtil as PathUtil from PySide import QtCore, QtGui from pivy import coin @@ -45,7 +43,9 @@ __doc__ = "Pocket Shape operation page controller and command implementation." def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -54,7 +54,6 @@ else: class _Extension(object): ColourEnabled = (1.0, .5, 1.0) ColourDisabled = (1.0, 1.0, .5) - #ColourDisabled = (.5, .5, .5) TransparencySelected = 0.0 TransparencyDeselected = 0.7 diff --git a/src/Mod/Path/PathScripts/PathPost.py b/src/Mod/Path/PathScripts/PathPost.py index 5f9e1269b4..af23559346 100644 --- a/src/Mod/Path/PathScripts/PathPost.py +++ b/src/Mod/Path/PathScripts/PathPost.py @@ -234,7 +234,7 @@ class CommandPathPost: elif hasattr(sel, "Path"): try: job = PathUtils.findParentJob(sel) - except: + except Exception: job = None else: job = None diff --git a/src/Mod/Path/PathScripts/PathPreferences.py b/src/Mod/Path/PathScripts/PathPreferences.py index 157cc2e9e4..145d765a83 100644 --- a/src/Mod/Path/PathScripts/PathPreferences.py +++ b/src/Mod/Path/PathScripts/PathPreferences.py @@ -167,6 +167,6 @@ def experimentalFeaturesEnabled(): try: import ocl return preferences().GetBool(EnableExperimentalFeatures, False) - except: + except ImportError: FreeCAD.Console.PrintError("OpenCamLib is not working!\n") return False diff --git a/src/Mod/Path/PathScripts/PathProfileBase.py b/src/Mod/Path/PathScripts/PathProfileBase.py index 880f7ab15c..bfeeded59c 100644 --- a/src/Mod/Path/PathScripts/PathProfileBase.py +++ b/src/Mod/Path/PathScripts/PathProfileBase.py @@ -22,10 +22,8 @@ # * * # *************************************************************************** -import FreeCAD import PathScripts.PathAreaOp as PathAreaOp import PathScripts.PathLog as PathLog -import PathScripts.PathOp as PathOp from PySide import QtCore @@ -34,7 +32,9 @@ __author__ = "sliptonic (Brad Collette)" __url__ = "http://www.freecadweb.org" __doc__ = "Base class and implementation for Path profile operations." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathProfileBaseGui.py b/src/Mod/Path/PathScripts/PathProfileBaseGui.py index 91801d68fe..aec4c34329 100644 --- a/src/Mod/Path/PathScripts/PathProfileBaseGui.py +++ b/src/Mod/Path/PathScripts/PathProfileBaseGui.py @@ -24,11 +24,8 @@ import FreeCAD import FreeCADGui -import PathScripts.PathLog as PathLog import PathScripts.PathGui as PathGui import PathScripts.PathOpGui as PathOpGui -import PathScripts.PathProfileFaces as PathProfileFaces -import PathScripts.PathSelection as PathSelection from PySide import QtCore diff --git a/src/Mod/Path/PathScripts/PathProfileContour.py b/src/Mod/Path/PathScripts/PathProfileContour.py index 7e7a2de863..6450915474 100644 --- a/src/Mod/Path/PathScripts/PathProfileContour.py +++ b/src/Mod/Path/PathScripts/PathProfileContour.py @@ -28,7 +28,6 @@ import ArchPanel import FreeCAD import Part import Path -import PathScripts.PathAreaOp as PathAreaOp import PathScripts.PathProfileBase as PathProfileBase import PathScripts.PathLog as PathLog @@ -37,7 +36,9 @@ from PySide import QtCore FreeCAD.setLogLevel('Path.Area', 0) -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -116,6 +117,6 @@ def Create(name, obj = None): '''Create(name) ... Creates and returns a Contour operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectContour(obj, name) + obj.Proxy = ObjectContour(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathProfileEdges.py b/src/Mod/Path/PathScripts/PathProfileEdges.py index 85c8b47af7..7094809cf8 100644 --- a/src/Mod/Path/PathScripts/PathProfileEdges.py +++ b/src/Mod/Path/PathScripts/PathProfileEdges.py @@ -25,7 +25,6 @@ import FreeCAD import Part import Path -import PathScripts.PathAreaOp as PathAreaOp import PathScripts.PathLog as PathLog import PathScripts.PathOp as PathOp import PathScripts.PathProfileBase as PathProfileBase @@ -36,7 +35,9 @@ from PySide import QtCore """Path Profile from Edges Object and Command""" -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -104,5 +105,5 @@ def Create(name, obj = None): '''Create(name) ... Creates and returns a Profile based on edges operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectProfile(obj, name) + obj.Proxy = ObjectProfile(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathProfileFaces.py b/src/Mod/Path/PathScripts/PathProfileFaces.py index eb90e0cf7e..341c37e80f 100644 --- a/src/Mod/Path/PathScripts/PathProfileFaces.py +++ b/src/Mod/Path/PathScripts/PathProfileFaces.py @@ -32,14 +32,12 @@ import ArchPanel import FreeCAD import Part import Path -# import PathScripts.PathAreaOp as PathAreaOp import PathScripts.PathLog as PathLog import PathScripts.PathOp as PathOp import PathScripts.PathProfileBase as PathProfileBase import PathScripts.PathUtils as PathUtils import numpy -# from PathScripts.PathUtils import depth_params from PySide import QtCore __title__ = "Path Profile Faces Operation" @@ -51,7 +49,9 @@ __created__ = "2014" __scriptVersion__ = "2h testing" __lastModified__ = "2019-06-18 22:36 CST" -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -325,8 +325,8 @@ class ObjectProfile(PathProfileBase.ObjectProfile): obj.AttemptInverseAngle = True obj.B_AxisErrorOverride = False - def checkDepths(self, obj, shape): - return (strDept, finDep) + # def checkDepths(self, obj, shape): + # return (strDept, finDep) def SetupProperties(): diff --git a/src/Mod/Path/PathScripts/PathSelection.py b/src/Mod/Path/PathScripts/PathSelection.py index 6688d9ad96..08c2eca16b 100644 --- a/src/Mod/Path/PathScripts/PathSelection.py +++ b/src/Mod/Path/PathScripts/PathSelection.py @@ -29,7 +29,9 @@ import PathScripts.PathLog as PathLog import PathScripts.PathUtils as PathUtils import math -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) @@ -48,7 +50,7 @@ class ENGRAVEGate: def allow(self, doc, obj, sub): try: shape = obj.Shape - except: + except Exception: return False if math.fabs(shape.Volume) < 1e-9 and len(shape.Wires) > 0: @@ -68,7 +70,7 @@ class CHAMFERGate: def allow(self, doc, obj, sub): try: shape = obj.Shape - except: + except Exception: return False if math.fabs(shape.Volume) < 1e-9 and len(shape.Wires) > 0: @@ -103,7 +105,7 @@ class PROFILEGate: profileable = False try: obj = obj.Shape - except: + except Exception: return False if obj.ShapeType == 'Edge': @@ -138,7 +140,7 @@ class POCKETGate: pocketable = False try: obj = obj.Shape - except: + except Exception: return False if obj.ShapeType == 'Edge': @@ -163,7 +165,7 @@ class ADAPTIVEGate: adaptive = True try: obj = obj.Shape - except: + except Exception: return False return adaptive diff --git a/src/Mod/Path/PathScripts/PathSetupSheet.py b/src/Mod/Path/PathScripts/PathSetupSheet.py index 04c81d3042..a7075ebb2f 100644 --- a/src/Mod/Path/PathScripts/PathSetupSheet.py +++ b/src/Mod/Path/PathScripts/PathSetupSheet.py @@ -23,13 +23,11 @@ # *************************************************************************** import FreeCAD -import Path import PathScripts.PathGeom as PathGeom import PathScripts.PathLog as PathLog import PathScripts.PathSetupSheetOpPrototype as PathSetupSheetOpPrototype import PathScripts.PathUtil as PathUtil import PySide -import traceback __title__ = "Setup Sheet for a Job." __author__ = "sliptonic (Brad Collette)" @@ -38,7 +36,9 @@ __doc__ = "A container for all default values and job specific configuration val _RegisteredOps = {} -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule() else: @@ -259,13 +259,13 @@ class SetupSheet: propName = OpPropertyName(opName, prop) if hasattr(self.obj, propName): setattr(obj, prop, getattr(self.obj, propName)) - except Exception as exc: + except Exception: PathLog.info("SetupSheet has no support for {}".format(opName)) #traceback.print_exc(exc) def Create(name = 'SetupSheet'): obj = FreeCAD.ActiveDocument.addObject('App::FeaturePython', name) - proxy = SetupSheet(obj) + obj.Proxy = SetupSheet(obj) return obj class _RegisteredOp(object): diff --git a/src/Mod/Path/PathScripts/PathSetupSheetGui.py b/src/Mod/Path/PathScripts/PathSetupSheetGui.py index 1109d09bf7..df88df955d 100644 --- a/src/Mod/Path/PathScripts/PathSetupSheetGui.py +++ b/src/Mod/Path/PathScripts/PathSetupSheetGui.py @@ -28,7 +28,7 @@ import PathScripts.PathGui as PathGui import PathScripts.PathIconViewProvider as PathIconViewProvider import PathScripts.PathLog as PathLog import PathScripts.PathSetupSheet as PathSetupSheet -import PathScripts.PathSetupSheetOpPrototype as PathSetupSheetOpPrototype +# import PathScripts.PathSetupSheetOpPrototype as PathSetupSheetOpPrototype import PathScripts.PathSetupSheetOpPrototypeGui as PathSetupSheetOpPrototypeGui import PathScripts.PathUtil as PathUtil @@ -43,7 +43,9 @@ __doc__ = "Task panel editor for a SetupSheet" def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -57,12 +59,7 @@ class ViewProvider: PathLog.track(name) vobj.Proxy = self self.icon = name - mode = 2 - #vobj.setEditorMode('BoundingBox', mode) - #vobj.setEditorMode('DisplayMode', mode) - #vobj.setEditorMode('Selectable', mode) - #vobj.setEditorMode('ShapeColor', mode) - #vobj.setEditorMode('Transparency', mode) + # mode = 2 def attach(self, vobj): PathLog.track() diff --git a/src/Mod/Path/PathScripts/PathSetupSheetOpPrototype.py b/src/Mod/Path/PathScripts/PathSetupSheetOpPrototype.py index e55916bf36..9c3f98cd9c 100644 --- a/src/Mod/Path/PathScripts/PathSetupSheetOpPrototype.py +++ b/src/Mod/Path/PathScripts/PathSetupSheetOpPrototype.py @@ -22,8 +22,6 @@ # * * # *************************************************************************** -import FreeCAD -import Path import PathScripts.PathLog as PathLog __title__ = "Setup Sheet for a Job." @@ -32,7 +30,9 @@ __url__ = "http://www.freecadweb.org" __doc__ = "Prototype objects to allow extraction of setup sheet values and editing." -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py b/src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py index f81024be17..4907b8f912 100644 --- a/src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py +++ b/src/Mod/Path/PathScripts/PathSetupSheetOpPrototypeGui.py @@ -23,13 +23,8 @@ # *************************************************************************** import FreeCAD -import FreeCADGui -import PathScripts.PathGui as PathGui -import PathScripts.PathIconViewProvider as PathIconViewProvider import PathScripts.PathLog as PathLog -import PathScripts.PathSetupSheet as PathSetupSheet import PathScripts.PathSetupSheetOpPrototype as PathSetupSheetOpPrototype -import PathScripts.PathUtil as PathUtil from PySide import QtCore, QtGui @@ -42,7 +37,9 @@ __doc__ = "Task panel editor for a SetupSheet" def translate(context, text, disambig=None): return QtCore.QCoreApplication.translate(context, text, disambig) -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathSimpleCopy.py b/src/Mod/Path/PathScripts/PathSimpleCopy.py index 02a9b3a71c..12e7491d36 100644 --- a/src/Mod/Path/PathScripts/PathSimpleCopy.py +++ b/src/Mod/Path/PathScripts/PathSimpleCopy.py @@ -47,7 +47,7 @@ class CommandPathSimpleCopy: try: obj = FreeCADGui.Selection.getSelectionEx()[0].Object return isinstance(obj.Proxy, PathScripts.PathOp.ObjectOp) - except: + except Exception: return False def Activated(self): diff --git a/src/Mod/Path/PathScripts/PathSimulatorGui.py b/src/Mod/Path/PathScripts/PathSimulatorGui.py index b59205c66e..46b95068f5 100644 --- a/src/Mod/Path/PathScripts/PathSimulatorGui.py +++ b/src/Mod/Path/PathScripts/PathSimulatorGui.py @@ -119,7 +119,7 @@ class PathSimulation: self.operation = self.activeOps[itool] try: self.tool = PathDressup.toolController(self.operation).Tool - except: + except Exception: self.tool = None # if hasattr(self.operation, "ToolController"): @@ -214,7 +214,7 @@ class PathSimulation: try: if newStock.isValid(): self.stock = newStock.removeSplitter() - except: + except Exception: if self.debug: print("invalid cut at cmd #{}".format(self.icmd)) if not self.disableAnim: @@ -345,7 +345,7 @@ class PathSimulation: try: startDir.normalize() endDir.normalize() - except: + except Exception: return (None, endPos) # height = self.height @@ -367,7 +367,7 @@ class PathSimulation: pathWire = Part.Wire(toolPath) try: pathShell = pathWire.makePipeShell([fullProf], False, True) - except: + except Exception: if self.debug: Part.show(pathWire) Part.show(fullProf) diff --git a/src/Mod/Path/PathScripts/PathStock.py b/src/Mod/Path/PathScripts/PathStock.py index c17aa55288..08ae89d186 100644 --- a/src/Mod/Path/PathScripts/PathStock.py +++ b/src/Mod/Path/PathScripts/PathStock.py @@ -31,7 +31,9 @@ import math from PySide import QtCore -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -227,7 +229,7 @@ def CreateFromBase(job, neg=None, pos=None, placement=None): PathLog.track(job.Label, neg, pos, placement) base = job.Model if job else None obj = FreeCAD.ActiveDocument.addObject('Part::FeaturePython', 'Stock') - proxy = StockFromBase(obj, base) + obj.Proxy = StockFromBase(obj, base) if neg: obj.ExtXneg = neg.x @@ -243,14 +245,14 @@ def CreateFromBase(job, neg=None, pos=None, placement=None): obj.Placement = placement SetupStockObject(obj, StockType.FromBase) - proxy.execute(obj) + obj.Proxy.execute(obj) obj.purgeTouched() return obj def CreateBox(job, extent=None, placement=None): base = job.Model if job else None obj = FreeCAD.ActiveDocument.addObject('Part::FeaturePython', 'Stock') - proxy = StockCreateBox(obj) + obj.Proxy = StockCreateBox(obj) if extent: obj.Length = extent.x @@ -275,7 +277,7 @@ def CreateBox(job, extent=None, placement=None): def CreateCylinder(job, radius=None, height=None, placement=None): base = job.Model if job else None obj = FreeCAD.ActiveDocument.addObject('Part::FeaturePython', 'Stock') - proxy = StockCreateCylinder(obj) + obj.Proxy = StockCreateCylinder(obj) if radius: obj.Radius = radius diff --git a/src/Mod/Path/PathScripts/PathStop.py b/src/Mod/Path/PathScripts/PathStop.py index 2a302b8b93..0eec813b70 100644 --- a/src/Mod/Path/PathScripts/PathStop.py +++ b/src/Mod/Path/PathScripts/PathStop.py @@ -25,7 +25,7 @@ import FreeCAD import FreeCADGui import Path -from PySide import QtCore, QtGui +from PySide import QtCore # Qt translation handling def translate(context, text, disambig=None): @@ -47,7 +47,6 @@ class Stop: def onChanged(self, obj, prop): pass -# FreeCAD.ActiveDocument.recompute() def execute(self, obj): if obj.Stop == 'Optional': @@ -64,7 +63,6 @@ class Stop: class _ViewProviderStop: def __init__(self, vobj): # mandatory - # obj.addProperty("App::PropertyFloat","SomePropertyName","PropertyGroup","Description of this property") vobj.Proxy = self mode = 2 vobj.setEditorMode('LineWidth', mode) diff --git a/src/Mod/Path/PathScripts/PathSurface.py b/src/Mod/Path/PathScripts/PathSurface.py index aca39dcbe6..007214fc3e 100644 --- a/src/Mod/Path/PathScripts/PathSurface.py +++ b/src/Mod/Path/PathScripts/PathSurface.py @@ -77,7 +77,9 @@ __created__ = "2016" __scriptVersion__ = "3t Usable" __lastModified__ = "2019-05-10 10:37 CST" -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -1917,5 +1919,5 @@ def Create(name, obj=None): '''Create(name) ... Creates and returns a Surface operation.''' if obj is None: obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - proxy = ObjectSurface(obj, name) + obj.Proxy = ObjectSurface(obj, name) return obj diff --git a/src/Mod/Path/PathScripts/PathSurfaceGui.py b/src/Mod/Path/PathScripts/PathSurfaceGui.py index 4dd722e887..1e66ab95ff 100644 --- a/src/Mod/Path/PathScripts/PathSurfaceGui.py +++ b/src/Mod/Path/PathScripts/PathSurfaceGui.py @@ -27,7 +27,6 @@ import FreeCADGui import PathScripts.PathSurface as PathSurface import PathScripts.PathGui as PathGui import PathScripts.PathOpGui as PathOpGui -# import PathScripts.PathPocketBaseGui as PathPocketBaseGui from PySide import QtCore @@ -46,8 +45,6 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): def getFields(self, obj): '''getFields(obj) ... transfers values from UI to obj's proprties''' - # if obj.StartVertex != self.form.startVertex.value(): - # obj.StartVertex = self.form.startVertex.value() PathGui.updateInputField(obj, 'DepthOffset', self.form.depthOffset) PathGui.updateInputField(obj, 'SampleInterval', self.form.sampleInterval) @@ -73,7 +70,6 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): def setFields(self, obj): '''setFields(obj) ... transfers obj's property values to UI''' - # self.form.startVertex.setValue(obj.StartVertex) self.selectInComboBox(obj.Algorithm, self.form.algorithmSelect) self.selectInComboBox(obj.BoundBox, self.form.boundBoxSelect) self.selectInComboBox(obj.DropCutterDir, self.form.dropCutterDirSelect) @@ -94,7 +90,6 @@ class TaskPanelOpPage(PathOpGui.TaskPanelPage): def getSignalsForUpdate(self, obj): '''getSignalsForUpdate(obj) ... return list of signals for updating obj''' signals = [] - # signals.append(self.form.startVertex.editingFinished) signals.append(self.form.toolController.currentIndexChanged) signals.append(self.form.algorithmSelect.currentIndexChanged) signals.append(self.form.boundBoxSelect.currentIndexChanged) diff --git a/src/Mod/Path/PathScripts/PathToolController.py b/src/Mod/Path/PathScripts/PathToolController.py index 6dcb0a2c91..ab058ecc2f 100644 --- a/src/Mod/Path/PathScripts/PathToolController.py +++ b/src/Mod/Path/PathScripts/PathToolController.py @@ -24,15 +24,14 @@ ''' Tool Controller defines tool, spindle speed and feed rates for Path Operations ''' import FreeCAD -import Part import Path -import PathScripts import PathScripts.PathLog as PathLog -import PathScripts.PathUtil as PathUtil from PySide import QtCore -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathToolControllerGui.py b/src/Mod/Path/PathScripts/PathToolControllerGui.py index 8b03c2aca8..7a7222267a 100644 --- a/src/Mod/Path/PathScripts/PathToolControllerGui.py +++ b/src/Mod/Path/PathScripts/PathToolControllerGui.py @@ -25,7 +25,6 @@ import FreeCAD import FreeCADGui import Part -import Path import PathScripts import PathScripts.PathGui as PathGui import PathScripts.PathLog as PathLog diff --git a/src/Mod/Path/PathScripts/PathToolEdit.py b/src/Mod/Path/PathScripts/PathToolEdit.py index 75ddb2bf4c..5503ec218a 100644 --- a/src/Mod/Path/PathScripts/PathToolEdit.py +++ b/src/Mod/Path/PathScripts/PathToolEdit.py @@ -25,11 +25,10 @@ import FreeCAD import FreeCADGui import Path -import PathScripts.PathGui as PathGui import PathScripts.PathLog as PathLog import math -from PySide import QtCore, QtGui +from PySide import QtGui PathLog.setLevel(PathLog.Level.INFO, PathLog.thisModule()) #PathLog.trackModule(PathLog.thisModule()) diff --git a/src/Mod/Path/PathScripts/PathUtil.py b/src/Mod/Path/PathScripts/PathUtil.py index 2ef934a922..b046741aa0 100644 --- a/src/Mod/Path/PathScripts/PathUtil.py +++ b/src/Mod/Path/PathScripts/PathUtil.py @@ -33,11 +33,11 @@ other than PathLog, then it probably doesn't belong here. ''' import six - import PathScripts.PathLog as PathLog -import sys -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: diff --git a/src/Mod/Path/PathScripts/PathUtils.py b/src/Mod/Path/PathScripts/PathUtils.py index ac651b25ae..d200a29296 100644 --- a/src/Mod/Path/PathScripts/PathUtils.py +++ b/src/Mod/Path/PathScripts/PathUtils.py @@ -38,7 +38,9 @@ from PathScripts import PathLog from PySide import QtCore from PySide import QtGui -if False: +LOGLEVEL = False + +if LOGLEVEL: PathLog.setLevel(PathLog.Level.DEBUG, PathLog.thisModule()) PathLog.trackModule(PathLog.thisModule()) else: @@ -406,7 +408,7 @@ def getToolControllers(obj): '''returns all the tool controllers''' try: job = findParentJob(obj) - except: + except Exception: job = None if job: diff --git a/src/Mod/Path/PathScripts/PathUtilsGui.py b/src/Mod/Path/PathScripts/PathUtilsGui.py index 3059f6bf68..d8f9d3f8f8 100644 --- a/src/Mod/Path/PathScripts/PathUtilsGui.py +++ b/src/Mod/Path/PathScripts/PathUtilsGui.py @@ -22,7 +22,6 @@ # * * # *************************************************************************** -import FreeCAD import FreeCADGui import PathScripts import PathScripts.PathJobCmd as PathJobCmd @@ -43,7 +42,6 @@ class PathUtilsUserInput(object): return tc def chooseToolController(self, controllers): - # form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/DlgTCChooser.ui") form = FreeCADGui.PySideUic.loadUi(":/panels/DlgTCChooser.ui") mylist = [i.Label for i in controllers] form.uiToolController.addItems(mylist) @@ -72,7 +70,6 @@ class PathUtilsUserInput(object): if 1 == len(modelObjectSelected): job = modelObjectSelected[0] else: - # form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/DlgJobChooser.ui") form = FreeCADGui.PySideUic.loadUi(":/panels/DlgJobChooser.ui") if modelObjectSelected: mylist = [j.Label for j in modelObjectSelected] diff --git a/src/Mod/Path/PathScripts/PostUtils.py b/src/Mod/Path/PathScripts/PostUtils.py index e4547b1f52..a75a59f8b7 100644 --- a/src/Mod/Path/PathScripts/PostUtils.py +++ b/src/Mod/Path/PathScripts/PostUtils.py @@ -23,7 +23,7 @@ ''' -These are a common functions and classes for creating custom post processors. +These are a common functions and classes for creating custom post processors. ''' from PySide import QtCore, QtGui @@ -33,26 +33,10 @@ FreeCADGui = None if FreeCAD.GuiUp: import FreeCADGui -# class OldHighlighter(QtGui.QSyntaxHighlighter): -# def highlightBlock(self, text): -# myClassFormat = QtGui.QTextCharFormat() -# myClassFormat.setFontWeight(QtGui.QFont.Bold) -# myClassFormat.setForeground(QtCore.Qt.green) -# # the regex pattern to be colored -# pattern = "(G.*?|M.*?)\\s" -# expression = QtCore.QRegExp(pattern) -# index = text.index(expression) -# while index >= 0: -# length = expression.matchedLength() -# setFormat(index, length, myClassFormat) -# index = text.index(expression, index + length) - - class GCodeHighlighter(QtGui.QSyntaxHighlighter): def __init__(self, parent=None): super(GCodeHighlighter, self).__init__(parent) - keywordFormat = QtGui.QTextCharFormat() keywordFormat.setForeground(QtCore.Qt.cyan)