3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-08 22:35:03 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'Ultimaker:main' into main

Browse source
This commit is contained in:
eMotion-Tech 2023-05-04 14:16:21 +02:00 • committed by GitHub
commit 73a49154cc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
192 changed files with 5898 additions and 1810 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/UM3NetworkPrinting/src/Network/LocalClusterOutputDevice.py
View file

@ -10,6 +10,7 @@ from PyQt6.QtCore import pyqtSlot, QUrl, pyqtSignal, pyqtProperty, QObject
from PyQt6.QtNetwork import QNetworkReply
from UM.FileHandler.FileHandler import FileHandler
from UM.Version import Version
from UM.i18n import i18nCatalog
from UM.Logger import Logger
from UM.Scene.SceneNode import SceneNode
@ -86,7 +87,10 @@ class LocalClusterOutputDevice(UltimakerNetworkedPrinterOutputDevice):
@pyqtSlot(name="openPrinterControlPanel")
def openPrinterControlPanel(self) -> None:
QDesktopServices.openUrl(QUrl("http://" + self._address + "/printers"))
if Version(self.firmwareVersion) >= Version("7.0.2"):
QDesktopServices.openUrl(QUrl("http://" + self._address + "/print_jobs"))
else:
QDesktopServices.openUrl(QUrl("http://" + self._address + "/printers"))
@pyqtSlot(str, name="sendJobToTop")
def sendJobToTop(self, print_job_uuid: str) -> None:

43
plugins/VersionUpgrade/VersionUpgrade53to54/VersionUpgrade53to54.py
View file

@ -31,6 +31,46 @@ _REMOVED_SETTINGS = {
"wireframe_roof_drag_along",
"wireframe_roof_outer_delay",
"wireframe_nozzle_clearance",
"support_tree_branch_distance",
"support_tree_collision_resolution",
}
_RENAMED_PROFILES = {
"abs_040012": "elegoo_abs_nozzle_0.40_layer_0.10",
"abs_040016": "elegoo_abs_nozzle_0.40_layer_0.15",
"abs_040020": "elegoo_abs_nozzle_0.40_layer_0.20",
"abs_040024": "elegoo_abs_nozzle_0.40_layer_0.20",
"abs_040028": "elegoo_abs_nozzle_0.40_layer_0.30",
"asa_040012": "elegoo_asa_nozzle_0.40_layer_0.10",
"asa_040016": "elegoo_asa_nozzle_0.40_layer_0.15",
"asa_040020": "elegoo_asa_nozzle_0.40_layer_0.20",
"asa_040024": "elegoo_asa_nozzle_0.40_layer_0.20",
"asa_040028": "elegoo_asa_nozzle_0.40_layer_0.30",
"petg_040012": "elegoo_petg_nozzle_0.40_layer_0.10",
"petg_040016": "elegoo_petg_nozzle_0.40_layer_0.15",
"petg_040020": "elegoo_petg_nozzle_0.40_layer_0.20",
"petg_040024": "elegoo_petg_nozzle_0.40_layer_0.20",
"petg_040028": "elegoo_petg_nozzle_0.40_layer_0.30",
"pla_040012": "elegoo_pla_nozzle_0.40_layer_0.10",
"pla_040016": "elegoo_pla_nozzle_0.40_layer_0.15",
"pla_040020": "elegoo_pla_nozzle_0.40_layer_0.20",
"pla_040024": "elegoo_pla_nozzle_0.40_layer_0.20",
"pla_040028": "elegoo_pla_nozzle_0.40_layer_0.30",
"tpu_040012": "elegoo_tpu_nozzle_0.40_layer_0.10",
"tpu_040016": "elegoo_tpu_nozzle_0.40_layer_0.15",
"tpu_040020": "elegoo_tpu_nozzle_0.40_layer_0.20",
"tpu_040024": "elegoo_tpu_nozzle_0.40_layer_0.20",
"tpu_040028": "elegoo_tpu_nozzle_0.40_layer_0.30",
"elegoo_global_012_high": "elegoo_layer_0.10",
"elegoo_global_016_normal": "elegoo_layer_0.15",
"elegoo_global_020_fine": "elegoo_layer_0.20",
"elegoo_global_024_medium": "elegoo_layer_0.20",
"elegoo_global_028_draft": "elegoo_layer_0.30",
}
@ -112,6 +152,9 @@ class VersionUpgrade53to54(VersionUpgrade):
parser["metadata"]["setting_version"] = "22"
for container in parser['containers']:
parser['containers'][container] = _RENAMED_PROFILES.get(parser['containers'][container], parser['containers'][container])
result = io.StringIO()
parser.write(result)
return [filename], [result.getvalue()]