diff --git a/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui b/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui index 22af2b4d961a..9826a41d93a3 100644 --- a/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ContourEdit.ui @@ -23,7 +23,7 @@ - 3 + 2 @@ -31,7 +31,7 @@ 0 0 334 - 327 + 347 @@ -98,7 +98,7 @@ 0 0 334 - 327 + 347 @@ -142,71 +142,13 @@ - - - - 0 - 0 - 334 - 327 - - - - Holding - - - - - - Add New - - - - - - - Delete - - - - - - - - Tag - - - - - Location - - - - - Height - - - - - Length - - - - - Angle - - - - - - 0 0 334 - 327 + 347 @@ -311,20 +253,6 @@ - - - - Plunge Angle - - - - - - - - - - diff --git a/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui b/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui index 18f1ac7b648b..9b96b1ba2231 100644 --- a/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ProfileEdgesEdit.ui @@ -34,7 +34,7 @@ 0 0 334 - 330 + 348 @@ -111,8 +111,8 @@ 0 0 - 109 - 82 + 334 + 348 @@ -181,8 +181,8 @@ 0 0 - 144 - 56 + 334 + 348 @@ -226,71 +226,13 @@ - - - - 0 - 0 - 160 - 111 - - - - Holding - - - - - - Add New - - - - - - - Delete - - - - - - - - Tag - - - - - Location - - - - - Height - - - - - Length - - - - - Angle - - - - - - 0 0 - 278 - 214 + 334 + 348 @@ -304,87 +246,6 @@ QFormLayout::AllNonFixedFieldsGrow - - - - - - - Use Start Point - - - - - - - Use Compensation - - - - - - - Use End Point - - - - - - - - - - - - - - - - - - - - 0.000000000000000 - - - mm - - - - - - - Roll Radius - - - - - - - Plunge Angle - - - - - - - Extra Offset - - - - - - - 0.000000000000000 - - - mm - - - - - - @@ -441,6 +302,46 @@ + + + + + + + Use Start Point + + + + + + + Use Compensation + + + + + + + Use End Point + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + diff --git a/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui b/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui index 7c1cf39714fb..8bcf2b04bd8b 100644 --- a/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui +++ b/src/Mod/Path/Gui/Resources/panels/ProfileEdit.ui @@ -34,7 +34,7 @@ 0 0 381 - 363 + 381 @@ -111,8 +111,8 @@ 0 0 - 109 - 82 + 381 + 381 @@ -178,8 +178,8 @@ 0 0 - 144 - 56 + 381 + 381 @@ -223,71 +223,13 @@ - - - - 0 - 0 - 160 - 111 - - - - Holding - - - - - - Add New - - - - - - - Delete - - - - - - - - Tag - - - - - Location - - - - - Height - - - - - Length - - - - - Angle - - - - - - 0 0 - 274 - 251 + 381 + 381 @@ -345,13 +287,6 @@ - - - - Plunge Angle - - - @@ -386,13 +321,6 @@ - - - - - - - diff --git a/src/Mod/Path/PathScripts/PathContour.py b/src/Mod/Path/PathScripts/PathContour.py index c02a9d2d4eae..9e954cde0333 100644 --- a/src/Mod/Path/PathScripts/PathContour.py +++ b/src/Mod/Path/PathScripts/PathContour.py @@ -36,6 +36,7 @@ # Qt tanslation handling try: _encoding = QtGui.QApplication.UnicodeUTF8 + def translate(context, text, disambig=None): return QtGui.QApplication.translate(context, text, disambig, _encoding) except AttributeError: @@ -51,66 +52,49 @@ def translate(ctxt, txt): """Path Contour object and FreeCAD command""" + class ObjectContour: def __init__(self, obj): - obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","Make False, to prevent operation from generating code")) + obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "Make False, to prevent operation from generating code")) obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "An optional comment for this Contour")) - obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","User Assigned Label")) + obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "User Assigned Label")) - obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property","The tool number in use")) + obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property", "The tool number in use")) obj.ToolNumber = (0, 0, 1000, 1) obj.setEditorMode('ToolNumber', 1) # make this read only - obj.addProperty("App::PropertyString", "ToolDescription", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property","The description of the tool ")) - obj.setEditorMode('ToolDescription', 1) # make this read only + obj.addProperty("App::PropertyString", "ToolDescription", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property", "The description of the tool ")) + obj.setEditorMode('ToolDescription', 1) # make this read only # Depth Properties - obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions")) - obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations.")) - obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool")) - #obj.StepDown = (1, 0.01, 1000, 0.5) - obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z")) - obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z")) + obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height needed to clear clamps and obstructions")) + obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Rapid Safety Height between locations.")) + obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Incremental Step Down of Tool")) + obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Starting Depth of Tool- first cut depth in Z")) + obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Final Depth of Tool- lowest value in Z")) # Start Point Properties - obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The start point of this path")) - obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying a Start Point")) - obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path before start of part edge")) - obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to first part edge")) + obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The start point of this path")) + obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying a Start Point")) + obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path before start of part edge")) + obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to first part edge")) # End Point Properties - obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying an End Point")) - obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path after end of part edge")) - obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to last part edge")) - obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The end point of this path")) + obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying an End Point")) + obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path after end of part edge")) + obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to last part edge")) + obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The end point of this path")) # Contour Properties - obj.addProperty("App::PropertyEnumeration", "Direction", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) + obj.addProperty("App::PropertyEnumeration", "Direction", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) obj.Direction = ['CW', 'CCW'] # this is the direction that the Contour runs - obj.addProperty("App::PropertyBool", "UseComp", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if using Cutter Radius Compensation")) + obj.addProperty("App::PropertyBool", "UseComp", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if using Cutter Radius Compensation")) obj.addProperty("App::PropertyEnumeration", "Side", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "Side of edge that tool should cut")) obj.Side = ['Left', 'Right', 'On'] # side of profile that cutter is on in relation to direction of profile - obj.setEditorMode('Side', 2) # hide - - obj.addProperty("App::PropertyDistance", "RollRadius", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","Radius at start and end")) - obj.addProperty("App::PropertyDistance", "OffsetExtra", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","Extra value to stay away from final Contour- good for roughing toolpath")) - #obj.addProperty("App::PropertyLength", "SegLen", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","Tesselation value for tool paths made from beziers, bsplines, and ellipses")) - obj.addProperty("App::PropertyAngle", "PlungeAngle", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property","Plunge angle with which the tool enters the work piece. Straight down is 90 degrees, if set small enough or zero the tool will descent exactly one layer depth down per turn")) - - obj.addProperty("App::PropertyVectorList", "locs", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of holding tag locations")) - - obj.addProperty("App::PropertyFloatList", "angles", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "heights", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "lengths", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - locations = [] - angles = [] - lengths = [] - heights = [] + obj.setEditorMode('Side', 2) # hide - obj.locs = locations - obj.angles = angles - obj.lengths = lengths - obj.heights = heights + obj.addProperty("App::PropertyDistance", "RollRadius", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "Radius at start and end")) + obj.addProperty("App::PropertyDistance", "OffsetExtra", "Contour", QtCore.QT_TRANSLATE_NOOP("App::Property", "Extra value to stay away from final Contour- good for roughing toolpath")) obj.Proxy = self @@ -151,8 +135,8 @@ def setDepths(proxy, obj): def _buildPathLibarea(self, obj, edgelist): import PathScripts.PathKurveUtils as PathKurveUtils - import math - import area + # import math + # import area output = "" if obj.Comment != "": output += '(' + str(obj.Comment)+')\n' @@ -188,14 +172,6 @@ def _buildPathLibarea(self, obj, edgelist): else: obj.Side = 'Right' - PathKurveUtils.clear_tags() - for i in range(len(obj.locs)): - tag = obj.locs[i] - h = obj.heights[i] - l = obj.lengths[i] - a = math.radians(obj.angles[i]) - PathKurveUtils.add_tag(area.Point(tag.x, tag.y), l, a, h) - depthparams = depth_params( obj.ClearanceHeight.Value, obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0, @@ -251,7 +227,7 @@ def execute(self, obj): baseobject = parentJob.Base if baseobject is None: return - contourwire = TechDraw.findShapeOutline(baseobject.Shape,1, Vector(0,0,1)) + contourwire = TechDraw.findShapeOutline(baseobject.Shape, 1, Vector(0, 0, 1)) edgelist = contourwire.Edges edgelist = Part.__sortEdges__(edgelist) @@ -298,45 +274,9 @@ def __setstate__(self, state): return None -class _CommandAddTag: - def GetResources(self): - return {'Pixmap': 'Path-Holding', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Add Holding Tag"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Add Holding Tag")} - - def IsActive(self): - return FreeCAD.ActiveDocument is not None - - def setpoint(self, point, o): - obj = FreeCADGui.Selection.getSelection()[0] - obj.StartPoint.x = point.x - obj.StartPoint.y = point.y - loc = obj.locs - h = obj.heights - l = obj.lengths - a = obj.angles - - x = point.x - y = point.y - z = float(0.0) - loc.append(Vector(x, y, z)) - h.append(4.0) - l.append(5.0) - a.append(45.0) - - obj.locs = loc - obj.heights = h - obj.lengths = l - obj.angles = a - - def Activated(self): - - FreeCADGui.Snapper.getPoint(callback=self.setpoint) - - class _CommandSetStartPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-StartPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Pick Start Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Pick Start Point")} @@ -355,7 +295,7 @@ def Activated(self): class _CommandSetEndPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-EndPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Pick End Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Contour", "Pick End Point")} @@ -407,7 +347,6 @@ def Activated(self): FreeCADGui.doCommand('obj.OffsetExtra = 0.0') FreeCADGui.doCommand('obj.Direction = "CW"') FreeCADGui.doCommand('obj.UseComp = True') - FreeCADGui.doCommand('obj.PlungeAngle = 90.0') FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') FreeCADGui.doCommand('PathScripts.PathContour.ObjectContour.setDepths(obj.Proxy, obj)') @@ -420,7 +359,7 @@ def Activated(self): class TaskPanel: def __init__(self): self.form = FreeCADGui.PySideUic.loadUi(":/panels/ContourEdit.ui") - #self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/ContourEdit.ui") + # self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/ContourEdit.ui") self.updating = False def accept(self): @@ -450,12 +389,8 @@ def getFields(self): self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "OffsetExtra"): self.obj.OffsetExtra = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value - #if hasattr(self.obj, "SegLen"): - # self.obj.SegLen = self.form.segLen.value() if hasattr(self.obj, "RollRadius"): self.obj.RollRadius = FreeCAD.Units.Quantity(self.form.rollRadius.text()).Value - if hasattr(self.obj, "PlungeAngle"): - self.obj.PlungeAngle = FreeCAD.Units.Quantity(self.form.plungeAngle.text()).Value if hasattr(self.obj, "UseComp"): self.obj.UseComp = self.form.useCompensation.isChecked() if hasattr(self.obj, "UseStartPoint"): @@ -473,9 +408,7 @@ def setFields(self): self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown.Value, FreeCAD.Units.Length).UserString) self.form.extraOffset.setText(FreeCAD.Units.Quantity(self.obj.OffsetExtra.Value, FreeCAD.Units.Length).UserString) - #self.form.segLen.setValue(self.obj.SegLen.Value) self.form.rollRadius.setText(FreeCAD.Units.Quantity(self.obj.RollRadius.Value, FreeCAD.Units.Length).UserString) - self.form.plungeAngle.setText(FreeCAD.Units.Quantity(self.obj.PlungeAngle.Value, FreeCAD.Units.Angle).UserString) self.form.useCompensation.setChecked(self.obj.UseComp) self.form.useStartPoint.setChecked(self.obj.UseStartPoint) self.form.useEndPoint.setChecked(self.obj.UseEndPoint) @@ -485,112 +418,14 @@ def setFields(self): if index >= 0: self.form.direction.setCurrentIndex(index) - self.form.tagTree.blockSignals(True) - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x)+", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.form.tagTree.blockSignals(False) - def open(self): self.s = SelObserver() # install the function mode resident FreeCADGui.Selection.addObserver(self.s) - def getStandardButtons(self): return int(QtGui.QDialogButtonBox.Ok) - def edit(self, item, column): - if not self.updating: - self.resetObject() - - def resetObject(self, remove=None): - "transfers the values from the widget to the object" - loc = [] - h = [] - l = [] - a = [] - - for i in range(self.form.tagTree.topLevelItemCount()): - it = self.form.tagTree.findItems( - str(i+1), QtCore.Qt.MatchExactly, 0)[0] - if (remove is None) or (remove != i): - if it.text(1): - x = float(it.text(1).split()[0].rstrip(",")) - y = float(it.text(1).split()[1].rstrip(",")) - z = float(it.text(1).split()[2].rstrip(",")) - loc.append(Vector(x, y, z)) - - else: - loc.append(0.0) - if it.text(2): - h.append(float(it.text(2))) - else: - h.append(4.0) - if it.text(3): - l.append(float(it.text(3))) - else: - l.append(5.0) - if it.text(4): - a.append(float(it.text(4))) - else: - a.append(45.0) - - self.obj.locs = loc - self.obj.heights = h - self.obj.lengths = l - self.obj.angles = a - - self.obj.touch() - FreeCAD.ActiveDocument.recompute() - - def addElement(self): - self.updating = True - - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(self.form.tagTree.topLevelItemCount())) - item.setText(1, "0.0, 0.0, 0.0") - item.setText(2, str(float(4.0))) - item.setText(3, str(float(10.0))) - item.setText(4, str(float(45.0))) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - self.updating = False - - self.resetObject() - - def removeElement(self): - it = self.form.tagTree.currentItem() - if it: - nr = int(it.text(0))-1 - self.resetObject(remove=nr) - self.update() - - def update(self): - 'fills the treewidget' - self.updating = True - self.form.tagTree.clear() - if self.obj: - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x) + ", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.updating = False - return - - def setupUi(self): # Connect Signals and Slots @@ -609,17 +444,8 @@ def setupUi(self): self.form.useStartPoint.clicked.connect(self.getFields) self.form.useEndPoint.clicked.connect(self.getFields) self.form.extraOffset.editingFinished.connect(self.getFields) - #self.form.segLen.editingFinished.connect(self.getFields) self.form.rollRadius.editingFinished.connect(self.getFields) - # Tag Form - QtCore.QObject.connect( - self.form.tagTree, - QtCore.SIGNAL("itemChanged(QTreeWidgetItem *, int)"), - self.edit) - self.form.addTag.clicked.connect(self.addElement) - self.form.deleteTag.clicked.connect(self.removeElement) - self.setFields() @@ -640,7 +466,6 @@ def addSelection(self, doc, obj, sub, pnt): if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand('Path_Contour', CommandPathContour()) - FreeCADGui.addCommand('Add_Tag', _CommandAddTag()) FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint()) FreeCADGui.addCommand('Set_EndPoint', _CommandSetEndPoint()) diff --git a/src/Mod/Path/PathScripts/PathProfile.py b/src/Mod/Path/PathScripts/PathProfile.py index a9348693af2a..6265ec6e37f7 100644 --- a/src/Mod/Path/PathScripts/PathProfile.py +++ b/src/Mod/Path/PathScripts/PathProfile.py @@ -36,6 +36,7 @@ # Qt tanslation handling try: _encoding = QtGui.QApplication.UnicodeUTF8 + def translate(context, text, disambig=None): return QtGui.QApplication.translate(context, text, disambig, _encoding) except AttributeError: @@ -51,68 +52,51 @@ def translate(ctxt, txt): """Path Profile object and FreeCAD command""" + class ObjectProfile: def __init__(self, obj): - obj.addProperty("App::PropertyLinkSubList", "Base", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","The base geometry of this toolpath")) - obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","Make False, to prevent operation from generating code")) - obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","An optional comment for this profile")) - obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","User Assigned Label")) + obj.addProperty("App::PropertyLinkSubList", "Base", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "The base geometry of this toolpath")) + obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "Make False, to prevent operation from generating code")) + obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "An optional comment for this profile")) + obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "User Assigned Label")) obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", "The tool number in use") obj.ToolNumber = (0, 0, 1000, 1) obj.setEditorMode('ToolNumber', 1) # make this read only obj.addProperty("App::PropertyString", "ToolDescription", "Tool", "The description of the tool ") - obj.setEditorMode('ToolDescription', 1) # make this read only + obj.setEditorMode('ToolDescription', 1) # make this read only # Depth Properties - obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions")) - obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations.")) - obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool")) - #obj.StepDown = (1, 0.01, 1000, 0.5) - obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z")) - obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z")) + obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height needed to clear clamps and obstructions")) + obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Rapid Safety Height between locations.")) + obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Incremental Step Down of Tool")) + obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Starting Depth of Tool- first cut depth in Z")) + obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Final Depth of Tool- lowest value in Z")) # Start Point Properties - obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The start point of this path")) - obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying a Start Point")) - obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path before start of part edge")) - obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to first part edge")) + obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The start point of this path")) + obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying a Start Point")) + obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path before start of part edge")) + obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to first part edge")) # End Point Properties - obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying an End Point")) - obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path after end of part edge")) - obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to last part edge")) - obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The end point of this path")) + obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying an End Point")) + obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path after end of part edge")) + obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to last part edge")) + obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The end point of this path")) # Profile Properties - obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Side of edge that tool should cut")) + obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Side of edge that tool should cut")) obj.Side = ['Left', 'Right', 'On'] # side of profile that cutter is on in relation to direction of profile - obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) + obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) obj.Direction = ['CW', 'CCW'] # this is the direction that the profile runs - obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if using Cutter Radius Compensation")) - - obj.addProperty("App::PropertyDistance", "RollRadius", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Radius at start and end")) - obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Extra value to stay away from final profile- good for roughing toolpath")) -# obj.addProperty("App::PropertyLength", "SegLen", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Tesselation value for tool paths made from beziers, bsplines, and ellipses")) - obj.addProperty("App::PropertyAngle", "PlungeAngle", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Plunge angle with which the tool enters the work piece. Straight down is 90 degrees, if set small enough or zero the tool will descent exactly one layer depth down per turn")) - obj.addProperty("App::PropertyBool", "processHoles", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Profile holes as well as the outline")) - obj.addProperty("App::PropertyBool", "processPerimeter", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Profile the outline")) - - obj.addProperty("App::PropertyVectorList", "locs", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of holding tag locations")) - - obj.addProperty("App::PropertyFloatList", "angles", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "heights", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "lengths", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - locations = [] - angles = [] - lengths = [] - heights = [] - - obj.locs = locations - obj.angles = angles - obj.lengths = lengths - obj.heights = heights + obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if using Cutter Radius Compensation")) + + obj.addProperty("App::PropertyDistance", "RollRadius", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Radius at start and end")) + obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Extra value to stay away from final profile- good for roughing toolpath")) + obj.addProperty("App::PropertyBool", "processHoles", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Profile holes as well as the outline")) + obj.addProperty("App::PropertyBool", "processPerimeter", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Profile the outline")) obj.Proxy = self @@ -145,7 +129,7 @@ def addprofilebase(self, obj, ss, sub=""): obj.FinalDepth = fbb.ZMin elif fbb.ZMax == fbb.ZMin and fbb.ZMax > bb.ZMin: # face/shelf obj.FinalDepth = fbb.ZMin - else: #catch all + else: # catch all obj.FinalDepth = bb.ZMin except: obj.StartDepth = 5.0 @@ -167,8 +151,8 @@ def addprofilebase(self, obj, ss, sub=""): def _buildPathLibarea(self, obj, edgelist, isHole): import PathScripts.PathKurveUtils as PathKurveUtils - import math - import area + # import math + # import area output = "" if obj.Comment != "": output += '(' + str(obj.Comment)+')\n' @@ -220,14 +204,6 @@ def _buildPathLibarea(self, obj, edgelist, isHole): I need to access the location vector, length, angle in radians and height. ''' - PathKurveUtils.clear_tags() - for i in range(len(obj.locs)): - tag = obj.locs[i] - h = obj.heights[i] - l = obj.lengths[i] - a = math.radians(obj.angles[i]) - PathKurveUtils.add_tag(area.Point(tag.x, tag.y), l, a, h) - depthparams = depth_params( obj.ClearanceHeight.Value, obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0, @@ -286,7 +262,7 @@ def execute(self, obj): for b in obj.Base: for sub in b[1]: shape = getattr(b[0].Shape, sub) - if isinstance (shape, Part.Face): + if isinstance(shape, Part.Face): faces.append(shape) if numpy.isclose(abs(shape.normalAt(0, 0).z), 1): # horizontal face holes += shape.Wires[1:] @@ -295,7 +271,7 @@ def execute(self, obj): print ("found a base object which is not a face. Can't continue.") return profileshape = Part.makeCompound(faces) - profilewire = TechDraw.findShapeOutline(profileshape, 1, Vector(0,0,1)) + profilewire = TechDraw.findShapeOutline(profileshape, 1, Vector(0, 0, 1)) if obj.processHoles: for wire in holes: @@ -346,45 +322,9 @@ def __setstate__(self, state): return None -class _CommandAddTag: - def GetResources(self): - return {'Pixmap': 'Path-Holding', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Add Holding Tag"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Add Holding Tag")} - - def IsActive(self): - return FreeCAD.ActiveDocument is not None - - def setpoint(self, point, o): - obj = FreeCADGui.Selection.getSelection()[0] - obj.StartPoint.x = point.x - obj.StartPoint.y = point.y - loc = obj.locs - h = obj.heights - l = obj.lengths - a = obj.angles - - x = point.x - y = point.y - z = float(0.0) - loc.append(Vector(x, y, z)) - h.append(4.0) - l.append(5.0) - a.append(45.0) - - obj.locs = loc - obj.heights = h - obj.lengths = l - obj.angles = a - - def Activated(self): - - FreeCADGui.Snapper.getPoint(callback=self.setpoint) - - class _CommandSetStartPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-StartPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick Start Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick Start Point")} @@ -403,7 +343,7 @@ def Activated(self): class _CommandSetEndPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-EndPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick End Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick End Point")} @@ -457,7 +397,6 @@ def Activated(self): FreeCADGui.doCommand('obj.UseComp = False') FreeCADGui.doCommand('obj.processHoles = False') FreeCADGui.doCommand('obj.processPerimeter = True') - FreeCADGui.doCommand('obj.PlungeAngle = 90.0') FreeCADGui.doCommand('PathScripts.PathProfile._ViewProviderProfile(obj.ViewObject)') FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') @@ -499,12 +438,8 @@ def getFields(self): self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "OffsetExtra"): self.obj.OffsetExtra = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value -# if hasattr(self.obj, "SegLen"): -# self.obj.SegLen = self.form.segLen.value() if hasattr(self.obj, "RollRadius"): self.obj.RollRadius = FreeCAD.Units.Quantity(self.form.rollRadius.text()).Value - if hasattr(self.obj, "PlungeAngle"): - self.obj.PlungeAngle = FreeCAD.Units.Quantity(self.form.plungeAngle.text()).Value if hasattr(self.obj, "UseComp"): self.obj.UseComp = self.form.useCompensation.isChecked() if hasattr(self.obj, "UseStartPoint"): @@ -528,9 +463,7 @@ def setFields(self): self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown.Value, FreeCAD.Units.Length).UserString) self.form.extraOffset.setText(FreeCAD.Units.Quantity(self.obj.OffsetExtra.Value, FreeCAD.Units.Length).UserString) -# self.form.segLen.setValue(self.obj.SegLen.Value) self.form.rollRadius.setText(FreeCAD.Units.Quantity(self.obj.RollRadius.Value, FreeCAD.Units.Length).UserString) - self.form.plungeAngle.setText(FreeCAD.Units.Quantity(self.obj.PlungeAngle.Value, FreeCAD.Units.Angle).UserString) self.form.useCompensation.setChecked(self.obj.UseComp) self.form.useStartPoint.setChecked(self.obj.UseStartPoint) self.form.useEndPoint.setChecked(self.obj.UseEndPoint) @@ -557,21 +490,8 @@ def setFields(self): self.form.baseList.addItem(i[0].Name + "." + sub) self.form.baseList.blockSignals(False) - self.form.tagTree.blockSignals(True) - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x)+", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.form.tagTree.blockSignals(False) self.form.update() - def open(self): self.s = SelObserver() # install the function mode resident @@ -602,7 +522,6 @@ def addBase(self): for sub in i[1]: self.form.baseList.addItem(i[0].Name + "." + sub) - def deleteBase(self): dlist = self.form.baseList.selectedItems() newlist = [] @@ -645,90 +564,6 @@ def reorderBase(self): def getStandardButtons(self): return int(QtGui.QDialogButtonBox.Ok) - def edit(self, item, column): - if not self.updating: - self.resetObject() - - def resetObject(self, remove=None): - "transfers the values from the widget to the object" - loc = [] - h = [] - l = [] - a = [] - - for i in range(self.form.tagTree.topLevelItemCount()): - it = self.form.tagTree.findItems( - str(i+1), QtCore.Qt.MatchExactly, 0)[0] - if (remove is None) or (remove != i): - if it.text(1): - x = float(it.text(1).split()[0].rstrip(",")) - y = float(it.text(1).split()[1].rstrip(",")) - z = float(it.text(1).split()[2].rstrip(",")) - loc.append(Vector(x, y, z)) - - else: - loc.append(0.0) - if it.text(2): - h.append(float(it.text(2))) - else: - h.append(4.0) - if it.text(3): - l.append(float(it.text(3))) - else: - l.append(5.0) - if it.text(4): - a.append(float(it.text(4))) - else: - a.append(45.0) - - self.obj.locs = loc - self.obj.heights = h - self.obj.lengths = l - self.obj.angles = a - - self.obj.touch() - FreeCAD.ActiveDocument.recompute() - - def addElement(self): - self.updating = True - - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(self.form.tagTree.topLevelItemCount())) - item.setText(1, "0.0, 0.0, 0.0") - item.setText(2, str(float(4.0))) - item.setText(3, str(float(10.0))) - item.setText(4, str(float(45.0))) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - self.updating = False - - self.resetObject() - - def removeElement(self): - it = self.form.tagTree.currentItem() - if it: - nr = int(it.text(0))-1 - self.resetObject(remove=nr) - self.update() - - def update(self): - 'fills the treewidget' - self.updating = True - self.form.tagTree.clear() - if self.obj: - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x) + ", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.updating = False - return - - def setupUi(self): # Connect Signals and Slots @@ -754,19 +589,10 @@ def setupUi(self): self.form.useStartPoint.clicked.connect(self.getFields) self.form.useEndPoint.clicked.connect(self.getFields) self.form.extraOffset.editingFinished.connect(self.getFields) -# self.form.segLen.editingFinished.connect(self.getFields) self.form.rollRadius.editingFinished.connect(self.getFields) self.form.processHoles.clicked.connect(self.getFields) self.form.processPerimeter.clicked.connect(self.getFields) - # Tag Form - QtCore.QObject.connect( - self.form.tagTree, - QtCore.SIGNAL("itemChanged(QTreeWidgetItem *, int)"), - self.edit) - self.form.addTag.clicked.connect(self.addElement) - self.form.deleteTag.clicked.connect(self.removeElement) - self.setFields() sel = FreeCADGui.Selection.getSelectionEx() @@ -791,7 +617,6 @@ def addSelection(self, doc, obj, sub, pnt): if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand('Path_Profile', CommandPathProfile()) - FreeCADGui.addCommand('Add_Tag', _CommandAddTag()) FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint()) FreeCADGui.addCommand('Set_EndPoint', _CommandSetEndPoint()) diff --git a/src/Mod/Path/PathScripts/PathProfileEdges.py b/src/Mod/Path/PathScripts/PathProfileEdges.py index d999ffe3c46d..213bfaacdd86 100644 --- a/src/Mod/Path/PathScripts/PathProfileEdges.py +++ b/src/Mod/Path/PathScripts/PathProfileEdges.py @@ -24,7 +24,6 @@ import FreeCAD import Path -from FreeCAD import Vector from PathScripts import PathUtils from PathScripts.PathUtils import depth_params from DraftGeomUtils import findWires @@ -50,70 +49,49 @@ def translate(ctxt, txt): """Path Profile object and FreeCAD command for operating on sets of edges""" + class ObjectProfile: def __init__(self, obj): - obj.addProperty("App::PropertyLinkSubList", "Base", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","The base geometry of this toolpath")) - obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","Make False, to prevent operation from generating code")) - obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","An optional comment for this profile")) - obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property","User Assigned Label")) - - # obj.addProperty("App::PropertyEnumeration", "Algorithm", "Algorithm", "The library or algorithm used to generate the path") - # obj.Algorithm = ['OCC Native', 'libarea'] + obj.addProperty("App::PropertyLinkSubList", "Base", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "The base geometry of this toolpath")) + obj.addProperty("App::PropertyBool", "Active", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "Make False, to prevent operation from generating code")) + obj.addProperty("App::PropertyString", "Comment", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "An optional comment for this profile")) + obj.addProperty("App::PropertyString", "UserLabel", "Path", QtCore.QT_TRANSLATE_NOOP("App::Property", "User Assigned Label")) - obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property","The tool number in use")) + obj.addProperty("App::PropertyIntegerConstraint", "ToolNumber", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property", "The tool number in use")) obj.ToolNumber = (0, 0, 1000, 1) obj.setEditorMode('ToolNumber', 1) # make this read only - obj.addProperty("App::PropertyString", "ToolDescription", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property","The description of the tool")) - obj.setEditorMode('ToolDescription', 1) # make this read onlyt + obj.addProperty("App::PropertyString", "ToolDescription", "Tool", QtCore.QT_TRANSLATE_NOOP("App::Property", "The description of the tool")) + obj.setEditorMode('ToolDescription', 1) # make this read onlyt # Depth Properties - obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","The height needed to clear clamps and obstructions")) - obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Rapid Safety Height between locations")) - obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Incremental Step Down of Tool")) - #obj.StepDown = (1, 0.01, 1000, 0.5) - obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Starting Depth of Tool- first cut depth in Z")) - obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property","Final Depth of Tool- lowest value in Z")) + obj.addProperty("App::PropertyDistance", "ClearanceHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "The height needed to clear clamps and obstructions")) + obj.addProperty("App::PropertyDistance", "SafeHeight", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Rapid Safety Height between locations")) + obj.addProperty("App::PropertyDistance", "StepDown", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Incremental Step Down of Tool")) + obj.addProperty("App::PropertyDistance", "StartDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Starting Depth of Tool- first cut depth in Z")) + obj.addProperty("App::PropertyDistance", "FinalDepth", "Depth", QtCore.QT_TRANSLATE_NOOP("App::Property", "Final Depth of Tool- lowest value in Z")) # Start Point Properties - obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The start point of this path")) - obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying a Start Point")) - obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path before start of part edge")) - obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to first part edge")) + obj.addProperty("App::PropertyVector", "StartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The start point of this path")) + obj.addProperty("App::PropertyBool", "UseStartPoint", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying a Start Point")) + obj.addProperty("App::PropertyLength", "ExtendAtStart", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path before start of part edge")) + obj.addProperty("App::PropertyLength", "LeadInLineLen", "Start Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to first part edge")) # End Point Properties - obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if specifying an End Point")) - obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","extra length of tool path after end of part edge")) - obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","length of straight segment of toolpath that comes in at angle to last part edge")) - obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property","The end point of this path")) + obj.addProperty("App::PropertyBool", "UseEndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if specifying an End Point")) + obj.addProperty("App::PropertyLength", "ExtendAtEnd", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "extra length of tool path after end of part edge")) + obj.addProperty("App::PropertyLength", "LeadOutLineLen", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "length of straight segment of toolpath that comes in at angle to last part edge")) + obj.addProperty("App::PropertyVector", "EndPoint", "End Point", QtCore.QT_TRANSLATE_NOOP("App::Property", "The end point of this path")) # Profile Properties - obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Side of edge that tool should cut")) + obj.addProperty("App::PropertyEnumeration", "Side", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Side of edge that tool should cut")) obj.Side = ['Left', 'Right', 'On'] # side of profile that cutter is on in relation to direction of profile - obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) + obj.addProperty("App::PropertyEnumeration", "Direction", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "The direction that the toolpath should go around the part ClockWise CW or CounterClockWise CCW")) obj.Direction = ['CW', 'CCW'] # this is the direction that the profile runs - obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","make True, if using Cutter Radius Compensation")) - - obj.addProperty("App::PropertyDistance", "RollRadius", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Radius at start and end")) - obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Extra value to stay away from final profile- good for roughing toolpath")) -# obj.addProperty("App::PropertyLength", "SegLen", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Tesselation value for tool paths made from beziers, bsplines, and ellipses")) - obj.addProperty("App::PropertyAngle", "PlungeAngle", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property","Plunge angle with which the tool enters the work piece. Straight down is 90 degrees, if set small enough or zero the tool will descent exactly one layer depth down per turn")) - - obj.addProperty("App::PropertyVectorList", "locs", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of holding tag locations")) - - obj.addProperty("App::PropertyFloatList", "angles", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "heights", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - obj.addProperty("App::PropertyFloatList", "lengths", "Tags", QtCore.QT_TRANSLATE_NOOP("App::Property","List of angles for the holding tags")) - locations = [] - angles = [] - lengths = [] - heights = [] + obj.addProperty("App::PropertyBool", "UseComp", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "make True, if using Cutter Radius Compensation")) - obj.locs = locations - obj.angles = angles - obj.lengths = lengths - obj.heights = heights - #obj.ToolDescription = "UNDEFINED" + obj.addProperty("App::PropertyDistance", "RollRadius", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Radius at start and end")) + obj.addProperty("App::PropertyDistance", "OffsetExtra", "Profile", QtCore.QT_TRANSLATE_NOOP("App::Property", "Extra value to stay away from final profile- good for roughing toolpath")) obj.Proxy = self @@ -146,18 +124,13 @@ def addprofilebase(self, obj, ss, sub=""): obj.FinalDepth = fbb.ZMin elif fbb.ZMax == fbb.ZMin and fbb.ZMax > bb.ZMin: # face/shelf obj.FinalDepth = fbb.ZMin - else: #catch all + else: # catch all obj.FinalDepth = bb.ZMin except: obj.StartDepth = 5.0 obj.ClearanceHeight = 10.0 obj.SafeHeight = 8.0 - # if bb.XLength == fbb.XLength and bb.YLength == fbb.YLength: - # obj.Side = "Left" - # else: - # obj.Side = "Right" - item = (ss, sub) if item in baselist: FreeCAD.Console.PrintWarning("this object already in the list" + "\n") @@ -168,8 +141,8 @@ def addprofilebase(self, obj, ss, sub=""): def _buildPathLibarea(self, obj, edgelist): import PathScripts.PathKurveUtils as PathKurveUtils - import math - import area + # import math + # import area output = "" if obj.Comment != "": output += '(' + str(obj.Comment)+')\n' @@ -216,14 +189,6 @@ def _buildPathLibarea(self, obj, edgelist): I need to access the location vector, length, angle in radians and height. ''' - PathKurveUtils.clear_tags() - for i in range(len(obj.locs)): - tag = obj.locs[i] - h = obj.heights[i] - l = obj.lengths[i] - a = math.radians(obj.angles[i]) - PathKurveUtils.add_tag(area.Point(tag.x, tag.y), l, a, h) - depthparams = depth_params( obj.ClearanceHeight.Value, obj.SafeHeight.Value, obj.StartDepth.Value, obj.StepDown.Value, 0.0, @@ -243,8 +208,6 @@ def execute(self, obj): output = "" toolLoad = PathUtils.getLastToolLoad(obj) - # obj.ToolController = PathUtils.getToolControllers(obj) - # toolLoad = PathUtils.getToolLoad(obj, obj.ToolController) if toolLoad is None or toolLoad.ToolNumber == 0: self.vertFeed = 100 @@ -279,8 +242,6 @@ def execute(self, obj): output += "(Uncompensated Tool Path)" if obj.Base: - # hfaces = [] - # vfaces = [] wires = [] for b in obj.Base: @@ -332,45 +293,9 @@ def __setstate__(self, state): return None -class _CommandAddTag: - def GetResources(self): - return {'Pixmap': 'Path-Holding', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Add Holding Tag"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Add Holding Tag")} - - def IsActive(self): - return FreeCAD.ActiveDocument is not None - - def setpoint(self, point, o): - obj = FreeCADGui.Selection.getSelection()[0] - obj.StartPoint.x = point.x - obj.StartPoint.y = point.y - loc = obj.locs - h = obj.heights - l = obj.lengths - a = obj.angles - - x = point.x - y = point.y - z = float(0.0) - loc.append(Vector(x, y, z)) - h.append(4.0) - l.append(5.0) - a.append(45.0) - - obj.locs = loc - obj.heights = h - obj.lengths = l - obj.angles = a - - def Activated(self): - - FreeCADGui.Snapper.getPoint(callback=self.setpoint) - - class _CommandSetStartPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-StartPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick Start Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick Start Point")} @@ -389,7 +314,7 @@ def Activated(self): class _CommandSetEndPoint: def GetResources(self): - return {'Pixmap': 'Path-Holding', + return {'Pixmap': 'Path-EndPoint', 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick End Point"), 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_Profile", "Pick End Point")} @@ -442,8 +367,6 @@ def Activated(self): FreeCADGui.doCommand('obj.OffsetExtra = 0.0') FreeCADGui.doCommand('obj.Direction = "CW"') FreeCADGui.doCommand('obj.UseComp = False') - FreeCADGui.doCommand('obj.PlungeAngle = 90.0') - #FreeCADGui.doCommand('obj.ActiveTC = None') FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') FreeCAD.ActiveDocument.commitTransaction() @@ -454,7 +377,7 @@ def Activated(self): class TaskPanel: def __init__(self): self.form = FreeCADGui.PySideUic.loadUi(":/panels/ProfileEdgesEdit.ui") - #self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/ProfileEdgesEdit.ui") + # self.form = FreeCADGui.PySideUic.loadUi(FreeCAD.getHomePath() + "Mod/Path/ProfileEdgesEdit.ui") self.updating = False @@ -486,20 +409,14 @@ def getFields(self): self.obj.StepDown = FreeCAD.Units.Quantity(self.form.stepDown.text()).Value if hasattr(self.obj, "OffsetExtra"): self.obj.OffsetExtra = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value -# if hasattr(self.obj, "SegLen"): -# self.obj.SegLen = self.form.segLen.value() if hasattr(self.obj, "RollRadius"): self.obj.RollRadius = FreeCAD.Units.Quantity(self.form.rollRadius.text()).Value - if hasattr(self.obj, "PlungeAngle"): - self.obj.PlungeAngle = FreeCAD.Units.Quantity(self.form.plungeAngle.text()).Value if hasattr(self.obj, "UseComp"): self.obj.UseComp = self.form.useCompensation.isChecked() if hasattr(self.obj, "UseStartPoint"): self.obj.UseStartPoint = self.form.useStartPoint.isChecked() if hasattr(self.obj, "UseEndPoint"): self.obj.UseEndPoint = self.form.useEndPoint.isChecked() - # if hasattr(self.obj, "Algorithm"): - # self.obj.Algorithm = str(self.form.algorithmSelect.currentText()) if hasattr(self.obj, "Side"): self.obj.Side = str(self.form.cutSide.currentText()) if hasattr(self.obj, "Direction"): @@ -513,9 +430,7 @@ def setFields(self): self.form.clearanceHeight.setText(FreeCAD.Units.Quantity(self.obj.ClearanceHeight.Value, FreeCAD.Units.Length).UserString) self.form.stepDown.setText(FreeCAD.Units.Quantity(self.obj.StepDown.Value, FreeCAD.Units.Length).UserString) self.form.extraOffset.setText(FreeCAD.Units.Quantity(self.obj.OffsetExtra.Value, FreeCAD.Units.Length).UserString) -# self.form.segLen.setValue(self.obj.SegLen.Value) self.form.rollRadius.setText(FreeCAD.Units.Quantity(self.obj.RollRadius.Value, FreeCAD.Units.Length).UserString) - self.form.plungeAngle.setText(FreeCAD.Units.Quantity(self.obj.PlungeAngle.Value, FreeCAD.Units.Angle).UserString) self.form.useCompensation.setChecked(self.obj.UseComp) self.form.useStartPoint.setChecked(self.obj.UseStartPoint) self.form.useEndPoint.setChecked(self.obj.UseEndPoint) @@ -535,20 +450,6 @@ def setFields(self): self.form.baseList.addItem(i[0].Name + "." + sub) self.form.baseList.blockSignals(False) - self.form.tagTree.blockSignals(True) - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x)+", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.form.tagTree.blockSignals(False) - - def open(self): self.s = SelObserver() # install the function mode resident @@ -621,90 +522,6 @@ def reorderBase(self): def getStandardButtons(self): return int(QtGui.QDialogButtonBox.Ok) - def edit(self, item, column): - if not self.updating: - self.resetObject() - - def resetObject(self, remove=None): - "transfers the values from the widget to the object" - loc = [] - h = [] - l = [] - a = [] - - for i in range(self.form.tagTree.topLevelItemCount()): - it = self.form.tagTree.findItems( - str(i+1), QtCore.Qt.MatchExactly, 0)[0] - if (remove is None) or (remove != i): - if it.text(1): - x = float(it.text(1).split()[0].rstrip(",")) - y = float(it.text(1).split()[1].rstrip(",")) - z = float(it.text(1).split()[2].rstrip(",")) - loc.append(Vector(x, y, z)) - - else: - loc.append(0.0) - if it.text(2): - h.append(float(it.text(2))) - else: - h.append(4.0) - if it.text(3): - l.append(float(it.text(3))) - else: - l.append(5.0) - if it.text(4): - a.append(float(it.text(4))) - else: - a.append(45.0) - - self.obj.locs = loc - self.obj.heights = h - self.obj.lengths = l - self.obj.angles = a - - self.obj.touch() - FreeCAD.ActiveDocument.recompute() - - def addElement(self): - self.updating = True - - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(self.form.tagTree.topLevelItemCount())) - item.setText(1, "0.0, 0.0, 0.0") - item.setText(2, str(float(4.0))) - item.setText(3, str(float(10.0))) - item.setText(4, str(float(45.0))) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - self.updating = False - - self.resetObject() - - def removeElement(self): - it = self.form.tagTree.currentItem() - if it: - nr = int(it.text(0))-1 - self.resetObject(remove=nr) - self.update() - - def update(self): - 'fills the treewidget' - self.updating = True - self.form.tagTree.clear() - if self.obj: - for i in range(len(self.obj.locs)): - item = QtGui.QTreeWidgetItem(self.form.tagTree) - item.setText(0, str(i+1)) - l = self.obj.locs[i] - item.setText(1, str(l.x) + ", " + str(l.y) + ", " + str(l.z)) - item.setText(2, str(self.obj.heights[i])) - item.setText(3, str(self.obj.lengths[i])) - item.setText(4, str(self.obj.angles[i])) - item.setFlags(item.flags() | QtCore.Qt.ItemIsEditable) - item.setTextAlignment(0, QtCore.Qt.AlignLeft) - self.updating = False - return - - def setupUi(self): # Connect Signals and Slots @@ -730,17 +547,7 @@ def setupUi(self): self.form.useStartPoint.clicked.connect(self.getFields) self.form.useEndPoint.clicked.connect(self.getFields) self.form.extraOffset.editingFinished.connect(self.getFields) -# self.form.segLen.editingFinished.connect(self.getFields) self.form.rollRadius.editingFinished.connect(self.getFields) - - # Tag Form - QtCore.QObject.connect( - self.form.tagTree, - QtCore.SIGNAL("itemChanged(QTreeWidgetItem *, int)"), - self.edit) - self.form.addTag.clicked.connect(self.addElement) - self.form.deleteTag.clicked.connect(self.removeElement) - self.setFields() sel = FreeCADGui.Selection.getSelectionEx() @@ -765,8 +572,7 @@ def addSelection(self, doc, obj, sub, pnt): if FreeCAD.GuiUp: # register the FreeCAD command FreeCADGui.addCommand('Path_Profile_Edges', CommandPathProfileEdges()) - # FreeCADGui.addCommand('Add_Tag', _CommandAddTag()) - # FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint()) - # FreeCADGui.addCommand('Set_EndPoint', _CommandSetEndPoint()) + FreeCADGui.addCommand('Set_StartPoint', _CommandSetStartPoint()) + FreeCADGui.addCommand('Set_EndPoint', _CommandSetEndPoint()) FreeCAD.Console.PrintLog("Loading PathProfileEdges... done\n")