3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-06 22:47:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

CURA-5330 Fix typing in the Arranger

Browse source
This commit is contained in:
Diego Prado Gesto 2018-06-13 08:53:01 +02:00
parent 698c72e190
commit 3a8756efa5
2 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py
View file

@ -20,14 +20,14 @@ from typing import List
## Do arrangements on multiple build plates (aka builtiplexer) ## Do arrangements on multiple build plates (aka builtiplexer)
class ArrangeArray: 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._x = x
self._y = y self._y = y
self._fixed_nodes = fixed_nodes self._fixed_nodes = fixed_nodes
self._count = 0 self._count = 0
self._first_empty = None self._first_empty = None
self._has_empty = False self._has_empty = False
self._arrange = [] self._arrange = [] # type: List[Arrange]
def _update_first_empty(self): def _update_first_empty(self):
for i, a in enumerate(self._arrange): for i, a in enumerate(self._arrange):
@ -48,16 +48,17 @@ class ArrangeArray:
return self._count return self._count
def get(self, index): def get(self, index):
print(self._arrange)
return self._arrange[index] return self._arrange[index]
def getFirstEmpty(self): def getFirstEmpty(self):
if not self._is_empty: if not self._has_empty:
self.add() self.add()
return self._arrange[self._first_empty] return self._arrange[self._first_empty]
class ArrangeObjectsAllBuildPlatesJob(Job): class ArrangeObjectsAllBuildPlatesJob(Job):
def __init__(self, nodes: List[SceneNode], min_offset = 8): def __init__(self, nodes: List[SceneNode], min_offset = 8) -> None:
super().__init__() super().__init__()
self._nodes = nodes self._nodes = nodes
self._min_offset = min_offset self._min_offset = min_offset

2
cura/Arranging/ArrangeObjectsJob.py
View file

@ -20,7 +20,7 @@ from typing import List
class ArrangeObjectsJob(Job): 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__() super().__init__()
self._nodes = nodes self._nodes = nodes
self._fixed_nodes = fixed_nodes self._fixed_nodes = fixed_nodes