kindred/create
1
1
Fork 0
Code Issues 30 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Renamed LoadTool to ToolController.

Browse Source
This commit is contained in:
Markus Lampert
2017-06-05 16:00:42 -07:00
parent a22b314a99
commit fb5ca9d77b
44 changed files with 545 additions and 545 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Mod/Path/PathScripts/PathJob.py
View File

@@ -100,7 +100,7 @@ class ObjectPathJob:
# controllers = []
# for o in obj.Group:
# if "Proxy" in o.PropertiesList:
# if isinstance(o.Proxy, PathLoadTool.LoadTool):
# if isinstance(o.Proxy, PathToolController.ToolController):
# controllers.append (o.Name)
# return controllers
@@ -178,12 +178,12 @@ class CommandJob:
def Create():
FreeCAD.ActiveDocument.openTransaction(translate("Path_Job", "Create Job"))
FreeCADGui.addModule('PathScripts.PathUtils')
FreeCADGui.addModule('PathScripts.PathLoadTool')
FreeCADGui.addModule('PathScripts.PathToolController')
snippet = '''
import PathScripts.PathLoadTool as PathLoadTool
import PathScripts.PathToolController as PathToolController
obj = FreeCAD.ActiveDocument.addObject("Path::FeatureCompoundPython", "Job")
PathScripts.PathJob.ObjectPathJob(obj)
PathLoadTool.CommandPathLoadTool.Create(obj.Name)
PathToolController.CommandPathToolController.Create(obj.Name)
obj.ViewObject.Proxy.deleteOnReject = True
obj.ViewObject.startEditing()
'''

4
src/Mod/Path/PathScripts/PathPost.py
View File

@@ -31,7 +31,7 @@ import os
import PathScripts.PathLog as PathLog
from PathScripts import PathJob
from PathScripts import PathLoadTool
from PathScripts import PathToolController
from PathScripts import PathUtils
from PathScripts.PathPostProcessor import PostProcessor
from PathScripts.PathPreferences import PathPreferences
@@ -247,7 +247,7 @@ class CommandPathPost:
currTool = None
for obj in job.Group:
PathLog.debug("obj: {}".format(obj.Name))
if not isinstance(obj.Proxy, PathLoadTool.LoadTool):
if not isinstance(obj.Proxy, PathToolController.ToolController):
if obj.ToolController.ToolNumber != currTool:
postlist.append(obj.ToolController)
postlist.append(obj)

26
src/Mod/Path/PathScripts/PathLoadTool.py → src/Mod/Path/PathScripts/PathToolController.py
View File

@@ -45,7 +45,7 @@ def translate(context, text, disambig=None):
return QtCore.QCoreApplication.translate(context, text, disambig)
class LoadTool():
class ToolController():
def __init__(self, obj, tool=1):
PathLog.track('tool: {}'.format(tool))
@@ -92,7 +92,7 @@ class LoadTool():
job = PathUtils.findParentJob(obj)
if job is not None:
for g in job.Group:
if not(isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool)):
if not(isinstance(g.Proxy, PathScripts.PathToolController.ToolController)):
g.touch()
def getTool(self, obj):
@@ -101,7 +101,7 @@ class LoadTool():
return obj.Tool
class _ViewProviderLoadTool:
class _ViewProviderToolController:
def __init__(self, vobj):
vobj.Proxy = self
@@ -155,11 +155,11 @@ class _ViewProviderLoadTool:
return False
class CommandPathLoadTool:
class CommandPathToolController:
def GetResources(self):
return {'Pixmap': 'Path-LengthOffset',
'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_LoadTool", "Add Tool Controller to the Job"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_LoadTool", "Add Tool Controller")}
'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_ToolController", "Add Tool Controller to the Job"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_ToolController", "Add Tool Controller")}
def IsActive(self):
if FreeCAD.ActiveDocument is not None:
@@ -172,11 +172,11 @@ class CommandPathLoadTool:
PathLog.track()
self.Create()
# FreeCAD.ActiveDocument.openTransaction(translate("Path_LoadTool", "Create Tool Controller Object"))
# FreeCAD.ActiveDocument.openTransaction(translate("Path_ToolController", "Create Tool Controller Object"))
# obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "TC")
# PathScripts.PathLoadTool.LoadTool(obj)
# PathScripts.PathLoadTool._ViewProviderLoadTool(obj.ViewObject)
# PathScripts.PathToolController.ToolController(obj)
# PathScripts.PathToolController._ViewProviderToolController(obj.ViewObject)
# PathUtils.addToJob(obj)
@@ -188,9 +188,9 @@ class CommandPathLoadTool:
PathLog.track("tool: {} with toolNumber: {}".format(tool, toolNumber))
obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "Default Tool")
PathScripts.PathLoadTool.LoadTool(obj)
PathScripts.PathToolController.ToolController(obj)
if assignViewProvider:
PathScripts.PathLoadTool._ViewProviderLoadTool(obj.ViewObject)
PathScripts.PathToolController._ViewProviderToolController(obj.ViewObject)
if tool is None:
tool = Path.Tool()
@@ -374,6 +374,6 @@ class SelObserver:
if FreeCAD.GuiUp:
# register the FreeCAD command
FreeCADGui.addCommand('Path_LoadTool', CommandPathLoadTool())
FreeCADGui.addCommand('Path_ToolController', CommandPathToolController())
FreeCAD.Console.PrintLog("Loading PathLoadTool... done\n")
FreeCAD.Console.PrintLog("Loading PathToolController... done\n")

2
src/Mod/Path/PathScripts/PathToolLenOffset.py
View File

@@ -56,7 +56,7 @@ class ToolLenOffset:
obj.Path = Path.Path("(inactive operation)")
obj.ViewObject.Visibility = False
# tie the HeightNumber to the PathLoadTool object ToolNumber
# tie the HeightNumber to the PathToolController object ToolNumber
if len(obj.InList) > 0: # check to see if obj is in the Project group yet
project = obj.InList[0]
tl = int(PathUtils.changeTool(obj, project))

4
src/Mod/Path/PathScripts/PathToolLibraryManager.py
View File

@@ -550,8 +550,8 @@ class EditorPanel():
label = "T{}: {}".format(toolnum, tool.Name)
obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython",label)
PathScripts.PathLoadTool.LoadTool(obj)
PathScripts.PathLoadTool._ViewProviderLoadTool(obj.ViewObject)
PathScripts.PathToolController.ToolController(obj)
PathScripts.PathToolController._ViewProviderToolController(obj.ViewObject)
PathUtils.addToJob(obj, targetlist)
FreeCAD.activeDocument().recompute()
obj.Tool = tool.copy()

8
src/Mod/Path/PathScripts/PathUtils.py
View File

@@ -307,13 +307,13 @@ def changeTool(obj, job):
tlnum = 0
for p in job.Group:
if not hasattr(p, "Group"):
if isinstance(p.Proxy, PathScripts.PathLoadTool.LoadTool) and p.ToolNumber > 0:
if isinstance(p.Proxy, PathScripts.PathToolController.ToolController) and p.ToolNumber > 0:
tlnum = p.ToolNumber
if p == obj:
return tlnum
elif hasattr(p, "Group"):
for g in p.Group:
if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool):
if isinstance(g.Proxy, PathScripts.PathToolController.ToolController):
tlnum = g.ToolNumber
if g == obj:
return tlnum
@@ -330,7 +330,7 @@ def getToolControllers(obj):
if parent is not None and hasattr(parent, 'Group'):
sibs = parent.Group
for g in sibs:
if isinstance(g.Proxy, PathScripts.PathLoadTool.LoadTool):
if isinstance(g.Proxy, PathScripts.PathToolController.ToolController):
controllers.append(g)
return controllers
@@ -345,7 +345,7 @@ def findToolController(obj, name=None):
# First check if a user has selected a tool controller in the tree. Return the first one and remove all from selection
for sel in FreeCADGui.Selection.getSelectionEx():
if hasattr(sel.Object, 'Proxy'):
if isinstance(sel.Object.Proxy, PathScripts.PathLoadTool.LoadTool):
if isinstance(sel.Object.Proxy, PathScripts.PathToolController.ToolController):
if c is None:
c = sel.Object
FreeCADGui.Selection.removeSelection(sel.Object)