- made some corrections - due of recent refactoring PyCharm reported errors all over (not correct but it made programming difficult)

- modified the requirements.txt file to force svg.path module to be at least version 4.0
This commit is contained in:
Marius Stanciu
2020-04-30 12:47:07 +03:00
committed by Marius
parent 0ac5bb777b
commit 98541775d4
56 changed files with 843 additions and 108 deletions

View File

@@ -3,12 +3,25 @@ from PyQt5.QtCore import QSettings, Qt
from flatcamGUI.GUIElements import FCTextArea, FCCheckBox, FCComboBox, FCSpinner, FCEntry
from flatcamGUI.preferences.OptionsGroupUI import OptionsGroupUI
import gettext
import FlatCAMTranslation as fcTranslate
import builtins
fcTranslate.apply_language('strings')
if '_' not in builtins.__dict__:
_ = gettext.gettext
settings = QSettings("Open Source", "FlatCAM")
if settings.contains("machinist"):
machinist_setting = settings.value('machinist', type=int)
else:
machinist_setting = 0
class CNCJobAdvOptPrefGroupUI(OptionsGroupUI):
def __init__(self, decimals=4, parent=None):
# OptionsGroupUI.__init__(self, "CNC Job Advanced Options Preferences", parent=None)
super(CNCJobAdvOptPrefGroupUI, self).__init__(self)
super(CNCJobAdvOptPrefGroupUI, self).__init__(self, parent=parent)
self.decimals = decimals
self.setTitle(str(_("CNC Job Adv. Options")))
@@ -192,4 +205,4 @@ class CNCJobAdvOptPrefGroupUI(OptionsGroupUI):
new_val_sel = str(annotation_color.name())
self.annotation_fontcolor_entry.set_value(new_val_sel)
self.app.defaults['cncjob_annotation_fontcolor'] = new_val_sel
self.app.defaults['cncjob_annotation_fontcolor'] = new_val_sel