3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-21 21:58:01 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

Improve ugly code for Arranger. CURA-3239

Browse source
This commit is contained in:
Jack Ha 2017-04-05 11:26:29 +02:00
parent 4626bc37a9
commit 87577f3e23
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cura/Arrange.py
View file

@ -1,5 +1,6 @@
from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator
from UM.Logger import Logger from UM.Logger import Logger
from UM.Math.Vector import Vector
from cura.ShapeArray import ShapeArray from cura.ShapeArray import ShapeArray
from collections import namedtuple from collections import namedtuple
@ -66,15 +67,12 @@ class Arrange:
offset_shape_arr, start_prio = start_prio, step = step) offset_shape_arr, start_prio = start_prio, step = step)
x, y = best_spot.x, best_spot.y x, y = best_spot.x, best_spot.y
start_prio = best_spot.priority start_prio = best_spot.priority
transformation = new_node._transformation
if x is not None: # We could find a place if x is not None: # We could find a place
transformation._data[0][3] = x new_node.setPosition(Vector(x, 0, y))
transformation._data[2][3] = y
self.place(x, y, hull_shape_arr) # take place before the next one self.place(x, y, hull_shape_arr) # take place before the next one
else: else:
Logger.log("d", "Could not find spot!") Logger.log("d", "Could not find spot!")
transformation._data[0][3] = 200 new_node.setPosition(Vector(200, 0, 100 + i * 20))
transformation._data[2][3] = 100 + i * 20
nodes.append(new_node) nodes.append(new_node)
return nodes return nodes