From 34749cae6682737fbaaadaa765cb22652894cd7c Mon Sep 17 00:00:00 2001 From: Marius Stanciu Date: Sat, 26 Jan 2019 00:26:58 +0200 Subject: [PATCH] - added icons to the Project Tab context menu - added new entries to the Canvas context menu (Copy, Delete, Edit/Save, Move, New Excellon, New Geometry, New Project) --- FlatCAMGUI.py | 6 +++--- README.md | 1 + postprocessors/grbl_laser.py | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/FlatCAMGUI.py b/FlatCAMGUI.py index 427d1852..4a8852b8 100644 --- a/FlatCAMGUI.py +++ b/FlatCAMGUI.py @@ -318,14 +318,14 @@ class FlatCAMGUI(QtWidgets.QMainWindow): ################################ self.menuproject = QtWidgets.QMenu() - self.menuprojectenable = self.menuproject.addAction(QtGui.QIcon('share/replot32.png'), 'Enable') - self.menuprojectdisable = self.menuproject.addAction(QtGui.QIcon('share/clear_plot32.png'), 'Disable') + self.menuprojectenable = self.menuproject.addAction(QtGui.QIcon('share/replot32.png'), 'Enable Plot') + self.menuprojectdisable = self.menuproject.addAction(QtGui.QIcon('share/clear_plot32.png'), 'Disable Plot') self.menuproject.addSeparator() self.menuprojectgeneratecnc = self.menuproject.addAction(QtGui.QIcon('share/cnc32.png'), 'Generate CNC') self.menuproject.addSeparator() self.menuprojectcopy = self.menuproject.addAction(QtGui.QIcon('share/copy32.png'), 'Copy') - self.menuprojectedit = self.menuproject.addAction(QtGui.QIcon('share/edit_ok32.png'), 'Edit') self.menuprojectdelete = self.menuproject.addAction(QtGui.QIcon('share/delete32.png'), 'Delete') + self.menuprojectedit = self.menuproject.addAction(QtGui.QIcon('share/edit_ok32.png'), 'Edit') self.menuproject.addSeparator() self.menuprojectproperties = self.menuproject.addAction(QtGui.QIcon('share/properties32.png'), 'Properties') diff --git a/README.md b/README.md index e82e9f2c..34ffe01b 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing. - fixed grbl_11 postprocessor in linear_code() function - added icons to the Project Tab context menu - added new entries to the Canvas context menu (Copy, Delete, Edit/Save, Move, New Excellon, New Geometry, New Project) +- fixed grbl_laser postprocessor file 25.01.2019 diff --git a/postprocessors/grbl_laser.py b/postprocessors/grbl_laser.py index 02af15c1..e0344ca6 100644 --- a/postprocessors/grbl_laser.py +++ b/postprocessors/grbl_laser.py @@ -52,7 +52,8 @@ class grbl_laser(FlatCAMPostProc): return ('G00 ' + self.position_code(p)).format(**p) def linear_code(self, p): - return ('G01 ' + self.position_code(p)).format(**p) + " " + self.feedrate_code(p) + return ('G01 ' + self.position_code(p)).format(**p) + \ + ' F' + str(self.feedrate_format %(p.fr_decimals, p.feedrate)) def end_code(self, p): gcode = ('G00 Z' + self.feedrate_format %(p.fr_decimals, p.endz) + "\n")