mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 22:47:29 -06:00
Add some extra information when the Cura can't write the files.
This commit is contained in:
parent
d8abf8f470
commit
38a0c9b66d
4 changed files with 25 additions and 2 deletions
|
@ -25,6 +25,9 @@ except ImportError:
|
||||||
import zipfile
|
import zipfile
|
||||||
import UM.Application
|
import UM.Application
|
||||||
|
|
||||||
|
from UM.i18n import i18nCatalog
|
||||||
|
catalog = i18nCatalog("cura")
|
||||||
|
|
||||||
|
|
||||||
class ThreeMFWriter(MeshWriter):
|
class ThreeMFWriter(MeshWriter):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -173,6 +176,7 @@ class ThreeMFWriter(MeshWriter):
|
||||||
archive.writestr(relations_file, b'<?xml version="1.0" encoding="UTF-8"?> \n' + ET.tostring(relations_element))
|
archive.writestr(relations_file, b'<?xml version="1.0" encoding="UTF-8"?> \n' + ET.tostring(relations_element))
|
||||||
except Exception as e:
|
except Exception as e:
|
||||||
Logger.logException("e", "Error writing zip file")
|
Logger.logException("e", "Error writing zip file")
|
||||||
|
self.setInformation(catalog.i18nc("@error:zip", "Error writing 3mf file."))
|
||||||
return False
|
return False
|
||||||
finally:
|
finally:
|
||||||
if not self._store_archive:
|
if not self._store_archive:
|
||||||
|
|
|
@ -10,6 +10,9 @@ from UM.Mesh.MeshWriter import MeshWriter #The class we're extending/implementin
|
||||||
from UM.PluginRegistry import PluginRegistry
|
from UM.PluginRegistry import PluginRegistry
|
||||||
from UM.Scene.SceneNode import SceneNode #For typing.
|
from UM.Scene.SceneNode import SceneNode #For typing.
|
||||||
|
|
||||||
|
from UM.i18n import i18nCatalog
|
||||||
|
catalog = i18nCatalog("cura")
|
||||||
|
|
||||||
## A file writer that writes gzipped g-code.
|
## A file writer that writes gzipped g-code.
|
||||||
#
|
#
|
||||||
# If you're zipping g-code, you might as well use gzip!
|
# If you're zipping g-code, you might as well use gzip!
|
||||||
|
@ -28,12 +31,15 @@ class GCodeGzWriter(MeshWriter):
|
||||||
def write(self, stream: BufferedIOBase, nodes: List[SceneNode], mode = MeshWriter.OutputMode.BinaryMode) -> bool:
|
def write(self, stream: BufferedIOBase, nodes: List[SceneNode], mode = MeshWriter.OutputMode.BinaryMode) -> bool:
|
||||||
if mode != MeshWriter.OutputMode.BinaryMode:
|
if mode != MeshWriter.OutputMode.BinaryMode:
|
||||||
Logger.log("e", "GCodeGzWriter does not support text mode.")
|
Logger.log("e", "GCodeGzWriter does not support text mode.")
|
||||||
|
self.setInformation(catalog.i18nc("@error:not supported", "GCodeGzWriter does not support text mode."))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
#Get the g-code from the g-code writer.
|
#Get the g-code from the g-code writer.
|
||||||
gcode_textio = StringIO() #We have to convert the g-code into bytes.
|
gcode_textio = StringIO() #We have to convert the g-code into bytes.
|
||||||
success = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter")).write(gcode_textio, None)
|
gcode_writer = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter"))
|
||||||
|
success = gcode_writer.write(gcode_textio, None)
|
||||||
if not success: #Writing the g-code failed. Then I can also not write the gzipped g-code.
|
if not success: #Writing the g-code failed. Then I can also not write the gzipped g-code.
|
||||||
|
self.setInformation(gcode_writer.getInformation())
|
||||||
return False
|
return False
|
||||||
|
|
||||||
result = gzip.compress(gcode_textio.getvalue().encode("utf-8"))
|
result = gzip.compress(gcode_textio.getvalue().encode("utf-8"))
|
||||||
|
|
|
@ -12,6 +12,8 @@ from UM.Settings.InstanceContainer import InstanceContainer
|
||||||
|
|
||||||
from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
|
from cura.Machines.QualityManager import getMachineDefinitionIDForQualitySearch
|
||||||
|
|
||||||
|
from UM.i18n import i18nCatalog
|
||||||
|
catalog = i18nCatalog("cura")
|
||||||
|
|
||||||
## Writes g-code to a file.
|
## Writes g-code to a file.
|
||||||
#
|
#
|
||||||
|
@ -62,11 +64,13 @@ class GCodeWriter(MeshWriter):
|
||||||
def write(self, stream, nodes, mode = MeshWriter.OutputMode.TextMode):
|
def write(self, stream, nodes, mode = MeshWriter.OutputMode.TextMode):
|
||||||
if mode != MeshWriter.OutputMode.TextMode:
|
if mode != MeshWriter.OutputMode.TextMode:
|
||||||
Logger.log("e", "GCodeWriter does not support non-text mode.")
|
Logger.log("e", "GCodeWriter does not support non-text mode.")
|
||||||
|
self.setInformation(catalog.i18nc("@error:not supported", "GCodeWriter does not support non-text mode."))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
active_build_plate = Application.getInstance().getMultiBuildPlateModel().activeBuildPlate
|
active_build_plate = Application.getInstance().getMultiBuildPlateModel().activeBuildPlate
|
||||||
scene = Application.getInstance().getController().getScene()
|
scene = Application.getInstance().getController().getScene()
|
||||||
if not hasattr(scene, "gcode_dict"):
|
if not hasattr(scene, "gcode_dict"):
|
||||||
|
self.setInformation(catalog.i18nc("@warning:status", "Please generate G-code before saving."))
|
||||||
return False
|
return False
|
||||||
gcode_dict = getattr(scene, "gcode_dict")
|
gcode_dict = getattr(scene, "gcode_dict")
|
||||||
gcode_list = gcode_dict.get(active_build_plate, None)
|
gcode_list = gcode_dict.get(active_build_plate, None)
|
||||||
|
@ -82,6 +86,7 @@ class GCodeWriter(MeshWriter):
|
||||||
stream.write(settings)
|
stream.write(settings)
|
||||||
return True
|
return True
|
||||||
|
|
||||||
|
self.setInformation(catalog.i18nc("@warning:status", "Please generate G-code before saving."))
|
||||||
return False
|
return False
|
||||||
|
|
||||||
## Create a new container with container 2 as base and container 1 written over it.
|
## Create a new container with container 2 as base and container 1 written over it.
|
||||||
|
|
|
@ -1,5 +1,6 @@
|
||||||
#Copyright (c) 2018 Ultimaker B.V.
|
#Copyright (c) 2018 Ultimaker B.V.
|
||||||
#Cura is released under the terms of the LGPLv3 or higher.
|
#Cura is released under the terms of the LGPLv3 or higher.
|
||||||
|
from typing import cast
|
||||||
|
|
||||||
from Charon.VirtualFile import VirtualFile #To open UFP files.
|
from Charon.VirtualFile import VirtualFile #To open UFP files.
|
||||||
from Charon.OpenMode import OpenMode #To indicate that we want to write to UFP files.
|
from Charon.OpenMode import OpenMode #To indicate that we want to write to UFP files.
|
||||||
|
@ -13,6 +14,9 @@ from PyQt5.QtCore import QBuffer
|
||||||
|
|
||||||
from cura.Snapshot import Snapshot
|
from cura.Snapshot import Snapshot
|
||||||
|
|
||||||
|
from UM.i18n import i18nCatalog
|
||||||
|
catalog = i18nCatalog("cura")
|
||||||
|
|
||||||
|
|
||||||
class UFPWriter(MeshWriter):
|
class UFPWriter(MeshWriter):
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
|
@ -32,7 +36,11 @@ class UFPWriter(MeshWriter):
|
||||||
#Store the g-code from the scene.
|
#Store the g-code from the scene.
|
||||||
archive.addContentType(extension = "gcode", mime_type = "text/x-gcode")
|
archive.addContentType(extension = "gcode", mime_type = "text/x-gcode")
|
||||||
gcode_textio = StringIO() #We have to convert the g-code into bytes.
|
gcode_textio = StringIO() #We have to convert the g-code into bytes.
|
||||||
PluginRegistry.getInstance().getPluginObject("GCodeWriter").write(gcode_textio, None)
|
gcode_writer = cast(MeshWriter, PluginRegistry.getInstance().getPluginObject("GCodeWriter"))
|
||||||
|
success = gcode_writer.write(gcode_textio, None)
|
||||||
|
if not success: #Writing the g-code failed. Then I can also not write the gzipped g-code.
|
||||||
|
self.setInformation(gcode_writer.getInformation())
|
||||||
|
return False
|
||||||
gcode = archive.getStream("/3D/model.gcode")
|
gcode = archive.getStream("/3D/model.gcode")
|
||||||
gcode.write(gcode_textio.getvalue().encode("UTF-8"))
|
gcode.write(gcode_textio.getvalue().encode("UTF-8"))
|
||||||
archive.addRelation(virtual_path = "/3D/model.gcode", relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode")
|
archive.addRelation(virtual_path = "/3D/model.gcode", relation_type = "http://schemas.ultimaker.org/package/2018/relationships/gcode")
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue