Renamed dressups to conform to naming scheme.

This commit is contained in:
Markus Lampert 2016-12-19 17:53:01 -08:00
parent d82d050c34
commit 6552304323
3 changed files with 35 additions and 35 deletions

View File

@ -68,10 +68,10 @@ class PathWorkbench (Workbench):
from PathScripts import PathEngrave from PathScripts import PathEngrave
from PathScripts import PathSurface from PathScripts import PathSurface
from PathScripts import PathSanity from PathScripts import PathSanity
from PathScripts import DragknifeDressup from PathScripts import PathDressupDragknife
from PathScripts import PathContour from PathScripts import PathContour
from PathScripts import PathProfileEdges from PathScripts import PathProfileEdges
from PathScripts import DogboneDressup from PathScripts import PathDressupDogbone
from PathScripts import PathMillFace from PathScripts import PathMillFace
import PathCommands import PathCommands
@ -82,7 +82,7 @@ class PathWorkbench (Workbench):
twodopcmdlist = ["Path_Contour", "Path_Profile", "Path_Profile_Edges", "Path_Pocket", "Path_Drilling", "Path_Engrave", "Path_MillFace"] twodopcmdlist = ["Path_Contour", "Path_Profile", "Path_Profile_Edges", "Path_Pocket", "Path_Drilling", "Path_Engrave", "Path_MillFace"]
threedopcmdlist = ["Path_Surfacing"] threedopcmdlist = ["Path_Surfacing"]
modcmdlist = ["Path_Copy", "Path_CompoundExtended", "Path_Array", "Path_SimpleCopy" ] modcmdlist = ["Path_Copy", "Path_CompoundExtended", "Path_Array", "Path_SimpleCopy" ]
dressupcmdlist = ["Dogbone_Dressup", "DragKnife_Dressup"] dressupcmdlist = ["PathDressup_Dogbone", "PathDressup_DragKnife"]
extracmdlist = ["Path_SelectLoop"] extracmdlist = ["Path_SelectLoop"]
#modcmdmore = ["Path_Hop",] #modcmdmore = ["Path_Hop",]
#remotecmdlist = ["Path_Remote"] #remotecmdlist = ["Path_Remote"]

View File

