From 564472107305cd16896f4f6882fda05ee4d7d588 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 5 Sep 2019 14:17:49 +0200 Subject: [PATCH 1/2] Fix UFPReader due to gcode reader readFromStream() change --- plugins/UFPReader/UFPReader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UFPReader/UFPReader.py b/plugins/UFPReader/UFPReader.py index 18527e6450..71061f938b 100644 --- a/plugins/UFPReader/UFPReader.py +++ b/plugins/UFPReader/UFPReader.py @@ -39,4 +39,4 @@ class UFPReader(MeshReader): # Open the GCodeReader to parse the data gcode_reader = PluginRegistry.getInstance().getPluginObject("GCodeReader") # type: ignore gcode_reader.preReadFromStream(gcode_stream) # type: ignore - return gcode_reader.readFromStream(gcode_stream) # type: ignore + return gcode_reader.readFromStream(gcode_stream, file_name) # type: ignore From 46a15762aa6602dcc812c09ef60a56a65596da08 Mon Sep 17 00:00:00 2001 From: Lipu Fei Date: Thu, 5 Sep 2019 14:19:48 +0200 Subject: [PATCH 2/2] Add doc for the need of filename in processGCodeStream() --- plugins/GCodeReader/FlavorParser.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index 89812e7202..d05338ae4d 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -294,6 +294,11 @@ class FlavorParser: extruder.getProperty("machine_nozzle_offset_y", "value")] return result + # + # CURA-6643 + # This function needs the filename so it can be set to the SceneNode. Otherwise, if you load a GCode file and press + # F5, that gcode SceneNode will be removed because it doesn't have a file to be reloaded from. + # def processGCodeStream(self, stream: str, filename: str) -> Optional["CuraSceneNode"]: Logger.log("d", "Preparing to load GCode") self._cancelled = False