3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-07 15:07:28 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Basic implementation of exporting all materials in a .zip archive

Browse source 
It seems to complain about the data types though.

Contributes to issue CURA-8055.
This commit is contained in:
Ghostkeeper 2021-06-09 16:35:51 +02:00
parent e66783664b
commit bdcaef134f
No known key found for this signature in database
GPG key ID: 14C3586CD2EFC5B9
2 changed files with 25 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

21
cura/Machines/Models/MaterialManagementModel.py
View file

@ -5,6 +5,7 @@ import copy # To duplicate materials.
from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QUrl from PyQt5.QtCore import pyqtProperty, pyqtSignal, pyqtSlot, QObject, QUrl
from typing import Any, Dict, Optional, TYPE_CHECKING from typing import Any, Dict, Optional, TYPE_CHECKING
import uuid # To generate new GUIDs for new materials. import uuid # To generate new GUIDs for new materials.
import zipfile # To export all materials in a .zip archive.
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
from UM.Logger import Logger from UM.Logger import Logger
@ -270,7 +271,7 @@ class MaterialManagementModel(QObject):
except ValueError: # Material was not in the favorites list. except ValueError: # Material was not in the favorites list.
Logger.log("w", "Material {material_base_file} was already not a favorite material.".format(material_base_file = material_base_file)) Logger.log("w", "Material {material_base_file} was already not a favorite material.".format(material_base_file = material_base_file))
def _onOutputDevicesChanged(self): def _onOutputDevicesChanged(self) -> None:
""" """
When the list of output devices changes, we may want to update the When the list of output devices changes, we may want to update the
preferred export path. preferred export path.
@ -288,7 +289,23 @@ class MaterialManagementModel(QObject):
outputDevicesChanged = pyqtSignal() # Triggered when adding or removing removable drives. outputDevicesChanged = pyqtSignal() # Triggered when adding or removing removable drives.
@pyqtProperty(QUrl, notify = outputDevicesChanged) @pyqtProperty(QUrl, notify = outputDevicesChanged)
def preferredExportAllPath(self): def preferredExportAllPath(self) -> QUrl:
if self._preferred_export_all_path is None: # Not initialised yet. Can happen when output devices changed before class got created. if self._preferred_export_all_path is None: # Not initialised yet. Can happen when output devices changed before class got created.
self._onOutputDevicesChanged() self._onOutputDevicesChanged()
return self._preferred_export_all_path return self._preferred_export_all_path
@pyqtSlot(QUrl)
def exportAll(self, file_path: QUrl) -> None:
registry = CuraContainerRegistry.getInstance()
with open(file_path.toLocalFile(), "w") as stream:
archive = zipfile.ZipFile(stream, "w", compression = zipfile.ZIP_DEFLATED)
for metadata in registry.findInstanceContainersMetadata(type = "material"):
if metadata["base_file"] != metadata["id"]: # Only process base files.
continue
if metadata["id"] == "empty_material": # Don't export the empty material.
continue
material = registry.findContainers(id = metadata["id"])[0]
suffix = registry.getMimeTypeForContainer(type(material)).preferredSuffix
filename = metadata["id"] + "." + suffix
archive.writestr(filename, material.serialize())

8
resources/qml/Preferences/Materials/MaterialsPage.qml
View file

@ -203,7 +203,7 @@ Item
forceActiveFocus(); forceActiveFocus();
exportAllMaterialsDialog.open(); exportAllMaterialsDialog.open();
} }
enabled: Cura.MachineManager.activeMachine.supportsMaterialExport() enabled: Cura.MachineManager.activeMachine.supportsMaterialExport
} }
} }
@ -389,7 +389,11 @@ Item
selectExisting: false selectExisting: false
nameFilters: ["Material archives (*.zip)", "All files (*)"] nameFilters: ["Material archives (*.zip)", "All files (*)"]
folder: base.materialManagementModel.preferredExportAllPath folder: base.materialManagementModel.preferredExportAllPath
//TODO: Implement onAccepted event to save the profiles. onAccepted:
{
base.materialManagementModel.exportAll(fileUrl);
CuraApplication.setDefaultPath("dialog_material_path", folder);
}
} }
MessageDialog MessageDialog