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

In multi build plate mode objects are now always arranged instead of never. CURA-5606

Browse Source
This commit is contained in:
Jack Ha 2018-07-31 09:50:43 +02:00
parent 4dd0ad6984
commit 1e2c590c54
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cura/CuraApplication.py
View File

@ -1605,8 +1605,7 @@ class CuraApplication(QtApplication):
self._currently_loading_files.remove(file_name) self._currently_loading_files.remove(file_name)
self.fileLoaded.emit(file_name) self.fileLoaded.emit(file_name)
arrange_objects_on_load = not self.getPreferences().getValue("cura/use_multi_build_plate") target_build_plate = self.getMultiBuildPlateModel().activeBuildPlate
target_build_plate = self.getMultiBuildPlateModel().activeBuildPlate if arrange_objects_on_load else -1
root = self.getController().getScene().getRoot() root = self.getController().getScene().getRoot()
fixed_nodes = [] fixed_nodes = []
@ -1660,7 +1659,7 @@ class CuraApplication(QtApplication):
if not child.getDecorator(ConvexHullDecorator): if not child.getDecorator(ConvexHullDecorator):
child.addDecorator(ConvexHullDecorator()) child.addDecorator(ConvexHullDecorator())
if file_extension != "3mf" and arrange_objects_on_load: if file_extension != "3mf":
if node.callDecoration("isSliceable"): if node.callDecoration("isSliceable"):
# Only check position if it's not already blatantly obvious that it won't fit. # Only check position if it's not already blatantly obvious that it won't fit.
if node.getBoundingBox() is None or self._volume.getBoundingBox() is None or node.getBoundingBox().width < self._volume.getBoundingBox().width or node.getBoundingBox().depth < self._volume.getBoundingBox().depth: if node.getBoundingBox() is None or self._volume.getBoundingBox() is None or node.getBoundingBox().width < self._volume.getBoundingBox().width or node.getBoundingBox().depth < self._volume.getBoundingBox().depth: