From df8c5bb55045ef0f95c0501f3a2a2fa3eb7e7a3b Mon Sep 17 00:00:00 2001 From: Markus Lampert Date: Sat, 19 Aug 2017 16:48:59 -0700 Subject: [PATCH] Fixed merge issue. --- src/Mod/Path/CMakeLists.txt | 1 - .../Gui/Resources/panels/PageOpProfileEdit.ui | 169 ------------------ src/Mod/Path/PathScripts/PathProfileGui.py | 120 ------------- 3 files changed, 290 deletions(-) delete mode 100644 src/Mod/Path/Gui/Resources/panels/PageOpProfileEdit.ui delete mode 100644 src/Mod/Path/PathScripts/PathProfileGui.py diff --git a/src/Mod/Path/CMakeLists.txt b/src/Mod/Path/CMakeLists.txt index 93565ce997..e02400604e 100644 --- a/src/Mod/Path/CMakeLists.txt +++ b/src/Mod/Path/CMakeLists.txt @@ -19,7 +19,6 @@ INSTALL( SET(PathScripts_SRCS PathCommands.py PathScripts/PathAreaOp.py - PathScripts/PathAreaOpGui.py PathScripts/PathArray.py PathScripts/PathCircularHoleBase.py PathScripts/PathCircularHoleBaseGui.py diff --git a/src/Mod/Path/Gui/Resources/panels/PageOpProfileEdit.ui b/src/Mod/Path/Gui/Resources/panels/PageOpProfileEdit.ui deleted file mode 100644 index 44f8fa3791..0000000000 --- a/src/Mod/Path/Gui/Resources/panels/PageOpProfileEdit.ui +++ /dev/null @@ -1,169 +0,0 @@ - - - Form - - - - 0 - 0 - 446 - 419 - - - - Form - - - - - - QFrame::StyledPanel - - - QFrame::Raised - - - - - - Tool Controller - - - - - - - - - - - - - - - - Cut Side - - - - - - - - Outside - - - - - Inside - - - - - - - - Direction - - - - - - - - CW - - - - - CCW - - - - - - - - Extra Offset - - - - - - - - 0 - 0 - - - - - - - - - - - - - - Use Start Point - - - - - - - Process Holes - - - - - - - Use Compensation - - - - - - - Process Cirles - - - - - - - Process Perimeter - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - Gui::InputField - QLineEdit -
Gui/InputField.h
- - - - - diff --git a/src/Mod/Path/PathScripts/PathProfileGui.py b/src/Mod/Path/PathScripts/PathProfileGui.py deleted file mode 100644 index c34b750741..0000000000 --- a/src/Mod/Path/PathScripts/PathProfileGui.py +++ /dev/null @@ -1,120 +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 * -# * * -# *************************************************************************** - -import FreeCAD -import FreeCADGui -import Path -import PathScripts.PathAreaOpGui as PathAreaOpGui -import PathScripts.PathLog as PathLog -import PathScripts.PathProfile as PathProfile -import PathScripts.PathSelection as PathSelection - -from PathScripts import PathUtils -from PySide import QtCore, QtGui - -def translate(context, text, disambig=None): - return QtCore.QCoreApplication.translate(context, text, disambig) - -class TaskPanelOpPage(PathAreaOpGui.TaskPanelPage): - - def getForm(self): - return FreeCADGui.PySideUic.loadUi(":/panels/PageOpProfileEdit.ui") - - def getFields(self, obj): - self.obj.OffsetExtra = FreeCAD.Units.Quantity(self.form.extraOffset.text()).Value - self.obj.UseComp = self.form.useCompensation.isChecked() - self.obj.UseStartPoint = self.form.useStartPoint.isChecked() - self.obj.Side = str(self.form.cutSide.currentText()) - self.obj.Direction = str(self.form.direction.currentText()) - self.obj.processHoles = self.form.processHoles.isChecked() - self.obj.processPerimeter = self.form.processPerimeter.isChecked() - self.obj.processCircles = self.form.processCircles.isChecked() - - tc = PathUtils.findToolController(self.obj, self.form.toolController.currentText()) - self.obj.ToolController = tc - - def setFields(self, obj): - self.form.extraOffset.setText(FreeCAD.Units.Quantity(self.obj.OffsetExtra.Value, FreeCAD.Units.Length).UserString) - self.form.useCompensation.setChecked(self.obj.UseComp) - self.form.useStartPoint.setChecked(self.obj.UseStartPoint) - self.form.processHoles.setChecked(self.obj.processHoles) - self.form.processPerimeter.setChecked(self.obj.processPerimeter) - self.form.processCircles.setChecked(self.obj.processCircles) - - self.selectInComboBox(self.obj.Side, self.form.cutSide) - self.selectInComboBox(self.obj.Direction, self.form.direction) - self.setupToolController(self.obj, self.form.toolController) - - def getSignalsForUpdate(self, obj): - signals = [] - signals.append(self.form.cutSide.currentIndexChanged) - signals.append(self.form.direction.currentIndexChanged) - signals.append(self.form.useCompensation.clicked) - signals.append(self.form.useStartPoint.clicked) - signals.append(self.form.extraOffset.editingFinished) - signals.append(self.form.processHoles.clicked) - signals.append(self.form.processPerimeter.clicked) - signals.append(self.form.processCircles.clicked) - return signals - -class ViewProviderProfile(PathAreaOpGui.ViewProvider): - - def getTaskPanelOpPage(self, obj): - return TaskPanelOpPage(obj) - - def getIcon(self): - return ":/icons/Path-Profile-Face.svg" - - def getSelectionFactory(self): - return PathSelection.profileselect - - -def Create(name): - FreeCAD.ActiveDocument.openTransaction(translate("Path", "Create a Profile")) - obj = PathProfile.Create(name) - vobj = ViewProviderProfile(obj.ViewObject) - - FreeCAD.ActiveDocument.commitTransaction() - obj.ViewObject.startEditing() - return obj - -class CommandPathProfile: - def GetResources(self): - return {'Pixmap': 'Path-Profile-Face', - 'MenuText': QtCore.QT_TRANSLATE_NOOP("PathProfile", "Face Profile"), - 'Accel': "P, F", - 'ToolTip': QtCore.QT_TRANSLATE_NOOP("PathProfile", "Profile based on face or faces")} - - def IsActive(self): - if FreeCAD.ActiveDocument is not None: - for o in FreeCAD.ActiveDocument.Objects: - if o.Name[:3] == "Job": - return True - return False - - def Activated(self): - return Create('Profile') - -FreeCADGui.addCommand('Path_Profile', CommandPathProfile()) -FreeCAD.Console.PrintLog("Loading PathProfileGui... done\n")