diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index 0c5bebe456..420821d86c 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -183,12 +183,6 @@ SET(PathScripts_SRCS PathScripts/PathPreferences.py PathScripts/PathPreferencesAdvanced.py PathScripts/PathPreferencesPathJob.py - PathScripts/PathProfileContour.py - PathScripts/PathProfileContourGui.py - PathScripts/PathProfileEdges.py - PathScripts/PathProfileEdgesGui.py - PathScripts/PathProfileFaces.py - PathScripts/PathProfileFacesGui.py PathScripts/PathProperty.py PathScripts/PathPropertyBag.py PathScripts/PathPropertyBagGui.py diff --git a/src/Mod/Path/Path/Op/Gui/Profile.py b/src/Mod/Path/Path/Op/Gui/Profile.py index 8cb09760e8..da44a3fae2 100644 --- a/src/Mod/Path/Path/Op/Gui/Profile.py +++ b/src/Mod/Path/Path/Op/Gui/Profile.py @@ -169,4 +169,4 @@ Command = PathOpGui.SetupOperation( PathProfile.SetupProperties, ) -FreeCAD.Console.PrintLog("Loading PathProfileFacesGui... done\n") +FreeCAD.Console.PrintLog("Loading PathProfileGui ... done\n") diff --git a/src/Mod/Path/PathScripts/PathProfileContour.py b/src/Mod/Path/PathScripts/PathProfileContour.py deleted file mode 100644 index 56f6c59516..0000000000 --- a/src/Mod/Path/PathScripts/PathProfileContour.py +++ /dev/null @@ -1,53 +0,0 @@ -# -*- coding: utf-8 -*- -# *************************************************************************** -# * Copyright (c) 2016 sliptonic * -# * * -# * 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 * -# * * -# *************************************************************************** -# * Major modifications: 2020 Russell Johnson * - -import FreeCAD -import Path.Op.Profile as PathProfile - - -__title__ = "Path Contour Operation (depreciated)" -__author__ = "sliptonic (Brad Collette)" -__url__ = "https://www.freecadweb.org" -__doc__ = "Implementation of the Contour operation (depreciated)." - - -class ObjectContour(PathProfile.ObjectProfile): - """Pseudo class for Profile operation, - allowing for backward compatibility with pre-existing "Contour" operations.""" - - pass - - -# Eclass - - -def SetupProperties(): - return PathProfile.SetupProperties() - - -def Create(name, obj=None, parentJob=None): - """Create(name) ... Creates and returns a Profile operation.""" - if obj is None: - obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - obj.Proxy = ObjectContour(obj, name, parentJob) - return obj diff --git a/src/Mod/Path/PathScripts/PathProfileContourGui.py b/src/Mod/Path/PathScripts/PathProfileContourGui.py deleted file mode 100644 index 79655c28bd..0000000000 --- a/src/Mod/Path/PathScripts/PathProfileContourGui.py +++ /dev/null @@ -1,56 +0,0 @@ -# -*- coding: utf-8 -*- -# *************************************************************************** -# * Copyright (c) 2017 sliptonic * -# * * -# * 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 * -# * * -# *************************************************************************** -# * Major modifications: 2020 Russell Johnson * - -import FreeCAD -import Path -import Path.Op.Gui.Base as PathOpGui -import Path.Op.Gui.Profile as PathProfileGui -import Path.Op.Profile as PathProfile -from PySide.QtCore import QT_TRANSLATE_NOOP - -__title__ = "Path Contour Operation UI (depreciated)" -__author__ = "sliptonic (Brad Collette)" -__url__ = "https://www.freecadweb.org" -__doc__ = "Contour operation page controller and command implementation (deprecated)." - - -class TaskPanelOpPage(PathProfileGui.TaskPanelOpPage): - """Pseudo page controller class for Profile operation, - allowing for backward compatibility with pre-existing "Contour" operations.""" - - pass - - -Command = PathOpGui.SetupOperation( - "Profile", - PathProfile.Create, - TaskPanelOpPage, - "Path_Contour", - QT_TRANSLATE_NOOP("Path_Profile", "Profile"), - QT_TRANSLATE_NOOP( - "Path_Profile", "Profile entire model, selected face(s) or selected edge(s)" - ), - PathProfile.SetupProperties, -) - -FreeCAD.Console.PrintLog("Loading PathProfileContourGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathProfileEdges.py b/src/Mod/Path/PathScripts/PathProfileEdges.py deleted file mode 100644 index 2bbd0a5020..0000000000 --- a/src/Mod/Path/PathScripts/PathProfileEdges.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -# *************************************************************************** -# * Copyright (c) 2016 sliptonic * -# * * -# * 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 * -# * * -# *************************************************************************** -# * Major modifications: 2020 Russell Johnson * - -import FreeCAD -import Path -import Path.Op.Profile as PathProfile - - -__title__ = "Path Profile Edges Operation (depreciated)" -__author__ = "sliptonic (Brad Collette)" -__url__ = "https://www.freecadweb.org" -__doc__ = "Path Profile operation based on edges (depreciated)." -__contributors__ = "russ4262 (Russell Johnson)" - - -class ObjectProfile(PathProfile.ObjectProfile): - """Pseudo class for Profile operation, - allowing for backward compatibility with pre-existing "Profile Edges" operations.""" - - pass - - -# Eclass - - -def SetupProperties(): - return PathProfile.SetupProperties() - - -def Create(name, obj=None, parentJob=None): - """Create(name) ... Creates and returns a Profile operation.""" - if obj is None: - obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - obj.Proxy = ObjectProfile(obj, name, parentJob) - return obj diff --git a/src/Mod/Path/PathScripts/PathProfileEdgesGui.py b/src/Mod/Path/PathScripts/PathProfileEdgesGui.py deleted file mode 100644 index d78bccb7ac..0000000000 --- a/src/Mod/Path/PathScripts/PathProfileEdgesGui.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -# *************************************************************************** -# * Copyright (c) 2017 sliptonic * -# * * -# * 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 * -# * * -# *************************************************************************** -# * Major modifications: 2020 Russell Johnson * - -import FreeCAD -import Path.Op.Gui.Base as PathOpGui -import Path.Op.Gui.Profile as PathProfileGui -import Path.Op.Profile as PathProfile -from PySide.QtCore import QT_TRANSLATE_NOOP - -__title__ = "Path Profile Edges Operation UI (depreciated)" -__author__ = "sliptonic (Brad Collette)" -__url__ = "https://www.freecadweb.org" -__doc__ = ( - "Profile Edges operation page controller and command implementation (deprecated)." -) - - -class TaskPanelOpPage(PathProfileGui.TaskPanelOpPage): - """Pseudo page controller class for Profile operation, - allowing for backward compatibility with pre-existing "Profile Edges" operations.""" - - pass - - -Command = PathOpGui.SetupOperation( - "Profile", - PathProfile.Create, - TaskPanelOpPage, - "Path_Contour", - QT_TRANSLATE_NOOP("Path_Profile", "Profile"), - QT_TRANSLATE_NOOP( - "Path_Profile", "Profile entire model, selected face(s) or selected edge(s)" - ), - PathProfile.SetupProperties, -) - -FreeCAD.Console.PrintLog("Loading PathProfileEdgesGui... done\n") diff --git a/src/Mod/Path/PathScripts/PathProfileFaces.py b/src/Mod/Path/PathScripts/PathProfileFaces.py deleted file mode 100644 index 14922b3951..0000000000 --- a/src/Mod/Path/PathScripts/PathProfileFaces.py +++ /dev/null @@ -1,55 +0,0 @@ -# -*- coding: utf-8 -*- -# *************************************************************************** -# * Copyright (c) 2014 Yorik van Havre * -# * Copyright (c) 2020 Schildkroet * -# * * -# * 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 * -# * * -# *************************************************************************** -# * Major modifications: 2020 Russell Johnson * - -import FreeCAD -import Path.Op.Profile as PathProfile - - -__title__ = "Path Profile Faces Operation (depreciated)" -__author__ = "sliptonic (Brad Collette)" -__url__ = "https://www.freecadweb.org" -__doc__ = "Path Profile operation based on faces (depreciated)." -__contributors__ = "Schildkroet" - - -class ObjectProfile(PathProfile.ObjectProfile): - """Pseudo class for Profile operation, - allowing for backward compatibility with pre-existing "Profile Faces" operations.""" - - pass - - -# Eclass - - -def SetupProperties(): - return PathProfile.SetupProperties() - - -def Create(name, obj=None, parentJob=None): - """Create(name) ... Creates and returns a Profile operation.""" - if obj is None: - obj = FreeCAD.ActiveDocument.addObject("Path::FeaturePython", name) - obj.Proxy = ObjectProfile(obj, name, parentJob) - return obj diff --git a/src/Mod/Path/PathScripts/PathProfileFacesGui.py b/src/Mod/Path/PathScripts/PathProfileFacesGui.py deleted file mode 100644 index 93d487422b..0000000000 --- a/src/Mod/Path/PathScripts/PathProfileFacesGui.py +++ /dev/null @@ -1,57 +0,0 @@ -# -*- coding: utf-8 -*- -# *************************************************************************** -# * Copyright (c) 2017 sliptonic * -# * * -# * 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 * -# * * -# *************************************************************************** -# * Major modifications: 2020 Russell Johnson * - -import FreeCAD -import Path.Op.Gui.Base as PathOpGui -import Path.Op.Gui.Profile as PathProfileGui -import Path.Op.Profile as PathProfile -from PySide.QtCore import QT_TRANSLATE_NOOP - -__title__ = "Path Profile Faces Operation UI (depreciated)" -__author__ = "sliptonic (Brad Collette)" -__url__ = "https://www.freecadweb.org" -__doc__ = ( - "Profile Faces operation page controller and command implementation (deprecated)." -) - - -class TaskPanelOpPage(PathProfileGui.TaskPanelOpPage): - """Pseudo page controller class for Profile operation, - allowing for backward compatibility with pre-existing "Profile Faces" operations.""" - - pass - - -Command = PathOpGui.SetupOperation( - "Profile", - PathProfile.Create, - TaskPanelOpPage, - "Path_Contour", - QT_TRANSLATE_NOOP("Path_Profile", "Profile"), - QT_TRANSLATE_NOOP( - "Path_Profile", "Profile entire model, selected face(s) or selected edge(s)" - ), - PathProfile.SetupProperties, -) - -FreeCAD.Console.PrintLog("Loading PathProfileFacesGui... done\n") diff --git a/src/Mod/Path/PathTests/TestPathDressupDogbone.py b/src/Mod/Path/PathTests/TestPathDressupDogbone.py index d8622c983c..f41260ace5 100644 --- a/src/Mod/Path/PathTests/TestPathDressupDogbone.py +++ b/src/Mod/Path/PathTests/TestPathDressupDogbone.py @@ -24,7 +24,7 @@ import FreeCAD import Path import Path.Dressup.Gui.Dogbone as PathDressupDogbone import PathScripts.PathJob as PathJob -import PathScripts.PathProfileFaces as PathProfileFaces +import Path.Op.Profile as PathProfile from PathTests.PathTestUtils import PathTestBase @@ -135,7 +135,7 @@ class TestDressupDogbone(PathTestBase): PathJob.Create("Job", [cut], None) - profile = PathProfileFaces.Create("Profile Faces") + profile = PathProfile.Create("Profile") profile.Base = (cut, face) profile.StepDown = 5 # set start and final depth in order to eliminate effects of stock (and its default values)