From 3a8756efa5494890d61bb806c9d9d4b5684482f6 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Wed, 13 Jun 2018 08:53:01 +0200 Subject: [PATCH] CURA-5330 Fix typing in the Arranger --- cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py | 9 +++++---- cura/Arranging/ArrangeObjectsJob.py | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py b/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py index 6abc553a4b..8bbc2bf132 100644 --- a/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py +++ b/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py @@ -20,14 +20,14 @@ from typing import List ## Do arrangements on multiple build plates (aka builtiplexer) class ArrangeArray: - def __init__(self, x: int, y: int, fixed_nodes: List[SceneNode]): + def __init__(self, x: int, y: int, fixed_nodes: List[SceneNode]) -> None: self._x = x self._y = y self._fixed_nodes = fixed_nodes self._count = 0 self._first_empty = None self._has_empty = False - self._arrange = [] + self._arrange = [] # type: List[Arrange] def _update_first_empty(self): for i, a in enumerate(self._arrange): @@ -48,16 +48,17 @@ class ArrangeArray: return self._count def get(self, index): + print(self._arrange) return self._arrange[index] def getFirstEmpty(self): - if not self._is_empty: + if not self._has_empty: self.add() return self._arrange[self._first_empty] class ArrangeObjectsAllBuildPlatesJob(Job): - def __init__(self, nodes: List[SceneNode], min_offset = 8): + def __init__(self, nodes: List[SceneNode], min_offset = 8) -> None: super().__init__() self._nodes = nodes self._min_offset = min_offset diff --git a/cura/Arranging/ArrangeObjectsJob.py b/cura/Arranging/ArrangeObjectsJob.py index 5e982582fd..ce11556b5b 100644 --- a/cura/Arranging/ArrangeObjectsJob.py +++ b/cura/Arranging/ArrangeObjectsJob.py @@ -20,7 +20,7 @@ from typing import List class ArrangeObjectsJob(Job): - def __init__(self, nodes: List[SceneNode], fixed_nodes: List[SceneNode], min_offset = 8): + def __init__(self, nodes: List[SceneNode], fixed_nodes: List[SceneNode], min_offset = 8) -> None: super().__init__() self._nodes = nodes self._fixed_nodes = fixed_nodes