- fixed re-cut length entry not staying disabled when the re-cut cb is not checked
This commit is contained in:
parent
a06b576a04
commit
8afafedfff
|
@ -3763,6 +3763,9 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
self.ui.name_entry.set_value(self.options['name'])
|
self.ui.name_entry.set_value(self.options['name'])
|
||||||
self.ui_connect()
|
self.ui_connect()
|
||||||
|
|
||||||
|
self.ui.e_cut_entry.setDisabled(False) if self.ui.extracut_cb.get_value() else \
|
||||||
|
self.ui.e_cut_entry.setDisabled(True)
|
||||||
|
|
||||||
def set_ui(self, ui):
|
def set_ui(self, ui):
|
||||||
FlatCAMObj.set_ui(self, ui)
|
FlatCAMObj.set_ui(self, ui)
|
||||||
|
|
||||||
|
@ -3939,7 +3942,9 @@ class FlatCAMGeometry(FlatCAMObj, Geometry):
|
||||||
else:
|
else:
|
||||||
self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _('Advanced'))
|
self.ui.level.setText('<span style="color:red;"><b>%s</b></span>' % _('Advanced'))
|
||||||
|
|
||||||
self.ui.e_cut_entry.setDisabled(True)
|
self.ui.e_cut_entry.setDisabled(False) if self.app.defaults['geometry_extracut'] else \
|
||||||
|
self.ui.e_cut_entry.setDisabled(True)
|
||||||
|
self.ui.extracut_cb.toggled.connect(lambda state: self.ui.e_cut_entry.setDisabled(not state))
|
||||||
|
|
||||||
self.ui.plot_cb.stateChanged.connect(self.on_plot_cb_click)
|
self.ui.plot_cb.stateChanged.connect(self.on_plot_cb_click)
|
||||||
self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click)
|
self.ui.generate_cnc_button.clicked.connect(self.on_generatecnc_button_click)
|
||||||
|
|
|
@ -15,6 +15,7 @@ CAD program, and create G-Code for Isolation routing.
|
||||||
- Print function is now printing a PDF file for a selection of objects in the colors from canvas
|
- Print function is now printing a PDF file for a selection of objects in the colors from canvas
|
||||||
- added an icon in the infobar that will show more clearly the status of the grid snapping
|
- added an icon in the infobar that will show more clearly the status of the grid snapping
|
||||||
- in Geometry Object UI (selected tab) when a tool type is changed from no matter what to V-shape, the cut_z value is saved and when the tool type is changed back to something different than V-shape, this saved cut-z value is restored
|
- in Geometry Object UI (selected tab) when a tool type is changed from no matter what to V-shape, the cut_z value is saved and when the tool type is changed back to something different than V-shape, this saved cut-z value is restored
|
||||||
|
- fixed re-cut length entry not staying disabled when the re-cut cb is not checked
|
||||||
|
|
||||||
19.12.2019
|
19.12.2019
|
||||||
|
|
||||||
|
|
|
@ -1577,7 +1577,7 @@ class GeometryObjectUI(ObjectUI):
|
||||||
self.cncfeedrate_rapid_entry.hide()
|
self.cncfeedrate_rapid_entry.hide()
|
||||||
|
|
||||||
# Cut over 1st point in path
|
# Cut over 1st point in path
|
||||||
self.extracut_cb = FCCheckBox('%s' % _('Re-cut'))
|
self.extracut_cb = FCCheckBox('%s:' % _('Re-cut'))
|
||||||
self.extracut_cb.setToolTip(
|
self.extracut_cb.setToolTip(
|
||||||
_("In order to remove possible\n"
|
_("In order to remove possible\n"
|
||||||
"copper leftovers where first cut\n"
|
"copper leftovers where first cut\n"
|
||||||
|
@ -1599,8 +1599,6 @@ class GeometryObjectUI(ObjectUI):
|
||||||
self.grid3.addWidget(self.extracut_cb, 13, 0)
|
self.grid3.addWidget(self.extracut_cb, 13, 0)
|
||||||
self.grid3.addWidget(self.e_cut_entry, 13, 1)
|
self.grid3.addWidget(self.e_cut_entry, 13, 1)
|
||||||
|
|
||||||
self.ois_e_cut = OptionalInputSection(self.extracut_cb, [self.e_cut_entry])
|
|
||||||
|
|
||||||
# Spindlespeed
|
# Spindlespeed
|
||||||
spdlabel = QtWidgets.QLabel('%s:' % _('Spindle speed'))
|
spdlabel = QtWidgets.QLabel('%s:' % _('Spindle speed'))
|
||||||
spdlabel.setToolTip(
|
spdlabel.setToolTip(
|
||||||
|
|
Loading…
Reference in New Issue