@ -354,20 +354,20 @@ class Bone:
class ObjectDressup: class ObjectDressup:
def __init__(self, obj): def __init__(self, obj):
obj.addProperty("App::PropertyLink", "Base","Base", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "The base path to modify")) obj.addProperty("App::PropertyLink", "Base","Base", QtCore.QT_TRANSLATE_NOOP("PathDressup_Dogbone", "The base path to modify"))
obj.addProperty("App::PropertyEnumeration", "Side", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "The side of path to insert bones")) obj.addProperty("App::PropertyEnumeration", "Side", "Dressup", QtCore.QT_TRANSLATE_NOOP("PathDressup_Dogbone", "The side of path to insert bones"))
obj.Side = [Side.Left, Side.Right] obj.Side = [Side.Left, Side.Right]
obj.Side = Side.Right obj.Side = Side.Right
obj.addProperty("App::PropertyEnumeration", "Style", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "The style of boness")) obj.addProperty("App::PropertyEnumeration", "Style", "Dressup", QtCore.QT_TRANSLATE_NOOP("PathDressup_Dogbone", "The style of boness"))
obj.Style = Style.All obj.Style = Style.All
obj.Style = Style.Dogbone obj.Style = Style.Dogbone
obj.addProperty("App::PropertyIntegerList", "BoneBlacklist", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "Bones that aren't dressed up")) obj.addProperty("App::PropertyIntegerList", "BoneBlacklist", "Dressup", QtCore.QT_TRANSLATE_NOOP("PathDressup_Dogbone", "Bones that aren't dressed up"))
obj.BoneBlacklist = [] obj.BoneBlacklist = []
obj.setEditorMode('BoneBlacklist', 2) # hide this one obj.setEditorMode('BoneBlacklist', 2) # hide this one
obj.addProperty("App::PropertyEnumeration", "Incision", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "The algorithm to determine the bone length")) obj.addProperty("App::PropertyEnumeration", "Incision", "Dressup", QtCore.QT_TRANSLATE_NOOP("PathDressup_Dogbone", "The algorithm to determine the bone length"))
obj.Incision = Incision.All obj.Incision = Incision.All
obj.Incision = Incision.Adaptive obj.Incision = Incision.Adaptive
obj.addProperty("App::PropertyFloat", "Custom", "Dressup", QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "Dressup length if Incision == custom")) obj.addProperty("App::PropertyFloat", "Custom", "Dressup", QtCore.QT_TRANSLATE_NOOP("PathDressup_Dogbone", "Dressup length if Incision == custom"))
obj.Custom = 0.0 obj.Custom = 0.0
obj.Proxy = self obj.Proxy = self
@ -805,7 +805,7 @@ class TaskPanel:
def __init__(self, obj): def __init__(self, obj):
self.obj = obj self.obj = obj
self.form = FreeCADGui.PySideUic.loadUi(":/panels/DogboneEdit.ui") self.form = FreeCADGui.PySideUic.loadUi(":/panels/DogboneEdit.ui")
FreeCAD.ActiveDocument.openTransaction(translate("Dogbone_Dressup", "Edit Dogbone Dress-up")) FreeCAD.ActiveDocument.openTransaction(translate("PathDressup_Dogbone", "Edit Dogbone Dress-up"))
def reject(self): def reject(self):
FreeCAD.ActiveDocument.abortTransaction() FreeCAD.ActiveDocument.abortTransaction()
@ -967,12 +967,12 @@ class ViewProviderDressup:
PathUtils.addToJob(arg1.Object.Base) PathUtils.addToJob(arg1.Object.Base)
return True return True
class CommandDogboneDressup: class CommandDressupDogbone:
def GetResources(self): def GetResources(self):
return {'Pixmap': 'Path-Dressup', return {'Pixmap': 'Path-Dressup',
'MenuText': QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "Dogbone Dress-up"), 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathDressup_Dogbone", "Dogbone Dress-up"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("Dogbone_Dressup", "Creates a Dogbone Dress-up object from a selected path")} 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathDressup_Dogbone", "Creates a Dogbone Dress-up object from a selected path")}
def IsActive(self): def IsActive(self):
if FreeCAD.ActiveDocument is not None: if FreeCAD.ActiveDocument is not None:
@ -986,27 +986,27 @@ class CommandDogboneDressup:
# check that the selection contains exactly what we want # check that the selection contains exactly what we want
selection = FreeCADGui.Selection.getSelection() selection = FreeCADGui.Selection.getSelection()
if len(selection) != 1: if len(selection) != 1:
FreeCAD.Console.PrintError(translate("Dogbone_Dressup", "Please select one path object\n")) FreeCAD.Console.PrintError(translate("PathDressup_Dogbone", "Please select one path object\n"))
return return
baseObject = selection[0] baseObject = selection[0]
if not baseObject.isDerivedFrom("Path::Feature"): if not baseObject.isDerivedFrom("Path::Feature"):
FreeCAD.Console.PrintError(translate("Dogbone_Dressup", "The selected object is not a path\n")) FreeCAD.Console.PrintError(translate("PathDressup_Dogbone", "The selected object is not a path\n"))
return return
if baseObject.isDerivedFrom("Path::FeatureCompoundPython"): if baseObject.isDerivedFrom("Path::FeatureCompoundPython"):
FreeCAD.Console.PrintError(translate("Dogbone_Dressup", "Please select a Profile or Dogbone Dressup object")) FreeCAD.Console.PrintError(translate("PathDressup_Dogbone", "Please select a Profile or Dogbone Dressup object"))
return return
if not hasattr(baseObject, "Side"): if not hasattr(baseObject, "Side"):
FreeCAD.Console.PrintError(translate("Dogbone_Dressup", "Please select a Profile or Dogbone Dressup object")) FreeCAD.Console.PrintError(translate("PathDressup_Dogbone", "Please select a Profile or Dogbone Dressup object"))
return return
# everything ok! # everything ok!
FreeCAD.ActiveDocument.openTransaction(translate("Dogbone_Dressup", "Create Dogbone Dress-up")) FreeCAD.ActiveDocument.openTransaction(translate("PathDressup_Dogbone", "Create Dogbone Dress-up"))
FreeCADGui.addModule("PathScripts.DogboneDressup") FreeCADGui.addModule("PathScripts.PathDressupDogbone")
FreeCADGui.addModule("PathScripts.PathUtils") FreeCADGui.addModule("PathScripts.PathUtils")
FreeCADGui.doCommand('obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "DogboneDressup")') FreeCADGui.doCommand('obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", "DogboneDressup")')
FreeCADGui.doCommand('dbo = PathScripts.DogboneDressup.ObjectDressup(obj)') FreeCADGui.doCommand('dbo = PathScripts.PathDressupDogbone.ObjectDressup(obj)')
FreeCADGui.doCommand('obj.Base = FreeCAD.ActiveDocument.' + baseObject.Name) FreeCADGui.doCommand('obj.Base = FreeCAD.ActiveDocument.' + baseObject.Name)
FreeCADGui.doCommand('PathScripts.DogboneDressup.ViewProviderDressup(obj.ViewObject)') FreeCADGui.doCommand('PathScripts.PathDressupDogbone.ViewProviderDressup(obj.ViewObject)')
FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)')
FreeCADGui.doCommand('obj.Base.ViewObject.Visibility = False') FreeCADGui.doCommand('obj.Base.ViewObject.Visibility = False')
FreeCADGui.doCommand('dbo.setup(obj)') FreeCADGui.doCommand('dbo.setup(obj)')
@ -1015,6 +1015,6 @@ class CommandDogboneDressup:
if FreeCAD.GuiUp: if FreeCAD.GuiUp:
# register the FreeCAD command # register the FreeCAD command
FreeCADGui.addCommand('Dogbone_Dressup', CommandDogboneDressup()) FreeCADGui.addCommand('PathDressup_Dogbone', CommandDressupDogbone())
FreeCAD.Console.PrintLog("Loading DogboneDressup... done\n") FreeCAD.Console.PrintLog("Loading DressupDogbone... done\n")

