From 9ac7eb4da7d2859f430792b4dca7fa24caa63e2f Mon Sep 17 00:00:00 2001 From: digitalfrost Date: Fri, 5 Aug 2022 10:37:02 +0200 Subject: [PATCH 1/3] Use enumerate to iterate over self._types This is more pythonic. The comparaison in the if block below the for loop now becomes clearer. --- cura/LayerPolygon.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index 2c3b432b1d..c13bef85de 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -39,10 +39,10 @@ class LayerPolygon: self._extruder = extruder self._types = line_types - for i in range(len(self._types)): - if self._types[i] >= self.__number_of_types: # Got faulty line data from the engine. - Logger.log("w", "Found an unknown line type: %s", i) - self._types[i] = self.NoneType + for idx, line_type in enumerate(self._types): + if line_type >= self.__number_of_types: # Got faulty line data from the engine. + Logger.log("w", "Found an unknown line type: %s", line_type) + self._types[idx] = self.NoneType self._data = data self._line_widths = line_widths self._line_thicknesses = line_thicknesses From 1c3479c9fc63ae7fc23726cd24dd42e458b06237 Mon Sep 17 00:00:00 2001 From: digitalfrost Date: Fri, 5 Aug 2022 11:08:20 +0200 Subject: [PATCH 2/3] Refactor check for unknown line types Using .where() clarifies the intent. --- cura/LayerPolygon.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index c13bef85de..01970bd54f 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -39,9 +39,11 @@ class LayerPolygon: self._extruder = extruder self._types = line_types - for idx, line_type in enumerate(self._types): - if line_type >= self.__number_of_types: # Got faulty line data from the engine. - Logger.log("w", "Found an unknown line type: %s", line_type) + unknown_types = np.where(self_types >= self_number_of_types) + if unknown_types: + # Got faulty line data from the engine. + for idx in unknown_types: + Logger.log("w", "Found an unknown line type at: %s", idx) self._types[idx] = self.NoneType self._data = data self._line_widths = line_widths From e9172b10af9e8132ab81c1841b3d0262e489f17c Mon Sep 17 00:00:00 2001 From: digitalfrost Date: Tue, 23 Aug 2022 20:01:47 +0200 Subject: [PATCH 3/3] Use f-string and warn method with Logger Use f-string and warn method for Logger instead of "Old Style" string formatting. Co-authored-by: Jelle Spijker --- cura/LayerPolygon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cura/LayerPolygon.py b/cura/LayerPolygon.py index 01970bd54f..91a26b2500 100644 --- a/cura/LayerPolygon.py +++ b/cura/LayerPolygon.py @@ -43,7 +43,7 @@ class LayerPolygon: if unknown_types: # Got faulty line data from the engine. for idx in unknown_types: - Logger.log("w", "Found an unknown line type at: %s", idx) + Logger.warn(f"Found an unknown line type at: {idx}") self._types[idx] = self.NoneType self._data = data self._line_widths = line_widths