- unfortunately the fix for issue where while zooming the mouse cursor shape was not updated braked something in way that Matplotlib work with PyQt5, therefore I removed it

This commit is contained in:
Marius Stanciu
2019-09-25 03:26:34 +03:00
committed by Marius
parent 5aabd1a9af
commit 61e2792047
7 changed files with 169 additions and 159 deletions

View File

@@ -5756,9 +5756,8 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
pass
self.ui.annotation_cb.stateChanged.connect(self.on_annotation_change)
if self.app.is_legacy is False:
# set if to display text annotations
self.ui.annotation_cb.set_value(self.app.defaults["cncjob_annotation"])
# set if to display text annotations
self.ui.annotation_cb.set_value(self.app.defaults["cncjob_annotation"])
# Show/Hide Advanced Options
if self.app.defaults["global_app_level"] == 'b':
@@ -6244,7 +6243,8 @@ class FlatCAMCNCjob(FlatCAMObj, CNCjob):
# self.plot(kind=kind)
self.annotation.redraw()
else:
self.inform.emit(_("Not available with the current Graphic Engine Legacy(2D)."))
kind = self.ui.cncplot_method_combo.get_value()
self.plot(kind=kind)
def convert_units(self, units):
log.debug("FlatCAMObj.FlatCAMECNCjob.convert_units()")