Merge branch 'CURA-6643_f5_to_reload_gcode' of github.com:Ultimaker/Cura

cura/CuraApplication.py

@@ -69,6 +69,7 @@ from cura.Scene.BuildPlateDecorator import BuildPlateDecorator
 from cura.Scene.ConvexHullDecorator import ConvexHullDecorator
 from cura.Scene.CuraSceneController import CuraSceneController
 from cura.Scene.CuraSceneNode import CuraSceneNode
+from cura.Scene.GCodeListDecorator import GCodeListDecorator
 from cura.Scene.SliceableObjectDecorator import SliceableObjectDecorator
 from cura.Scene import ZOffsetDecorator
 
@@ -1327,7 +1328,13 @@ class CuraApplication(QtApplication):
         Logger.log("i", "Reloading all loaded mesh data.")
         nodes = []
         has_merged_nodes = False
+        gcode_filename = None  # type: Optional[str]
         for node in DepthFirstIterator(self.getController().getScene().getRoot()):
+            # Objects loaded from Gcode should also be included.
+            gcode_filename = node.callDecoration("getGcodeFileName")
+            if gcode_filename is not None:
+                break
+
             if not isinstance(node, CuraSceneNode) or not node.getMeshData():
                 if node.getName() == "MergedMesh":
                     has_merged_nodes = True
@@ -1335,6 +1342,11 @@ class CuraApplication(QtApplication):
 
             nodes.append(node)
 
+        # We can open only one gcode file at the same time. If the current view has a gcode file open, just reopen it
+        # for reloading.
+        if gcode_filename:
+            self._openFile(gcode_filename)
+
         if not nodes:
             return
 

cura/Scene/GCodeListDecorator.py

@@ -1,11 +1,18 @@
 from UM.Scene.SceneNodeDecorator import SceneNodeDecorator
-from typing import List
+from typing import List, Optional
 
 
 class GCodeListDecorator(SceneNodeDecorator):
     def __init__(self) -> None:
         super().__init__()
         self._gcode_list = []  # type: List[str]
+        self._filename = None  # type: Optional[str]
+
+    def getGcodeFileName(self) -> Optional[str]:
+        return self._filename
+
+    def setGcodeFileName(self, filename: str) -> None:
+        self._filename = filename
 
     def getGCodeList(self) -> List[str]:
         return self._gcode_list

plugins/GCodeGzReader/GCodeGzReader.py

@@ -27,6 +27,6 @@ class GCodeGzReader(MeshReader):
             file_data = file.read()
         uncompressed_gcode = gzip.decompress(file_data).decode("utf-8")
         PluginRegistry.getInstance().getPluginObject("GCodeReader").preReadFromStream(uncompressed_gcode)
-        result = PluginRegistry.getInstance().getPluginObject("GCodeReader").readFromStream(uncompressed_gcode)
+        result = PluginRegistry.getInstance().getPluginObject("GCodeReader").readFromStream(uncompressed_gcode, file_name)
 
         return result

plugins/GCodeReader/FlavorParser.py

@@ -292,7 +292,7 @@ class FlavorParser:
                 extruder.getProperty("machine_nozzle_offset_y", "value")]
         return result
 
-    def processGCodeStream(self, stream: str) -> Optional[CuraSceneNode]:
+    def processGCodeStream(self, stream: str, filename: str) -> Optional["CuraSceneNode"]:
         Logger.log("d", "Preparing to load GCode")
         self._cancelled = False
         # We obtain the filament diameter from the selected extruder to calculate line widths
@@ -453,6 +453,7 @@ class FlavorParser:
         scene_node.addDecorator(decorator)
 
         gcode_list_decorator = GCodeListDecorator()
+        gcode_list_decorator.setGcodeFileName(filename)
         gcode_list_decorator.setGCodeList(gcode_list)
         scene_node.addDecorator(gcode_list_decorator)
 

plugins/GCodeReader/GCodeReader.py

@@ -2,6 +2,8 @@
 # Copyright (c) 2018 Ultimaker B.V.
 # Cura is released under the terms of the LGPLv3 or higher.
 
+from typing import Optional, Union, List, TYPE_CHECKING
+
 from UM.FileHandler.FileReader import FileReader
 from UM.Mesh.MeshReader import MeshReader
 from UM.i18n import i18nCatalog
@@ -9,8 +11,14 @@ from UM.Application import Application
 from UM.MimeTypeDatabase import MimeTypeDatabase, MimeType
 
 catalog = i18nCatalog("cura")
+
+from .FlavorParser import FlavorParser
 from . import MarlinFlavorParser, RepRapFlavorParser
 
+if TYPE_CHECKING:
+    from UM.Scene.SceneNode import SceneNode
+    from cura.Scene.CuraSceneNode import CuraSceneNode
+
 
 # Class for loading and parsing G-code files
 class GCodeReader(MeshReader):
@@ -30,7 +38,7 @@ class GCodeReader(MeshReader):
         )
         self._supported_extensions = [".gcode", ".g"]
 
-        self._flavor_reader = None
+        self._flavor_reader = None  # type: Optional[FlavorParser]
 
         Application.getInstance().getPreferences().addPreference("gcodereader/show_caution", True)
 
@@ -54,10 +62,16 @@ class GCodeReader(MeshReader):
             file_data = file.read()
         return self.preReadFromStream(file_data, args, kwargs)
 
-    def readFromStream(self, stream):
-        return self._flavor_reader.processGCodeStream(stream)
+    def readFromStream(self, stream: str, filename: str) -> Optional["CuraSceneNode"]:
+        if self._flavor_reader is None:
+            return None
+        return self._flavor_reader.processGCodeStream(stream, filename)
 
-    def _read(self, file_name):
+    def _read(self, file_name: str) -> Union["SceneNode", List["SceneNode"]]:
         with open(file_name, "r", encoding = "utf-8") as file:
             file_data = file.read()
-        return self.readFromStream(file_data)
+        result = []  # type: List[SceneNode]
+        node = self.readFromStream(file_data, file_name)
+        if node is not None:
+            result.append(node)
+        return result