View File

@ -467,12 +467,12 @@ class ViewProviderDressup:
return True return True
class CommandDragknifeDressup: class CommandDressupDragknife:
def GetResources(self): def GetResources(self):
return {'Pixmap': 'Path-Dressup', return {'Pixmap': 'Path-Dressup',
'MenuText': QtCore.QT_TRANSLATE_NOOP("DragKnife_Dressup", "DragKnife Dress-up"), 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathDressup_DragKnife", "DragKnife Dress-up"),
'ToolTip': QtCore.QT_TRANSLATE_NOOP("DragKnife_Dressup", "Modifies a path to add dragknife corner actions")} 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathDressup_DragKnife", "Modifies a path to add dragknife corner actions")}
def IsActive(self): def IsActive(self):
if FreeCAD.ActiveDocument is not None: if FreeCAD.ActiveDocument is not None:
@ -487,25 +487,25 @@ class CommandDragknifeDressup:
selection = FreeCADGui.Selection.getSelection() selection = FreeCADGui.Selection.getSelection()
if len(selection) != 1: if len(selection) != 1:
FreeCAD.Console.PrintError( FreeCAD.Console.PrintError(
translate("DragKnife_Dressup", "Please select one path object\n")) translate("PathDressup_DragKnife", "Please select one path object\n"))
return return
if not selection[0].isDerivedFrom("Path::Feature"): if not selection[0].isDerivedFrom("Path::Feature"):
FreeCAD.Console.PrintError( FreeCAD.Console.PrintError(
translate("DragKnife_Dressup", "The selected object is not a path\n")) translate("PathDressup_DragKnife", "The selected object is not a path\n"))
return return
if selection[0].isDerivedFrom("Path::FeatureCompoundPython"): if selection[0].isDerivedFrom("Path::FeatureCompoundPython"):
FreeCAD.Console.PrintError( FreeCAD.Console.PrintError(
translate("DragKnife_Dressup", "Please select a Path object")) translate("PathDressup_DragKnife", "Please select a Path object"))
return return
# everything ok! # everything ok!
FreeCAD.ActiveDocument.openTransaction(translate("DragKnife_Dressup", "Create Dress-up")) FreeCAD.ActiveDocument.openTransaction(translate("PathDressup_DragKnife", "Create Dress-up"))
FreeCADGui.addModule("PathScripts.DragknifeDressup") FreeCADGui.addModule("PathScripts.PathDressupDragknife")
FreeCADGui.addModule("PathScripts.PathUtils") FreeCADGui.addModule("PathScripts.PathUtils")
FreeCADGui.doCommand('obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython","DragknifeDressup")') FreeCADGui.doCommand('obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython","DragknifeDressup")')
FreeCADGui.doCommand('PathScripts.DragknifeDressup.ObjectDressup(obj)') FreeCADGui.doCommand('PathScripts.PathDressupDragknife.ObjectDressup(obj)')
FreeCADGui.doCommand('obj.Base = FreeCAD.ActiveDocument.' + selection[0].Name) FreeCADGui.doCommand('obj.Base = FreeCAD.ActiveDocument.' + selection[0].Name)
FreeCADGui.doCommand('PathScripts.DragknifeDressup.ViewProviderDressup(obj.ViewObject)') FreeCADGui.doCommand('PathScripts.PathDressupDragknife.ViewProviderDressup(obj.ViewObject)')
FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)')
FreeCADGui.doCommand('Gui.ActiveDocument.getObject(obj.Base.Name).Visibility = False') FreeCADGui.doCommand('Gui.ActiveDocument.getObject(obj.Base.Name).Visibility = False')
FreeCADGui.doCommand('obj.filterangle = 20') FreeCADGui.doCommand('obj.filterangle = 20')
@ -518,6 +518,6 @@ class CommandDragknifeDressup:
if FreeCAD.GuiUp: if FreeCAD.GuiUp:
# register the FreeCAD command # register the FreeCAD command
FreeCADGui.addCommand('DragKnife_Dressup', CommandDragknifeDressup()) FreeCADGui.addCommand('PathDressup_DragKnife', CommandDressupDragknife())
FreeCAD.Console.PrintLog("Loading DragKnife_Dressup... done\n") FreeCAD.Console.PrintLog("Loading PathDressup_DragKnife... done\n")