diff options
Diffstat (limited to 'cura/CuraApplication.py')
| -rwxr-xr-x | cura/CuraApplication.py | 42 |
1 files changed, 31 insertions, 11 deletions
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 0411343855..53dae66715 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -1,8 +1,9 @@ -# Copyright (c) 2020 Ultimaker B.V. +# Copyright (c) 2021 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import os import sys +import tempfile import time from typing import cast, TYPE_CHECKING, Optional, Callable, List, Any, Dict @@ -30,6 +31,7 @@ from UM.Operations.SetTransformOperation import SetTransformOperation from UM.Platform import Platform from UM.PluginError import PluginNotFoundError from UM.Preferences import Preferences +from UM.Qt.Bindings.FileProviderModel import FileProviderModel from UM.Qt.QtApplication import QtApplication # The class we're inheriting from. from UM.Resources import Resources from UM.Scene.Camera import Camera @@ -756,7 +758,7 @@ class CuraApplication(QtApplication): self._plugin_registry.addPluginLocation(os.path.join(QtApplication.getInstallPrefix(), "lib" + suffix, "cura")) if not hasattr(sys, "frozen"): self._plugin_registry.addPluginLocation(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..", "plugins")) - self._plugin_registry.loadPlugin("ConsoleLogger") + self._plugin_registry.preloaded_plugins.append("ConsoleLogger") self._plugin_registry.loadPlugins() @@ -822,6 +824,9 @@ class CuraApplication(QtApplication): self._add_printer_pages_model_without_cancel.initialize(cancellable = False) self._whats_new_pages_model.initialize() + # Initialize the FileProviderModel + self._file_provider_model.initialize(self._onFileProviderEnabledChanged) + # Detect in which mode to run and execute that mode if self._is_headless: self.runWithoutGUI() @@ -889,14 +894,14 @@ class CuraApplication(QtApplication): diagonal = self.getBuildVolume().getDiagonalSize() if diagonal < 1: #No printer added yet. Set a default camera distance for normal-sized printers. diagonal = 375 - camera.setPosition(Vector(-80, 250, 700) * diagonal / 375) + camera.setPosition(Vector(-80, 180, 700) * diagonal / 375) camera.lookAt(Vector(0, 0, 0)) controller.getScene().setActiveCamera("3d") # Initialize camera tool camera_tool = controller.getTool("CameraTool") if camera_tool: - camera_tool.setOrigin(Vector(0, 100, 0)) + camera_tool.setOrigin(Vector(0, 30, 0)) camera_tool.setZoomRange(0.1, 2000) # Initialize camera animations @@ -1051,6 +1056,13 @@ class CuraApplication(QtApplication): self._simple_mode_settings_manager = SimpleModeSettingsManager() return self._simple_mode_settings_manager + @pyqtSlot(result = QObject) + def getFileProviderModel(self) -> FileProviderModel: + return self._file_provider_model + + def _onFileProviderEnabledChanged(self): + self._file_provider_model.update() + def event(self, event): """Handle Qt events""" @@ -1466,7 +1478,8 @@ class CuraApplication(QtApplication): for file_name, nodes in objects_in_filename.items(): for node in nodes: - job = ReadMeshJob(file_name) + file_path = os.path.normpath(os.path.dirname(file_name)) + job = ReadMeshJob(file_name, add_to_recent_files = file_path != tempfile.gettempdir()) # Don't add temp files to the recent files list job._node = node # type: ignore job.finished.connect(self._reloadMeshFinished) if has_merged_nodes: @@ -1720,15 +1733,17 @@ class CuraApplication(QtApplication): def log(self, msg): Logger.log("d", msg) - openProjectFile = pyqtSignal(QUrl, arguments = ["project_file"]) # Emitted when a project file is about to open. + openProjectFile = pyqtSignal(QUrl, bool, arguments = ["project_file", "add_to_recent_files"]) # Emitted when a project file is about to open. + @pyqtSlot(QUrl, str, bool) @pyqtSlot(QUrl, str) @pyqtSlot(QUrl) - def readLocalFile(self, file: QUrl, project_mode: Optional[str] = None): + def readLocalFile(self, file: QUrl, project_mode: Optional[str] = None, add_to_recent_files: bool = True): """Open a local file :param project_mode: How to handle project files. Either None(default): Follow user preference, "open_as_model" or "open_as_project". This parameter is only considered if the file is a project file. + :param add_to_recent_files: Whether or not to add the file as an option to the Recent Files list. """ Logger.log("i", "Attempting to read file %s", file.toString()) if not file.isValid(): @@ -1749,12 +1764,12 @@ class CuraApplication(QtApplication): if is_project_file and project_mode == "open_as_project": # open as project immediately without presenting a dialog workspace_handler = self.getWorkspaceFileHandler() - workspace_handler.readLocalFile(file) + workspace_handler.readLocalFile(file, add_to_recent_files_hint = add_to_recent_files) return if is_project_file and project_mode == "always_ask": # present a dialog asking to open as project or import models - self.callLater(self.openProjectFile.emit, file) + self.callLater(self.openProjectFile.emit, file, add_to_recent_files) return # Either the file is a model file or we want to load only models from project. Continue to load models. @@ -1790,7 +1805,7 @@ class CuraApplication(QtApplication): if extension in self._non_sliceable_extensions: self.deleteAll(only_selectable = False) - job = ReadMeshJob(f) + job = ReadMeshJob(f, add_to_recent_files = add_to_recent_files) job.finished.connect(self._readMeshFinished) job.start() @@ -1905,6 +1920,11 @@ class CuraApplication(QtApplication): arrange(nodes_to_arrange, self.getBuildVolume(), fixed_nodes) except: Logger.logException("e", "Failed to arrange the models") + + # Ensure that we don't have any weird floaty objects (CURA-7855) + for node in nodes_to_arrange: + node.translate(Vector(0, -node.getBoundingBox().bottom, 0), SceneNode.TransformSpace.World) + self.fileCompleted.emit(file_name) def addNonSliceableExtension(self, extension): @@ -1921,7 +1941,7 @@ class CuraApplication(QtApplication): try: result = workspace_reader.preRead(file_path, show_dialog=False) return result == WorkspaceReader.PreReadResult.accepted - except Exception: + except: Logger.logException("e", "Could not check file %s", file_url) return False |