From a9095f2b778cffb6d2f5049f8638010cc1c0b651 Mon Sep 17 00:00:00 2001 From: Aleksei S Date: Mon, 4 Jun 2018 11:46:51 +0200 Subject: [PATCH 1/2] After command "Undo" the project name was empty CURA-5367 --- cura/PrintInformation.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cura/PrintInformation.py b/cura/PrintInformation.py index 9239dec8b7..d17720228f 100644 --- a/cura/PrintInformation.py +++ b/cura/PrintInformation.py @@ -357,11 +357,12 @@ class PrintInformation(QObject): data = mime_type.stripExtension(name) except: Logger.log("w", "Unsupported Mime Type Database file extension") + data = 'unnamed' if data is not None and check_name is not None: self._base_name = data else: - self._base_name = '' + self._base_name = 'unnamed' self._updateJobName() From 79d6a9a614ec67d66833cfa75238dff626661450 Mon Sep 17 00:00:00 2001 From: Jack Ha Date: Mon, 4 Jun 2018 12:53:13 +0200 Subject: [PATCH 2/2] CURA-5434 fixed arrange to all build plates by reversing hull_shape and offset_shape --- cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py b/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py index 252cef4e65..6abc553a4b 100644 --- a/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py +++ b/cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py @@ -110,7 +110,7 @@ class ArrangeObjectsAllBuildPlatesJob(Job): arrange_array.add() arranger = arrange_array.get(current_build_plate_number) - best_spot = arranger.bestSpot(offset_shape_arr, start_prio=start_priority) + best_spot = arranger.bestSpot(hull_shape_arr, start_prio=start_priority) x, y = best_spot.x, best_spot.y node.removeDecorator(ZOffsetDecorator) if node.getBoundingBox(): @@ -118,7 +118,7 @@ class ArrangeObjectsAllBuildPlatesJob(Job): else: center_y = 0 if x is not None: # We could find a place - arranger.place(x, y, hull_shape_arr) # place the object in the arranger + arranger.place(x, y, offset_shape_arr) # place the object in the arranger node.callDecoration("setBuildPlateNumber", current_build_plate_number) grouped_operation.addOperation(TranslateOperation(node, Vector(x, center_y, y), set_position = True))