- overwritten the Beta_8.995 branch with the Gerber_Editor_Upgrade branch

This commit is contained in:
Marius Stanciu
2023-05-24 18:07:05 +03:00
parent c23d0c4ed6
commit 63071a9bae
214 changed files with 22249 additions and 6251 deletions

View File

@@ -50,7 +50,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
self.fcapp = fcapp
settings = QtCore.QSettings("Open Source", "FlatCAM")
settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if settings.contains("theme"):
theme = settings.value('theme', type=str)
else:
@@ -337,7 +337,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
hud_text = '%s\n%s\n\n%s\n%s' % (l1_hud_text, l2_hud_text, l3_hud_text, l4_hud_text)
# font size
qsettings = QtCore.QSettings("Open Source", "FlatCAM")
qsettings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if qsettings.contains("hud_font_size"):
fsize = qsettings.value('hud_font_size', type=int)
else:
@@ -385,7 +385,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
def on_toggle_grid_lines(self, signal=None, silent=None):
state = self.grid_lines_enabled
settings = QtCore.QSettings("Open Source", "FlatCAM")
settings = QtCore.QSettings("Open Source", "FlatCAM_EVO")
if settings.contains("theme"):
theme = settings.value('theme', type=str)
else:
@@ -511,7 +511,7 @@ class PlotCanvas(QtCore.QObject, VisPyCanvas):
# sc = ShapeCollection(parent=self.view.scene, pool=self.app.pool, **kwargs)
# self.shape_collections.append(sc)
# return sc
return ShapeCollection(parent=self.view.scene, pool=self.fcapp.pool, **kwargs)
return ShapeCollection(parent=self.view.scene, pool=self.fcapp.pool, fcoptions=self.fcapp.options, **kwargs)
def new_cursor(self, big=None):
"""