GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-16 11:45:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19603 from dfries/fix_qml_py_re

Browse Source 
Fix qml warnings, python regular expression deprecated syntax with raw string
This commit is contained in:
Erwan MATHIEU 2025-02-11 13:26:29 +01:00 committed by GitHub
commit 2083a35858
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/PostProcessingPlugin/Script.py
View File

@ -122,7 +122,7 @@ class Script:
if not key in line or (';' in line and line.find(key) > line.find(';')): if not key in line or (';' in line and line.find(key) > line.find(';')):
return default return default
sub_part = line[line.find(key) + 1:] sub_part = line[line.find(key) + 1:]
m = re.search('^-?[0-9]+\.?[0-9]*', sub_part) m = re.search(r'^-?[0-9]+\.?[0-9]*', sub_part)
if m is None: if m is None:
return default return default
try: try:

2
plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
View File

@ -338,7 +338,7 @@ class PauseAtHeight(Script):
nbr_negative_layers += 1 nbr_negative_layers += 1
#Track the latest printing temperature in order to resume at the correct temperature. #Track the latest printing temperature in order to resume at the correct temperature.
if re.match("T(\d*)", line): if re.match(r"T(\d*)", line):
current_t = self.getValue(line, "T") current_t = self.getValue(line, "T")
m = self.getValue(line, "M") m = self.getValue(line, "M")
if m is not None and (m == 104 or m == 109) and self.getValue(line, "S") is not None: if m is not None and (m == 104 or m == 109) and self.getValue(line, "S") is not None:

2
plugins/UM3NetworkPrinting/src/ExportFileJob.py
View File

@ -28,7 +28,7 @@ class ExportFileJob(WriteFileJob):
# Determine the filename. # Determine the filename.
job_name = CuraApplication.getInstance().getPrintInformation().jobName job_name = CuraApplication.getInstance().getPrintInformation().jobName
job_name = re.sub("[^\w\-. ()]", "-", job_name) job_name = re.sub(r"[^\w\-. ()]", "-", job_name)
extension = self._mesh_format_handler.preferred_format.get("extension", "") extension = self._mesh_format_handler.preferred_format.get("extension", "")
self.setFileName("{}.{}".format(job_name, extension)) self.setFileName("{}.{}".format(job_name, extension))

2
resources/qml/ActionPanel/OutputProcessWidget.qml
View File

@ -10,7 +10,7 @@ import Cura 1.0 as Cura
// This element contains all the elements the user needs to visualize the data // This element contains all the elements the user needs to visualize the data
// that is gather after the slicing process, such as printint time, material usage, ... // that is gather after the slicing process, such as printing time, material usage, ...
// There are also two buttons: one to previsualize the output layers, and the other to // There are also two buttons: one to previsualize the output layers, and the other to
// select what to do with it (such as print over network, save to file, ...) // select what to do with it (such as print over network, save to file, ...)
Column Column

4
resources/qml/Menus/RecentFilesMenu.qml
View File

@ -2,7 +2,7 @@
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.2
import QtQuick.Controls 2.1 import QtQuick.Controls 2.15
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
@ -30,6 +30,6 @@ Cura.Menu
onTriggered: CuraApplication.readLocalFile(modelData) onTriggered: CuraApplication.readLocalFile(modelData)
} }
onObjectAdded: (index, object) => menu.insertItem(index, object) onObjectAdded: (index, object) => menu.insertItem(index, object)
onObjectRemoved: (object) => menu.removeItem(object) onObjectRemoved: (index, object) => menu.removeItem(object)
} }
} }

8
resources/qml/PrintSetupSelector/Recommended/RecommendedSupportSelector.qml
View File

@ -57,7 +57,9 @@ RecommendedSettingSection
settingName: "support_structure" settingName: "support_structure"
propertyRemoveUnusedValue: false propertyRemoveUnusedValue: false
updateAllExtruders: false updateAllExtruders: false
defaultExtruderIndex: supportExtruderProvider.properties.value defaultExtruderIndex: supportExtruderProvider.properties.value != undefined ?
supportExtruderProvider.properties.value :
Cura.ExtruderManager.activeExtruderIndex
} }
}, },
RecommendedSettingItem RecommendedSettingItem
@ -92,7 +94,9 @@ RecommendedSettingSection
width: parent.width width: parent.width
settingName: "support_type" settingName: "support_type"
updateAllExtruders: true updateAllExtruders: true
defaultExtruderIndex: supportExtruderProvider.properties.value defaultExtruderIndex: supportExtruderProvider.properties.value != undefined ?
supportExtruderProvider.properties.value :
Cura.ExtruderManager.activeExtruderIndex
} }
} }
] ]

2
scripts/extract_changelog.py
View File

@ -13,7 +13,7 @@ if __name__ == "__main__":
args.version = args.version[:-2] args.version = args.version[:-2]
start_token = f"[{args.version}]" start_token = f"[{args.version}]"
pattern_stop_log = "\[\d+(\.\d+){1,2}\]" pattern_stop_log = r"\[\d+(\.\d+){1,2}\]"
log_line = False log_line = False
first_chapter = True first_chapter = True