Просмотр исходного кода

- 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)

Marius Stanciu 7 лет назад
Родитель
Сommit
34749cae66
3 измененных файлов с 6 добавлено и 4 удалено
  1. 3 3
      FlatCAMGUI.py
  2. 1 0
      README.md
  3. 2 1
      postprocessors/grbl_laser.py

+ 3 - 3
FlatCAMGUI.py

@@ -318,14 +318,14 @@ class FlatCAMGUI(QtWidgets.QMainWindow):
         ################################
         ################################
 
 
         self.menuproject = QtWidgets.QMenu()
         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.menuproject.addSeparator()
         self.menuprojectgeneratecnc = self.menuproject.addAction(QtGui.QIcon('share/cnc32.png'), 'Generate CNC')
         self.menuprojectgeneratecnc = self.menuproject.addAction(QtGui.QIcon('share/cnc32.png'), 'Generate CNC')
         self.menuproject.addSeparator()
         self.menuproject.addSeparator()
         self.menuprojectcopy = self.menuproject.addAction(QtGui.QIcon('share/copy32.png'), 'Copy')
         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.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.menuproject.addSeparator()
         self.menuprojectproperties = self.menuproject.addAction(QtGui.QIcon('share/properties32.png'), 'Properties')
         self.menuprojectproperties = self.menuproject.addAction(QtGui.QIcon('share/properties32.png'), 'Properties')
 
 

+ 1 - 0
README.md

@@ -14,6 +14,7 @@ CAD program, and create G-Code for Isolation routing.
 - fixed grbl_11 postprocessor in linear_code() function
 - fixed grbl_11 postprocessor in linear_code() function
 - added icons to the Project Tab context menu
 - 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)
 - 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
 25.01.2019
 
 

+ 2 - 1
postprocessors/grbl_laser.py

@@ -52,7 +52,8 @@ class grbl_laser(FlatCAMPostProc):
         return ('G00 ' + self.position_code(p)).format(**p)
         return ('G00 ' + self.position_code(p)).format(**p)
 
 
     def linear_code(self, 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):
     def end_code(self, p):
         gcode = ('G00 Z' + self.feedrate_format %(p.fr_decimals, p.endz) + "\n")
         gcode = ('G00 Z' + self.feedrate_format %(p.fr_decimals, p.endz) + "\n")