From 6dc416e18079302e160768fe9312a4333ec28e1b Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Fri, 23 Mar 2018 17:21:09 +0100 Subject: [PATCH] CURA-5128 Change method name to be more clear. Remove a line introduced by mistake in previous commit. --- cura/Machines/MachineErrorChecker.py | 1 - plugins/GCodeReader/FlavorParser.py | 2 +- plugins/GCodeReader/GCodeReader.py | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/cura/Machines/MachineErrorChecker.py b/cura/Machines/MachineErrorChecker.py index 8971a6feb6..37de4f30ce 100644 --- a/cura/Machines/MachineErrorChecker.py +++ b/cura/Machines/MachineErrorChecker.py @@ -170,7 +170,6 @@ class MachineErrorChecker(QObject): self._application.callLater(self._checkStack) def _setResult(self, result: bool): - return if result != self._has_errors: self._has_errors = result self.hasErrorUpdated.emit() diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index 7acd20b03b..00cbbacacf 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -286,7 +286,7 @@ class FlavorParser: extruder.getProperty("machine_nozzle_offset_y", "value")] return result - def processGCodeFile(self, stream): + def processGCodeStream(self, stream): Logger.log("d", "Preparing to load GCode") self._cancelled = False # We obtain the filament diameter from the selected printer to calculate line widths diff --git a/plugins/GCodeReader/GCodeReader.py b/plugins/GCodeReader/GCodeReader.py index 3541f24915..6f872bc6f7 100755 --- a/plugins/GCodeReader/GCodeReader.py +++ b/plugins/GCodeReader/GCodeReader.py @@ -45,7 +45,7 @@ class GCodeReader(MeshReader): return self.preReadFromStream(file_data, args, kwargs) def readFromStream(self, stream): - return self._flavor_reader.processGCodeFile(stream) + return self._flavor_reader.processGCodeStream(stream) def read(self, file_name): with open(file_name, "r", encoding = "utf-8") as file: