diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index 2e01e0f88f..18f604075b 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -37,8 +37,6 @@ SET(PathScripts_SRCS PathScripts/PathDrillingGui.py PathScripts/PathEngrave.py PathScripts/PathEngraveGui.py - PathScripts/PathFacePocket.py - PathScripts/PathFaceProfile.py PathScripts/PathFixture.py PathScripts/PathGeom.py PathScripts/PathGetPoint.py diff --git a/src/Mod/Path/InitGui.py b/src/Mod/Path/InitGui.py index d74aa6abe4..5018636afd 100644 --- a/src/Mod/Path/InitGui.py +++ b/src/Mod/Path/InitGui.py @@ -54,8 +54,6 @@ class PathWorkbench (Workbench): from PathScripts import PathDressupTagGui from PathScripts import PathDrillingGui from PathScripts import PathEngraveGui - from PathScripts import PathFacePocket - from PathScripts import PathFaceProfile from PathScripts import PathFixture from PathScripts import PathHelixGui from PathScripts import PathHop @@ -81,7 +79,7 @@ class PathWorkbench (Workbench): # build commands list projcmdlist = ["Path_Job", "Path_Post", "Path_Inspect", "Path_Sanity"] toolcmdlist = ["Path_ToolLibraryEdit"] - prepcmdlist = ["Path_Plane", "Path_Fixture", "Path_ToolLenOffset", "Path_Comment", "Path_Stop", "Path_FaceProfile", "Path_FacePocket", "Path_Custom", "Path_Shape"] + prepcmdlist = ["Path_Plane", "Path_Fixture", "Path_ToolLenOffset", "Path_Comment", "Path_Stop", "Path_Custom", "Path_Shape"] twodopcmdlist = ["Path_Contour", "Path_Profile_Faces", "Path_Profile_Edges", "Path_Pocket", "Path_Drilling", "Path_Engrave", "Path_MillFace", "Path_Helix"] threedopcmdlist = ["Path_Surfacing"] modcmdlist = ["Path_OperationCopy", "Path_Array", "Path_SimpleCopy" ] diff --git a/src/Mod/Path/PathScripts/PathFacePocket.py b/src/Mod/Path/PathScripts/PathFacePocket.py deleted file mode 100644 index f813c2d069..0000000000 --- a/src/Mod/Path/PathScripts/PathFacePocket.py +++ /dev/null @@ -1,200 +0,0 @@ -# -*- coding: utf-8 -*- -# *************************************************************************** -# * * -# * Copyright (c) 2014 Yorik van Havre * -# * * -# * This program is free software; you can redistribute it and/or modify * -# * it under the terms of the GNU Lesser General Public License (LGPL) * -# * as published by the Free Software Foundation; either version 2 of * -# * the License, or (at your option) any later version. * -# * for detail see the LICENCE text file. * -# * * -# * This program is distributed in the hope that it will be useful, * -# * but WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -# * GNU Library General Public License for more details. * -# * * -# * You should have received a copy of the GNU Library General Public * -# * License along with this program; if not, write to the Free Software * -# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * -# * USA * -# * * -# *************************************************************************** - -import FreeCAD -import FreeCADGui -import Path -from PySide import QtCore, QtGui - -"""Path Pocket object and FreeCAD command""" - -# Qt tanslation handling -def translate(context, text, disambig=None): - return QtCore.QCoreApplication.translate(context, text, disambig) - - -class ObjectFacePocket: - - def __init__(self,obj): - obj.addProperty("App::PropertyLinkSub","Base","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The base geometry of this object")) - obj.addProperty("App::PropertyDistance","Offset","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The distance between the face and the path")) - obj.addProperty("App::PropertyInteger","StartVertex","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The vertex index to start the path from")) - obj.addProperty("App::PropertyEnumeration","FirstMove","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The type of the first move")) - obj.addProperty("App::PropertyDistance","RetractHeight","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The height to travel at between loops")) - obj.addProperty("App::PropertyBool","Fill","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","Perform only one loop or fill the whole shape")) - obj.FirstMove = ["G0","G1"] - obj.Proxy = self - - def __getstate__(self): - return None - - def __setstate__(self, state): - return None - - def execute(self, obj): - if obj.Base and obj.Offset.Value: - import Part - import DraftGeomUtils - if "Face" in obj.Base[1][0]: - shape = getattr(obj.Base[0].Shape, obj.Base[1][0]) - else: - edges = [getattr(obj.Base[0].Shape, sub) - for sub in obj.Base[1]] - shape = Part.Wire(edges) - - # absolute coords, millimeters, cancel offsets - output = "G90\nG21\nG40\n" - - # build offsets - offsets = [] - nextradius = obj.Offset.Value - result = DraftGeomUtils.pocket2d(shape, nextradius) - while result: - offsets.extend(result) - if obj.Fill: - nextradius += obj.Offset.Value - result = DraftGeomUtils.pocket2d(shape, nextradius) - else: - result = [] - - first = True - point = None - - # revert the list so we start with the outer wires - offsets.reverse() - - # loop over successive wires - while offsets: - currentWire = offsets.pop() - if first: - currentWire = DraftGeomUtils.rebaseWire( - currentWire, obj.StartVertex) - last = None - for edge in currentWire.Edges: - if not last: - # we set the base GO to our first point - if first: - output += obj.FirstMove - first = False - else: - if obj.RetractHeight.Value and point: - output += "G0 X" + str("%f" % point.x) + " Y" + str( - "%f" % point.y) + " Z" + str("%f" % obj.RetractHeight.Value) + "\n" - last = edge.Vertexes[0].Point - output += "G0 X" + str("%f" % last.x) + " Y" + str( - "%f" % last.y) + " Z" + str("%f" % obj.RetractHeight.Value) + "\n" - output += "G1" - last = edge.Vertexes[0].Point - output += " X" + \ - str("%f" % last.x) + " Y" + str("%f" % - last.y) + " Z" + str("%f" % last.z) + "\n" - if isinstance(edge.Curve, Part.Circle): - point = edge.Vertexes[-1].Point - if point == last: # edges can come flipped - point = edge.Vertexes[0].Point - center = edge.Curve.Center - relcenter = center.sub(last) - # v1 = last.sub(center) - # v2 = point.sub(center) - if edge.Curve.Axis.z < 0: - output += "G2" - else: - output += "G3" - output += " X" + \ - str("%f" % point.x) + " Y" + str("%f" % - point.y) + " Z" + str("%f" % point.z) - output += " I" + str("%f" % relcenter.x) + " J" + str( - "%f" % relcenter.y) + " K" + str("%f" % relcenter.z) - output += "\n" - last = point - else: - point = edge.Vertexes[-1].Point - if point == last: # edges can come flipped - point = edge.Vertexes[0].Point - output += "G1 X" + \ - str("%f" % point.x) + " Y" + str("%f" % - point.y) + " Z" + str("%f" % point.z) + "\n" - last = point - - # print output - path = Path.Path(output) - obj.Path = path - - -class CommandPathFacePocket: - - def GetResources(self): - return {'Pixmap': 'Path-FacePocket', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_FacePocket", "Face Pocket"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_FacePocket", "Creates a pocket inside a loop of edges or a face")} - - def IsActive(self): - return not FreeCAD.ActiveDocument is None - - def Activated(self): - - # check that the selection contains exactly what we want - selection = FreeCADGui.Selection.getSelectionEx() - if len(selection) != 1: - FreeCAD.Console.PrintError(translate("Path_FacePocket", "Please select an edges loop from one object, or a single face\n")) - return - if len(selection[0].SubObjects) == 0: - FreeCAD.Console.PrintError(translate("Path_FacePocket", "Please select an edges loop from one object, or a single face\n")) - return - for s in selection[0].SubObjects: - if s.ShapeType != "Edge": - if (s.ShapeType != "Face") or (len(selection[0].SubObjects) != 1): - FreeCAD.Console.PrintError(translate("Path_FacePocket", "Please select only edges or a single face\n")) - return - if selection[0].SubObjects[0].ShapeType == "Edge": - try: - import Part - # w = Part.Wire(selection[0].SubObjects) - except: - FreeCAD.Console.PrintError(translate("Path_FacePocket", "The selected edges don't form a loop\n")) - return - - # if everything is ok, execute and register the transaction in the - # undo/redo stack - FreeCAD.ActiveDocument.openTransaction("Create Pocket") - FreeCADGui.addModule("PathScripts.PathFacePocket") - FreeCADGui.addModule("PathScripts.PathUtils") - FreeCADGui.doCommand( - 'obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython","FacePocket")') - FreeCADGui.doCommand( - 'PathScripts.PathFacePocket.ObjectFacePocket(obj)') - subs = "[" - for s in selection[0].SubElementNames: - subs += '"' + s + '",' - subs += "]" - FreeCADGui.doCommand( - 'obj.Base = (FreeCAD.ActiveDocument.' + selection[0].ObjectName + ',' + subs + ')') - FreeCADGui.doCommand('obj.ViewObject.Proxy = 0') - FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') - FreeCAD.ActiveDocument.commitTransaction() - FreeCAD.ActiveDocument.recompute() - - -if FreeCAD.GuiUp: - # register the FreeCAD command - FreeCADGui.addCommand('Path_FacePocket', CommandPathFacePocket()) diff --git a/src/Mod/Path/PathScripts/PathFaceProfile.py b/src/Mod/Path/PathScripts/PathFaceProfile.py deleted file mode 100644 index afb3def343..0000000000 --- a/src/Mod/Path/PathScripts/PathFaceProfile.py +++ /dev/null @@ -1,154 +0,0 @@ -# -*- coding: utf-8 -*- -# *************************************************************************** -# * * -# * Copyright (c) 2014 Yorik van Havre * -# * * -# * This program is free software; you can redistribute it and/or modify * -# * it under the terms of the GNU Lesser General Public License (LGPL) * -# * as published by the Free Software Foundation; either version 2 of * -# * the License, or (at your option) any later version. * -# * for detail see the LICENCE text file. * -# * * -# * This program is distributed in the hope that it will be useful, * -# * but WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * -# * GNU Library General Public License for more details. * -# * * -# * You should have received a copy of the GNU Library General Public * -# * License along with this program; if not, write to the Free Software * -# * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 * -# * USA * -# * * -# *************************************************************************** - -import FreeCAD -import FreeCADGui -import Path -from PySide import QtCore, QtGui - -"""Path Profile object and FreeCAD command""" - -# Qt tanslation handling -def translate(context, text, disambig=None): - return QtCore.QCoreApplication.translate(context, text, disambig) - - -class ObjectFaceProfile: - - def __init__(self,obj): - obj.addProperty("App::PropertyLinkSub","Base","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The base geometry of this object")) - obj.addProperty("App::PropertyDistance","Offset","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The distance between the face and the path")) - obj.addProperty("App::PropertyInteger","StartVertex","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The vertex index to start the path from")) - obj.addProperty("App::PropertyEnumeration","FirstMove","Path",QtCore.QT_TRANSLATE_NOOP("App::Property","The type of the first move")) - obj.FirstMove = ["G0","G1"] - obj.Proxy = self - - def __getstate__(self): - return None - - def __setstate__(self, state): - return None - - def execute(self, obj): - if obj.Base: - import Part - import DraftGeomUtils - # we only consider the outer wire if this is a Face - shape = getattr(obj.Base[0].Shape, obj.Base[1][0]) - if shape.ShapeType == "Wire": - wire = shape - else: - wire = shape.OuterWire - # we use the OCC offset feature - if obj.Offset.Value != 0: - offset = wire.makeOffset(obj.Offset.Value) - else: - offset = wire - # absolute coords, millimeters, cancel offsets - output = "G90\nG21\nG40\n" - # reorder the wire - offset = DraftGeomUtils.rebaseWire(offset, obj.StartVertex) - # we create the path from the offset shape - last = None - for edge in offset.Edges: - if not last: - # we set the first move to our first point - last = edge.Vertexes[0].Point - output += obj.FirstMove + " X" + \ - str("%f" % last.x) + " Y" + str("%f" % - last.y) + " Z" + str("%f" % last.z) + "\n" - if isinstance(edge.Curve, Part.Circle): - point = edge.Vertexes[-1].Point - if point == last: # edges can come flipped - point = edge.Vertexes[0].Point - center = edge.Curve.Center - relcenter = center.sub(last) - v1 = last.sub(center) - v2 = point.sub(center) - if v1.cross(v2).z < 0: - output += "G2" - else: - output += "G3" - output += " X" + str("%f" % point.x) + " Y" + \ - str("%f" % point.y) + " Z" + str("%f" % point.z) - output += " I" + str("%f" % relcenter.x) + " J" + str("%f" % - relcenter.y) + " K" + str("%f" % relcenter.z) - output += "\n" - last = point - else: - point = edge.Vertexes[-1].Point - if point == last: # edges can come flipped - point = edge.Vertexes[0].Point - output += "G1 X" + \ - str("%f" % point.x) + " Y" + str("%f" % - point.y) + " Z" + str("%f" % point.z) + "\n" - last = point - # print output - path = Path.Path(output) - obj.Path = path - - -class CommandPathFaceProfile: - - def GetResources(self): - return {'Pixmap': 'Path-FaceProfile', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("Path_FaceProfile", "Face Profile"), - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("Path_FaceProfile", "Creates a profile object around a selected face")} - - def IsActive(self): - return FreeCAD.ActiveDocument is not None - - def Activated(self): - - # check that the selection contains exactly what we want - selection = FreeCADGui.Selection.getSelectionEx() - if len(selection) != 1: - FreeCAD.Console.PrintError(translate("Path_FaceProfile", "Please select one face or wire\n")) - return - if len(selection[0].SubObjects) != 1: - FreeCAD.Console.PrintError(translate("Path_FaceProfile", "Please select only one face or wire\n")) - return - if not selection[0].SubObjects[0].ShapeType in ["Face", "Wire"]: - FreeCAD.Console.PrintError(translate("Path_FaceProfile", "Please select only a face or a wire\n")) - return - - # if everything is ok, execute and register the transaction in the - # undo/redo stack - FreeCAD.ActiveDocument.openTransaction("Create Profile") - FreeCADGui.addModule("PathScripts.PathFaceProfile") - FreeCADGui.addModule("PathScripts.PathUtils") - FreeCADGui.doCommand( - 'obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython","FaceProfile")') - FreeCADGui.doCommand( - 'PathScripts.PathFaceProfile.ObjectFaceProfile(obj)') - FreeCADGui.doCommand('obj.Base = (FreeCAD.ActiveDocument.' + selection[ - 0].ObjectName + ',"' + selection[0].SubElementNames[0] + '")') - FreeCADGui.doCommand('obj.ViewObject.Proxy = 0') - FreeCADGui.doCommand('PathScripts.PathUtils.addToJob(obj)') - FreeCAD.ActiveDocument.commitTransaction() - FreeCAD.ActiveDocument.recompute() - - -if FreeCAD.GuiUp: - # register the FreeCAD command - FreeCADGui.addCommand('Path_FaceProfile', CommandPathFaceProfile())