3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-14 10:17:52 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Merge branch 'main' into updated_elegoo_definitions

Browse source
This commit is contained in:
Jelle Spijker 2023-04-28 10:32:15 +02:00 • committed by GitHub
commit 77b38bb45d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
118 changed files with 4415 additions and 1408 deletions
Download patch file Download diff file Expand all files Collapse all files

26
plugins/PostProcessingPlugin/PostProcessingPlugin.py
View file

@ -139,22 +139,28 @@ class PostProcessingPlugin(QObject, Extension):
if self._loaded_scripts: # Already loaded.
return
# The PostProcessingPlugin path is for built-in scripts.
# The Resources path is where the user should store custom scripts.
# The Preferences path is legacy, where the user may previously have stored scripts.
resource_folders = [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Preferences)]
resource_folders.extend(Resources.getAllPathsForType(Resources.Resources))
for root in resource_folders:
if root is None:
continue
path = os.path.join(root, "scripts")
# Make sure a "scripts" folder exists in the main configuration folder and the preferences folder.
# On some platforms the resources and preferences folders resolve to the same folder,
# but on Linux they can be different.
for path in set([os.path.join(Resources.getStoragePath(r), "scripts") for r in [Resources.Resources, Resources.Preferences]]):
if not os.path.isdir(path):
try:
os.makedirs(path)
except OSError:
Logger.log("w", "Unable to create a folder for scripts: " + path)
continue
# The PostProcessingPlugin path is for built-in scripts.
# The Resources path is where the user should store custom scripts.
# The Preferences path is legacy, where the user may previously have stored scripts.
resource_folders = [PluginRegistry.getInstance().getPluginPath("PostProcessingPlugin"), Resources.getStoragePath(Resources.Preferences)]
resource_folders.extend(Resources.getAllPathsForType(Resources.Resources))
for root in resource_folders:
if root is None:
continue
path = os.path.join(root, "scripts")
if not os.path.isdir(path):
continue
self.loadScripts(path)
def loadScripts(self, path: str) -> None:

3
plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py
View file

@ -96,6 +96,9 @@ class AbstractCloudOutputDevice(UltimakerNetworkedPrinterOutputDevice):
@pyqtSlot(str)
def printerSelected(self, unique_id: str):
# The device that it defers the actual write to isn't hooked up correctly. So we should emit the write signal
# here.
self.writeStarted.emit(self)
self._request_write_callback(unique_id, self._nodes)
if self._on_print_dialog:
self._on_print_dialog.close()