bartool/flatcam-wsl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- upgraded code so the app will work with Python 3.12

Browse Source
This commit is contained in:
Marius Stanciu
2023-10-19 14:19:21 +03:00
parent 28dbb70126
commit 7d7348b594
3 changed files with 31 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -12,6 +12,7 @@ CHANGELOG for FlatCAM Evo beta
- fixed preprocessors issue where the start GCode was not added due of trying to access an object that did not exist (because its name was not changed to reflect the changes in other parts on the app) - fixed preprocessors issue where the start GCode was not added due of trying to access an object that did not exist (because its name was not changed to reflect the changes in other parts on the app)
- updated the requirements.txt file - updated the requirements.txt file
- added qdarktheme package into the code - added qdarktheme package into the code
- upgraded code so the app will work with Python 3.12
27.09.2023 27.09.2023

46
appGUI/GUIElements.py
View File

@@ -999,7 +999,7 @@ class NumericalEvalEntry(FCEntry):
def __init__(self, border_color=None): def __init__(self, border_color=None):
super().__init__(border_color=border_color) super().__init__(border_color=border_color)
regex = QtCore.QRegularExpression("[0-9\/\*\+\-\%\.\,\s]*") regex = QtCore.QRegularExpression(r"[0-9\/\*\+\-\%\.\,\s]*")
validator = QtGui.QRegularExpressionValidator(regex, self) validator = QtGui.QRegularExpressionValidator(regex, self)
self.setValidator(validator) self.setValidator(validator)
@@ -1023,7 +1023,7 @@ class NumericalEvalTupleEntry(EvalEntry):
def __init__(self, border_color=None): def __init__(self, border_color=None):
super().__init__(border_color=border_color) super().__init__(border_color=border_color)
regex = QtCore.QRegularExpression("[0-9\/\*\+\-\%\.\s\,\[\]\(\)]*") regex = QtCore.QRegularExpression(r"[0-9\/\*\+\-\%\.\s\,\[\]\(\)]*")
validator = QtGui.QRegularExpressionValidator(regex, self) validator = QtGui.QRegularExpressionValidator(regex, self)
self.setValidator(validator) self.setValidator(validator)
@@ -1053,7 +1053,7 @@ class FCColorEntry(QtWidgets.QFrame):
super().__init__(**kwargs) super().__init__(**kwargs)
self.entry = FCEntry() self.entry = FCEntry()
regex = QtCore.QRegularExpression("[#A-Fa-f0-9]*") regex = QtCore.QRegularExpression(r"[#A-Fa-f0-9]*")
validator = QtGui.QRegularExpressionValidator(regex, self.entry) validator = QtGui.QRegularExpressionValidator(regex, self.entry)
self.entry.setValidator(validator) self.entry.setValidator(validator)
@@ -1453,7 +1453,7 @@ class FCDoubleSpinner(QtWidgets.QDoubleSpinBox):
# by default don't allow the minus sign to be entered as the default for QDoubleSpinBox is the positive range # by default don't allow the minus sign to be entered as the default for QDoubleSpinBox is the positive range
# between 0.00 and 99.00 (2 decimals) # between 0.00 and 99.00 (2 decimals)
validator = QtGui.QRegularExpressionValidator( validator = QtGui.QRegularExpressionValidator(
QtCore.QRegularExpression("\+?[0-9]*[.,]?[0-9]{%d}" % self.decimals()), self) QtCore.QRegularExpression(r"\+?[0-9]*[.,]?[0-9]" + "{%d}" % self.decimals()), self)
self.lineEdit().setValidator(validator) self.lineEdit().setValidator(validator)
if suffix: if suffix:
@@ -1664,17 +1664,17 @@ class FCDoubleSpinner(QtWidgets.QDoubleSpinBox):
if self.minimum() < 0 or self.maximum() <= 0: if self.minimum() < 0 or self.maximum() <= 0:
self.lineEdit().setValidator( self.lineEdit().setValidator(
QtGui.QRegularExpressionValidator( QtGui.QRegularExpressionValidator(
QtCore.QRegularExpression("-?[0-9]*[.,]?[0-9]{%d}" % self.decimals()), self)) QtCore.QRegularExpression(r"-?[0-9]*[.,]?[0-9]" + "{%d}" % self.decimals()), self))
else: else:
self.lineEdit().setValidator( self.lineEdit().setValidator(
QtGui.QRegularExpressionValidator( QtGui.QRegularExpressionValidator(
QtCore.QRegularExpression("\+?[0-9]*[.,]?[0-9]{%d}" % self.decimals()), self)) QtCore.QRegularExpression(r"\+?[0-9]*[.,]?[0-9]" + "{%d}" % self.decimals()), self))
def set_range(self, min_val, max_val): def set_range(self, min_val, max_val):
if min_val < 0 or max_val <= 0: if min_val < 0 or max_val <= 0:
self.lineEdit().setValidator( self.lineEdit().setValidator(
QtGui.QRegularExpressionValidator( QtGui.QRegularExpressionValidator(
QtCore.QRegularExpression("-?[0-9]*[.,]?[0-9]{%d}" % self.decimals()), self)) QtCore.QRegularExpression(r"-?[0-9]*[.,]?[0-9]" + "{%d}" % self.decimals()), self))
self.setRange(min_val, max_val) self.setRange(min_val, max_val)
@@ -5202,7 +5202,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
# comment # comment
color = self.get_custom_color(QtGui.QColor(Qt.GlobalColor.gray)) color = self.get_custom_color(QtGui.QColor(Qt.GlobalColor.gray))
brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern) brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern)
pattern = QtCore.QRegularExpression("\(.*\)") pattern = QtCore.QRegularExpression(r"\(.*\)")
comment.setForeground(brush) comment.setForeground(brush)
rule = (pattern, comment) rule = (pattern, comment)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5210,7 +5210,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
# Marlin comment # Marlin comment
color = self.get_custom_color(QtGui.QColor(Qt.GlobalColor.gray)) color = self.get_custom_color(QtGui.QColor(Qt.GlobalColor.gray))
brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern) brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern)
pattern = QtCore.QRegularExpression("^;\s*.*$") pattern = QtCore.QRegularExpression(r"^;\s*.*$")
comment.setForeground(brush) comment.setForeground(brush)
rule = (pattern, comment) rule = (pattern, comment)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5218,7 +5218,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
# Python comment # Python comment
color = self.get_custom_color(QtGui.QColor(Qt.GlobalColor.gray)) color = self.get_custom_color(QtGui.QColor(Qt.GlobalColor.gray))
brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern) brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern)
pattern = QtCore.QRegularExpression("^\#\s*.*$") pattern = QtCore.QRegularExpression(r"^\#\s*.*$")
comment.setForeground(brush) comment.setForeground(brush)
rule = (pattern, comment) rule = (pattern, comment)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5226,7 +5226,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
# string # string
color = self.get_custom_color(QtGui.QColor("tomato")) color = self.get_custom_color(QtGui.QColor("tomato"))
brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern) brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern)
pattern = QtCore.QRegularExpression("\".*\"") pattern = QtCore.QRegularExpression(r"\".*\"")
# pattern.setMinimal # pattern.setMinimal
pattern.setPatternOptions(QtCore.QRegularExpression.PatternOption.InvertedGreedinessOption) pattern.setPatternOptions(QtCore.QRegularExpression.PatternOption.InvertedGreedinessOption)
string.setForeground(brush) string.setForeground(brush)
@@ -5234,7 +5234,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
# singleQuotedString # singleQuotedString
pattern = QtCore.QRegularExpression("\'.*\'") pattern = QtCore.QRegularExpression(r"\'.*\'")
# pattern.setMinimal(True) # pattern.setMinimal(True)
pattern.setPatternOptions(QtCore.QRegularExpression.PatternOption.InvertedGreedinessOption) pattern.setPatternOptions(QtCore.QRegularExpression.PatternOption.InvertedGreedinessOption)
@@ -5251,7 +5251,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
keywords = ["G", "T"] keywords = ["G", "T"]
for word in keywords: for word in keywords:
# pattern = QtCore.QRegularExpression("\\b" + word + "\\b") # pattern = QtCore.QRegularExpression("\\b" + word + "\\b")
pattern = QtCore.QRegularExpression("\\b" + word + "\d+(\.\d*)?\s?" + "\\b") pattern = QtCore.QRegularExpression(r"\\b" + word + r"\d+(\.\d*)?\s?" + r"\\b")
rule = (pattern, keyword) rule = (pattern, keyword)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5264,7 +5264,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
keywords = ["F"] keywords = ["F"]
for word in keywords: for word in keywords:
# pattern = QtCore.QRegularExpression("\\b" + word + "\\b") # pattern = QtCore.QRegularExpression("\\b" + word + "\\b")
pattern = QtCore.QRegularExpression("\\b" + word + "\d+(\.\d*)?\s?" + "\\b") pattern = QtCore.QRegularExpression(r"\\b" + word + r"\d+(\.\d*)?\s?" + r"\\b")
rule = (pattern, keyword1) rule = (pattern, keyword1)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5278,7 +5278,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
keywords = ["M"] keywords = ["M"]
for word in keywords: for word in keywords:
# pattern = QtCore.QRegularExpression("\\b" + word + "\\b") # pattern = QtCore.QRegularExpression("\\b" + word + "\\b")
pattern = QtCore.QRegularExpression("\\b" + word + "\d+(\.\d*)?\s?" + "\\b") pattern = QtCore.QRegularExpression(r"\\b" + word + r"\d+(\.\d*)?\s?" + r"\\b")
rule = (pattern, keyword2) rule = (pattern, keyword2)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5292,7 +5292,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
keywords = ["Z"] keywords = ["Z"]
for word in keywords: for word in keywords:
# pattern = QtCore.QRegularExpression("\\b" + word + "\\b") # pattern = QtCore.QRegularExpression("\\b" + word + "\\b")
pattern = QtCore.QRegularExpression("\\b" + word + "[\-|\+]?\d+(\.\d*)?\s?" + "\\b") pattern = QtCore.QRegularExpression(r"\\b" + word + r"[\-|\+]?\d+(\.\d*)?\s?" + r"\\b")
rule = (pattern, keyword3) rule = (pattern, keyword3)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5305,7 +5305,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
keywords = ["LPC", "LPD"] keywords = ["LPC", "LPD"]
for word in keywords: for word in keywords:
# pattern = QtCore.QRegularExpression("\\b" + word + "\\b") # pattern = QtCore.QRegularExpression("\\b" + word + "\\b")
pattern = QtCore.QRegularExpression("\%" + "\\b" + word + "\*\%") pattern = QtCore.QRegularExpression(r"\%" + r"\\b" + word + r"\*\%")
rule = (pattern, keyword4) rule = (pattern, keyword4)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5319,7 +5319,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
keywords = ["D"] keywords = ["D"]
for word in keywords: for word in keywords:
# pattern = QtCore.QRegularExpression("\\b" + word + "\\b") # pattern = QtCore.QRegularExpression("\\b" + word + "\\b")
pattern = QtCore.QRegularExpression("\\b" + word + "\d+\s?") pattern = QtCore.QRegularExpression(r"\\b" + word + r"\d+\s?")
rule = (pattern, keyword5) rule = (pattern, keyword5)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5332,21 +5332,21 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
"elif", "else", "in", "while", "do" "elif", "else", "in", "while", "do"
] ]
for word in keywords: for word in keywords:
pattern = QtCore.QRegularExpression("\\b" + word + "\\b") pattern = QtCore.QRegularExpression(r"\\b" + word + r"\\b")
rule = (pattern, reservedClasses) rule = (pattern, reservedClasses)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
# parameter # parameter
color = self.get_custom_color(QtGui.QColor(Qt.GlobalColor.darkBlue)) color = self.get_custom_color(QtGui.QColor(Qt.GlobalColor.darkBlue))
brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern) brush = QtGui.QBrush(color, Qt.BrushStyle.SolidPattern)
pattern = QtCore.QRegularExpression("\-[0-9a-zA-Z_]*\s") pattern = QtCore.QRegularExpression(r"\-[0-9a-zA-Z_]*\s")
parameterOperator.setForeground(brush) parameterOperator.setForeground(brush)
parameterOperator.setFontWeight(QtGui.QFont.Weight.Bold) parameterOperator.setFontWeight(QtGui.QFont.Weight.Bold)
rule = (pattern, parameterOperator) rule = (pattern, parameterOperator)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
# delimiter # delimiter
pattern = QtCore.QRegularExpression("[\)\(]+|[\{\}]+|[][]+") pattern = QtCore.QRegularExpression(r"[\)\(]+|[\{\}]+|[][]+")
delimiter.setForeground(brush) delimiter.setForeground(brush)
delimiter.setFontWeight(QtGui.QFont.Weight.Bold) delimiter.setFontWeight(QtGui.QFont.Weight.Bold)
rule = (pattern, delimiter) rule = (pattern, delimiter)
@@ -5358,7 +5358,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
specialConstant.setForeground(brush) specialConstant.setForeground(brush)
keywords = ["Inf", "NA", "NaN", "NULL"] keywords = ["Inf", "NA", "NaN", "NULL"]
for word in keywords: for word in keywords:
pattern = QtCore.QRegularExpression("\\b" + word + "\\b") pattern = QtCore.QRegularExpression(r"\\b" + word + r"\\b")
rule = (pattern, specialConstant) rule = (pattern, specialConstant)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)
@@ -5366,7 +5366,7 @@ class FCTextAreaLineNumber(QtWidgets.QFrame):
boolean.setForeground(brush) boolean.setForeground(brush)
keywords = ["TRUE", "True", "FALSE", "False"] keywords = ["TRUE", "True", "FALSE", "False"]
for word in keywords: for word in keywords:
pattern = QtCore.QRegularExpression("\\b" + word + "\\b") pattern = QtCore.QRegularExpression(r"\\b" + word + r"\\b")
rule = (pattern, boolean) rule = (pattern, boolean)
self.highlightingRules.append(rule) self.highlightingRules.append(rule)

8
tclCommands/__init__.py
View File

@@ -1,4 +1,6 @@
import pkgutil import pkgutil
import importlib
import sys import sys
# allowed command modules (please append them alphabetically ordered) # allowed command modules (please append them alphabetically ordered)
@@ -79,8 +81,12 @@ import tclCommands.TclCommandWriteGCode
__all__ = [] __all__ = []
# for loader, name, is_pkg in pkgutil.walk_packages(__path__):
# module = loader.find_module(name).load_module(name)
# __all__.append(name)
for loader, name, is_pkg in pkgutil.walk_packages(__path__): for loader, name, is_pkg in pkgutil.walk_packages(__path__):
module = loader.find_module(name).load_module(name) module = importlib.import_module(f"{__name__}.{name}")
__all__.append(name) __all__.append(name)