GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-12 17:58:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

Added progress message to arrangeObjectsJob

Browse Source
This commit is contained in:
Jaime van Kessel 2017-04-05 16:42:13 +02:00
parent d5682e6e29
commit 03db47afd9
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
cura/ArrangeObjectsJob.py
View File

@ -6,6 +6,8 @@ from UM.Scene.SceneNode import SceneNode
from UM.Math.Vector import Vector from UM.Math.Vector import Vector
from UM.Operations.SetTransformOperation import SetTransformOperation from UM.Operations.SetTransformOperation import SetTransformOperation
from UM.Message import Message from UM.Message import Message
from UM.i18n import i18nCatalog
i18n_catalog = i18nCatalog("cura")
from cura.ZOffsetDecorator import ZOffsetDecorator from cura.ZOffsetDecorator import ZOffsetDecorator
from cura.Arrange import Arrange from cura.Arrange import Arrange
@ -22,6 +24,8 @@ class ArrangeObjectsJob(Job):
self._min_offset = min_offset self._min_offset = min_offset
def run(self): def run(self):
status_message = Message(i18n_catalog.i18nc("@info:status", "Finding new location for objects"), lifetime = 0, dismissable=False, progress = 0)
status_message.show()
arranger = Arrange.create(fixed_nodes = self._fixed_nodes) arranger = Arrange.create(fixed_nodes = self._fixed_nodes)
# Collect nodes to be placed # Collect nodes to be placed
@ -38,7 +42,8 @@ class ArrangeObjectsJob(Job):
start_priority = 0 start_priority = 0
last_priority = start_priority last_priority = start_priority
last_size = None last_size = None
for size, node, offset_shape_arr, hull_shape_arr in nodes_arr:
for idx, (size, node, offset_shape_arr, hull_shape_arr) in enumerate(nodes_arr):
# For performance reasons, we assume that when a location does not fit, # For performance reasons, we assume that when a location does not fit,
# it will also not fit for the next object (while what can be untrue). # it will also not fit for the next object (while what can be untrue).
# We also skip possibilities by slicing through the possibilities (step = 10) # We also skip possibilities by slicing through the possibilities (step = 10)
@ -61,5 +66,7 @@ class ArrangeObjectsJob(Job):
transformation_operation = SetTransformOperation(node, Vector(x, center_y, y)) transformation_operation = SetTransformOperation(node, Vector(x, center_y, y))
transformation_operation.push() transformation_operation.push()
status_message.setProgress((idx + 1) / len(nodes_arr) * 100)
Job.yieldThread() Job.yieldThread()
status_message.hide()