diff options
author | Diego Prado Gesto <d.pradogesto@ultimaker.com> | 2018-06-05 12:00:54 +0300 |
---|---|---|
committer | Diego Prado Gesto <d.pradogesto@ultimaker.com> | 2018-06-05 12:00:54 +0300 |
commit | 4af107dc815861e745ee5f024c7bec5c6de66890 (patch) | |
tree | 96418096d4158e3bcc7037ac9c55e2fd6ea025ed /cura | |
parent | 1285e1b5e5a3f44a4753ed33f1488f18fa48fa47 (diff) | |
parent | 96ddf61f81fef9be96b0e062a26d4d0cb48af3cf (diff) |
Merge branch '3.4' of github.com:Ultimaker/Cura into 3.4
Diffstat (limited to 'cura')
-rwxr-xr-x | cura/CuraApplication.py | 1 | ||||
-rw-r--r-- | cura/CuraPackageManager.py | 8 |
2 files changed, 7 insertions, 2 deletions
diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index e416196775..05070e4432 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -302,7 +302,6 @@ class CuraApplication(QtApplication): self._platform_activity = False self._scene_bounding_box = AxisAlignedBox.Null - self._job_name = None self._center_after_select = False self._camera_animation = None self._cura_actions = None diff --git a/cura/CuraPackageManager.py b/cura/CuraPackageManager.py index 09253a4c77..3d4a360c7e 100644 --- a/cura/CuraPackageManager.py +++ b/cura/CuraPackageManager.py @@ -133,7 +133,7 @@ class CuraPackageManager(QObject): return None - def getAllInstalledPackagesInfo(self) -> dict: + def getAllInstalledPackageIDs(self) -> set: # Add bundled, installed, and to-install packages to the set of installed package IDs all_installed_ids = set() @@ -146,6 +146,12 @@ class CuraPackageManager(QObject): if self._to_install_package_dict.keys(): all_installed_ids = all_installed_ids.union(set(self._to_install_package_dict.keys())) + return all_installed_ids + + def getAllInstalledPackagesInfo(self) -> dict: + + all_installed_ids = self.getAllInstalledPackageIDs() + # map of <package_type> -> <package_id> -> <package_info> installed_packages_dict = {} for package_id in all_installed_ids: |