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

Renamed confusing 'Default' variant class to 'Cura3mf'.

Browse source 
result of code review of CURA-12099
This commit is contained in:
Remco Burema 2025-04-29 09:25:19 +02:00
parent 603df28c2a
commit 46216e1282
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/3MFWriter/DefaultVariant.py → plugins/3MFWriter/Cura3mfVariant.py
View file

@ -13,7 +13,7 @@ from .ThreeMFVariant import ThreeMFVariant
METADATA_PATH = "Metadata" METADATA_PATH = "Metadata"
THUMBNAIL_PATH = f"{METADATA_PATH}/thumbnail.png" THUMBNAIL_PATH = f"{METADATA_PATH}/thumbnail.png"
class DefaultVariant(ThreeMFVariant): class Cura3mfVariant(ThreeMFVariant):
"""Default implementation of the 3MF format.""" """Default implementation of the 3MF format."""
@property @property

8
plugins/3MFWriter/ThreeMFWriter.py
View file

@ -50,7 +50,7 @@ import UM.Application
from .SettingsExportModel import SettingsExportModel from .SettingsExportModel import SettingsExportModel
from .SettingsExportGroup import SettingsExportGroup from .SettingsExportGroup import SettingsExportGroup
from .ThreeMFVariant import ThreeMFVariant from .ThreeMFVariant import ThreeMFVariant
from .DefaultVariant import DefaultVariant from .Cura3mfVariant import Cura3mfVariant
from .BambuLabVariant import BambuLabVariant from .BambuLabVariant import BambuLabVariant
from UM.i18n import i18nCatalog from UM.i18n import i18nCatalog
@ -76,7 +76,7 @@ class ThreeMFWriter(MeshWriter):
# Register available variants # Register available variants
self._variants = { self._variants = {
DefaultVariant(self).mime_type: DefaultVariant, Cura3mfVariant(self).mime_type: Cura3mfVariant,
BambuLabVariant(self).mime_type: BambuLabVariant BambuLabVariant(self).mime_type: BambuLabVariant
} }
@ -219,7 +219,7 @@ class ThreeMFWriter(MeshWriter):
:param mime_type: The MIME type to get the variant for :param mime_type: The MIME type to get the variant for
:return: An instance of the variant for the given MIME type :return: An instance of the variant for the given MIME type
""" """
variant_class = self._variants.get(mime_type, DefaultVariant) variant_class = self._variants.get(mime_type, Cura3mfVariant)
return variant_class(self) return variant_class(self)
def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode, export_settings_model = None, **kwargs) -> bool: def write(self, stream, nodes, mode = MeshWriter.OutputMode.BinaryMode, export_settings_model = None, **kwargs) -> bool:
@ -227,7 +227,7 @@ class ThreeMFWriter(MeshWriter):
archive = zipfile.ZipFile(stream, "w", compression = zipfile.ZIP_DEFLATED) archive = zipfile.ZipFile(stream, "w", compression = zipfile.ZIP_DEFLATED)
# Determine which variant to use based on mime type in kwargs # Determine which variant to use based on mime type in kwargs
mime_type = kwargs.get("mime_type", DefaultVariant(self).mime_type) mime_type = kwargs.get("mime_type", Cura3mfVariant(self).mime_type)
variant = self._getVariant(mime_type) variant = self._getVariant(mime_type)
try: try: