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

Merge branch 'master' of ssh://github.com/Ultimaker/Cura

Browse Source
This commit is contained in:
Ghostkeeper 2018-06-04 16:54:54 +02:00
commit 21dd29f035
No known key found for this signature in database
GPG Key ID: 5252B696FB5E7C7A
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cura/Arranging/ArrangeObjectsAllBuildPlatesJob.py
View File

@ -110,7 +110,7 @@ class ArrangeObjectsAllBuildPlatesJob(Job):
arrange_array.add() arrange_array.add()
arranger = arrange_array.get(current_build_plate_number) 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 x, y = best_spot.x, best_spot.y
node.removeDecorator(ZOffsetDecorator) node.removeDecorator(ZOffsetDecorator)
if node.getBoundingBox(): if node.getBoundingBox():
@ -118,7 +118,7 @@ class ArrangeObjectsAllBuildPlatesJob(Job):
else: else:
center_y = 0 center_y = 0
if x is not None: # We could find a place 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) node.callDecoration("setBuildPlateNumber", current_build_plate_number)
grouped_operation.addOperation(TranslateOperation(node, Vector(x, center_y, y), set_position = True)) grouped_operation.addOperation(TranslateOperation(node, Vector(x, center_y, y), set_position = True))

3
cura/PrintInformation.py
View File

@ -357,11 +357,12 @@ class PrintInformation(QObject):
data = mime_type.stripExtension(name) data = mime_type.stripExtension(name)
except: except:
Logger.log("w", "Unsupported Mime Type Database file extension") Logger.log("w", "Unsupported Mime Type Database file extension")
data = 'unnamed'
if data is not None and check_name is not None: if data is not None and check_name is not None:
self._base_name = data self._base_name = data
else: else:
self._base_name = '' self._base_name = 'unnamed'
self._updateJobName() self._updateJobName()