diff options
author | Nino van Hooff <ninovanhooff@gmail.com> | 2020-04-03 16:31:08 +0300 |
---|---|---|
committer | Nino van Hooff <ninovanhooff@gmail.com> | 2020-04-03 16:31:08 +0300 |
commit | 4f55c8d832fbeb4246d30c23e19a092897310c5c (patch) | |
tree | 1165416a71571cb8e4600c0c747ce57e36922f86 | |
parent | 3e46489b6ba3ae0baab347b26ceb036c1a47007d (diff) |
Revert "Merge pull request #7384 from Ultimaker/CURA-7333_Fix_reloading_3mf_files_with_many_objects"
This reverts commit 3e46489b6ba3ae0baab347b26ceb036c1a47007d, reversing
changes made to f5669a5a277042266f9b92314948a5cfb75f58ea.
-rwxr-xr-x | cura/CuraApplication.py | 51 | ||||
-rwxr-xr-x | plugins/3MFReader/ThreeMFReader.py | 11 |
2 files changed, 18 insertions, 44 deletions
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e6eb999e7a..e893e3d8f5 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -2,10 +2,9 @@ # Cura is released under the terms of the LGPLv3 or higher. import os -import re import sys import time -from typing import cast, TYPE_CHECKING, Optional, Callable, List, Any, Dict +from typing import cast, TYPE_CHECKING, Optional, Callable, List, Any import numpy from PyQt5.QtCore import QObject, QTimer, QUrl, pyqtSignal, pyqtProperty, QEvent, Q_ENUMS @@ -1383,29 +1382,22 @@ class CuraApplication(QtApplication): if not nodes: return - objects_in_filename = {} # type: Dict[str, List[CuraSceneNode]] for node in nodes: mesh_data = node.getMeshData() + if mesh_data: file_name = mesh_data.getFileName() if file_name: - if file_name not in objects_in_filename: - objects_in_filename[file_name] = [] - if file_name in objects_in_filename: - objects_in_filename[file_name].append(node) + job = ReadMeshJob(file_name) + job._node = node # type: ignore + job.finished.connect(self._reloadMeshFinished) + if has_merged_nodes: + job.finished.connect(self.updateOriginOfMergedMeshes) + + job.start() else: Logger.log("w", "Unable to reload data because we don't have a filename.") - for file_name, nodes in objects_in_filename.items(): - for node in nodes: - job = ReadMeshJob(file_name) - job._node = node # type: ignore - job.finished.connect(self._reloadMeshFinished) - if has_merged_nodes: - job.finished.connect(self.updateOriginOfMergedMeshes) - - job.start() - @pyqtSlot("QStringList") def setExpandedCategories(self, categories: List[str]) -> None: categories = list(set(categories)) @@ -1580,30 +1572,13 @@ class CuraApplication(QtApplication): fileLoaded = pyqtSignal(str) fileCompleted = pyqtSignal(str) - def _reloadMeshFinished(self, job) -> None: - """ - Function called whenever a ReadMeshJob finishes in the background. It reloads a specific node object in the - scene from its source file. The function gets all the nodes that exist in the file through the job result, and - then finds the scene node that it wants to refresh by its object id. Each job refreshes only one node. - - :param job: The ReadMeshJob running in the background that reads all the meshes in a file - :return: None - """ - job_result = job.getResult() # nodes that exist inside the file read by this job + def _reloadMeshFinished(self, job): + # TODO; This needs to be fixed properly. We now make the assumption that we only load a single mesh! + job_result = job.getResult() if len(job_result) == 0: Logger.log("e", "Reloading the mesh failed.") return - object_found = False - mesh_data = None - # Find the node to be refreshed based on its id - for job_result_node in job_result: - if job_result_node.getId() == job._node.getId(): - mesh_data = job_result_node.getMeshData() - object_found = True - break - if not object_found: - Logger.warning("The object with id {} no longer exists! Keeping the old version in the scene.".format(job_result_node.getId())) - return + mesh_data = job_result[0].getMeshData() if not mesh_data: Logger.log("w", "Could not find a mesh in reloaded node.") return diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index a368cedd75..670049802d 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -52,6 +52,7 @@ class ThreeMFReader(MeshReader): self._root = None self._base_name = "" self._unit = None + self._object_count = 0 # Used to name objects as there is no node name yet. def _createMatrixFromTransformationString(self, transformation: str) -> Matrix: if transformation == "": @@ -86,20 +87,17 @@ class ThreeMFReader(MeshReader): ## Convenience function that converts a SceneNode object (as obtained from libSavitar) to a scene node. # \returns Scene node. def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]: + self._object_count += 1 + node_name = savitar_node.getName() - node_id = savitar_node.getId() if node_name == "": - if file_name != "": - node_name = os.path.basename(file_name) - else: - node_name = "Object {}".format(node_id) + node_name = "Object %s" % self._object_count active_build_plate = CuraApplication.getInstance().getMultiBuildPlateModel().activeBuildPlate um_node = CuraSceneNode() # This adds a SettingOverrideDecorator um_node.addDecorator(BuildPlateDecorator(active_build_plate)) um_node.setName(node_name) - um_node.setId(node_id) transformation = self._createMatrixFromTransformationString(savitar_node.getTransformation()) um_node.setTransformation(transformation) mesh_builder = MeshBuilder() @@ -171,6 +169,7 @@ class ThreeMFReader(MeshReader): def _read(self, file_name: str) -> Union[SceneNode, List[SceneNode]]: result = [] + self._object_count = 0 # Used to name objects as there is no node name yet. # The base object of 3mf is a zipped archive. try: archive = zipfile.ZipFile(file_name, "r") |