- made the Feedrate Rapids parameter to depend on the type of postprocessor choosed. It will be showed only for a postprocessor which the name contain 'marlin' and for any postprocessor's that have 'custom' in the name
This commit is contained in:
parent
883cf3372a
commit
af091c7b14
|
@ -2448,6 +2448,13 @@ class FlatCAMExcellon(FlatCAMObj, Excellon):
|
||||||
self.ui.feedrate_probe_entry.setVisible(False)
|
self.ui.feedrate_probe_entry.setVisible(False)
|
||||||
self.ui.feedrate_probe_label.hide()
|
self.ui.feedrate_probe_label.hide()
|
||||||
|
|
||||||
|
if 'marlin' in current_pp.lower() or 'custom' in current_pp.lower():
|
||||||
|
self.ui.feedrate_rapid_label.show()
|
||||||
|
self.ui.feedrate_rapid_entry.show()
|
||||||
|
else:
|
||||||
|
self.ui.feedrate_rapid_label.hide()
|
||||||
|
self.ui.feedrate_rapid_entry.hide()
|
||||||
|
|
||||||
def on_create_cncjob_button_click(self, *args):
|
def on_create_cncjob_button_click(self, *args):
|
||||||
self.app.report_usage("excellon_on_create_cncjob_button")
|
self.app.report_usage("excellon_on_create_cncjob_button")
|
||||||
self.read_form()
|
self.read_form()
|
||||||
|
@ -4092,6 +4099,13 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
self.ui.feedrate_probe_entry.setVisible(False)
|
self.ui.feedrate_probe_entry.setVisible(False)
|
||||||
self.ui.feedrate_probe_label.hide()
|
self.ui.feedrate_probe_label.hide()
|
||||||
|
|
||||||
|
if 'marlin' in current_pp.lower() or 'custom' in current_pp.lower():
|
||||||
|
self.ui.fr_rapidlabel.show()
|
||||||
|
self.ui.cncfeedrate_rapid_entry.show()
|
||||||
|
else:
|
||||||
|
self.ui.fr_rapidlabel.hide()
|
||||||
|
self.ui.cncfeedrate_rapid_entry.hide()
|
||||||
|
|
||||||
def on_generatecnc_button_click(self, *args):
|
def on_generatecnc_button_click(self, *args):
|
||||||
|
|
||||||
self.app.report_usage("geometry_on_generatecnc_button")
|
self.app.report_usage("geometry_on_generatecnc_button")
|
||||||
|
|
|
@ -12,6 +12,7 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
11.05.2019
|
11.05.2019
|
||||||
|
|
||||||
- fixed issue in camlib.CNCjob.generate_from_excellon_by_tool() in the drill path optimization algorithm selection when selecting the MH algorithm. The new API's for Google OR-tools required some changes and also the time parameter can be now just an integer therefore I modified the GUI
|
- fixed issue in camlib.CNCjob.generate_from_excellon_by_tool() in the drill path optimization algorithm selection when selecting the MH algorithm. The new API's for Google OR-tools required some changes and also the time parameter can be now just an integer therefore I modified the GUI
|
||||||
|
- made the Feedrate Rapids parameter to depend on the type of postprocessor choosed. It will be showed only for a postprocessor which the name contain 'marlin' and for any postprocessor's that have 'custom' in the name
|
||||||
|
|
||||||
10.05.2019
|
10.05.2019
|
||||||
|
|
||||||
|
@ -21,7 +22,7 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
|
|
||||||
9.05.2019
|
9.05.2019
|
||||||
|
|
||||||
- rework the Gerber parser
|
- reworked the Gerber parser
|
||||||
|
|
||||||
8.05.2019
|
8.05.2019
|
||||||
|
|
||||||
|
|
|
@ -674,6 +674,9 @@ class ExcellonObjectUI(ObjectUI):
|
||||||
grid1.addWidget(self.feedrate_rapid_label, 7, 0)
|
grid1.addWidget(self.feedrate_rapid_label, 7, 0)
|
||||||
self.feedrate_rapid_entry = LengthEntry()
|
self.feedrate_rapid_entry = LengthEntry()
|
||||||
grid1.addWidget(self.feedrate_rapid_entry, 7, 1)
|
grid1.addWidget(self.feedrate_rapid_entry, 7, 1)
|
||||||
|
# default values is to hide
|
||||||
|
self.feedrate_rapid_label.hide()
|
||||||
|
self.feedrate_rapid_entry.hide()
|
||||||
|
|
||||||
# Spindlespeed
|
# Spindlespeed
|
||||||
spdlabel = QtWidgets.QLabel(_('Spindle speed:'))
|
spdlabel = QtWidgets.QLabel(_('Spindle speed:'))
|
||||||
|
@ -1188,6 +1191,9 @@ class GeometryObjectUI(ObjectUI):
|
||||||
self.grid3.addWidget(self.fr_rapidlabel, 12, 0)
|
self.grid3.addWidget(self.fr_rapidlabel, 12, 0)
|
||||||
self.cncfeedrate_rapid_entry = LengthEntry()
|
self.cncfeedrate_rapid_entry = LengthEntry()
|
||||||
self.grid3.addWidget(self.cncfeedrate_rapid_entry, 12, 1)
|
self.grid3.addWidget(self.cncfeedrate_rapid_entry, 12, 1)
|
||||||
|
# default values is to hide
|
||||||
|
self.fr_rapidlabel.hide()
|
||||||
|
self.cncfeedrate_rapid_entry.hide()
|
||||||
|
|
||||||
# Cut over 1st point in path
|
# Cut over 1st point in path
|
||||||
self.extracut_cb = FCCheckBox(_('Cut over 1st pt'))
|
self.extracut_cb = FCCheckBox(_('Cut over 1st pt'))
|
||||||
|
|
Loading…
Reference in New Issue