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

Remove duplicated mime type

Browse source 
CURA-11403
This commit is contained in:
c.lamboo 2024-02-21 11:23:05 +01:00
parent ae686bcad9
commit 08b70252a4
3 changed files with 25 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

9
plugins/3MFReader/ThreeMFReader.py
View file

@ -41,18 +41,11 @@ class ThreeMFReader(MeshReader):
MimeTypeDatabase.addMimeType( MimeTypeDatabase.addMimeType(
MimeType( MimeType(
name = "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", name="application/vnd.ms-package.3dmanufacturing-3dmodel+xml",
comment="3MF", comment="3MF",
suffixes=["3mf"] suffixes=["3mf"]
) )
) )
MimeTypeDatabase.addMimeType(
MimeType(
name="application/x-ucp",
comment="UCP",
suffixes=["3mf"]
)
)
self._supported_extensions = [".3mf"] self._supported_extensions = [".3mf"]
self._root = None self._root = None

25
plugins/3MFWriter/UCPDialog.py
View file

@ -29,15 +29,21 @@ class UCPDialog(QObject):
plugin_path = os.path.dirname(__file__) plugin_path = os.path.dirname(__file__)
dialog_path = os.path.join(plugin_path, 'UCPDialog.qml') dialog_path = os.path.join(plugin_path, 'UCPDialog.qml')
self._model = SettingsExportModel() self._model = SettingsExportModel()
self._view = CuraApplication.getInstance().createQmlComponent(dialog_path, self._view = CuraApplication.getInstance().createQmlComponent(
{"manager": self, dialog_path,
"settingsExportModel": self._model}) {
"manager": self,
"settingsExportModel": self._model
}
)
self._view.accepted.connect(self._onAccepted) self._view.accepted.connect(self._onAccepted)
self._view.rejected.connect(self._onRejected) self._view.rejected.connect(self._onRejected)
self._finished = False self._finished = False
self._accepted = False self._accepted = False
def show(self) -> None: def show(self) -> None:
self._finished = False
self._accepted = False
self._view.show() self._view.show()
def getModel(self) -> SettingsExportModel: def getModel(self) -> SettingsExportModel:
@ -67,8 +73,13 @@ class UCPDialog(QObject):
file_name = CuraApplication.getInstance().getPrintInformation().baseName file_name = CuraApplication.getInstance().getPrintInformation().baseName
try: try:
device.requestWrite(nodes, file_name, ["application/x-ucp"], workspace_handler, device.requestWrite(
preferred_mimetype_list="application/x-ucp") nodes,
file_name,
["application/vnd.ms-package.3dmanufacturing-3dmodel+xml"],
workspace_handler,
preferred_mimetype_list="application/vnd.ms-package.3dmanufacturing-3dmodel+xml"
)
except OutputDeviceError.UserCanceledError: except OutputDeviceError.UserCanceledError:
self._onRejected() self._onRejected()
except Exception as e: except Exception as e:
@ -90,7 +101,9 @@ class UCPDialog(QObject):
self._onFinished() self._onFinished()
def _onFinished(self): def _onFinished(self):
if not self._finished: # Make sure we don't send the finished signal twice, whatever happens # Make sure we don't send the finished signal twice, whatever happens
if self._finished:
return
self._finished = True self._finished = True
# Reset the model to the workspace writer # Reset the model to the workspace writer

12
plugins/3MFWriter/__init__.py
View file

@ -32,12 +32,6 @@ def getMetaData():
"description": i18n_catalog.i18nc("@item:inlistbox", "3MF file"), "description": i18n_catalog.i18nc("@item:inlistbox", "3MF file"),
"mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", "mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml",
"mode": ThreeMFWriter.ThreeMFWriter.OutputMode.BinaryMode "mode": ThreeMFWriter.ThreeMFWriter.OutputMode.BinaryMode
},
{
"extension": "3mf",
"description": i18n_catalog.i18nc("@item:inlistbox", "Universal Cura Project"),
"mime_type": "application/x-ucp",
"mode": ThreeMFWriter.ThreeMFWriter.OutputMode.BinaryMode
} }
] ]
} }
@ -48,12 +42,6 @@ def getMetaData():
"description": i18n_catalog.i18nc("@item:inlistbox", "Cura Project 3MF file"), "description": i18n_catalog.i18nc("@item:inlistbox", "Cura Project 3MF file"),
"mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml", "mime_type": "application/vnd.ms-package.3dmanufacturing-3dmodel+xml",
"mode": ThreeMFWorkspaceWriter.ThreeMFWorkspaceWriter.OutputMode.BinaryMode "mode": ThreeMFWorkspaceWriter.ThreeMFWorkspaceWriter.OutputMode.BinaryMode
},
{
"extension": "3mf",
"description": i18n_catalog.i18nc("@item:inlistbox", "Universal Cura Project"),
"mime_type": "application/x-ucp",
"mode": ThreeMFWorkspaceWriter.ThreeMFWorkspaceWriter.OutputMode.BinaryMode
} }
] ]
} }