3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Removed some more cases where data was duplicated and re-used for different purposes

Browse source 
CURA-6006
This commit is contained in:
Jaime van Kessel 2018-12-05 14:09:55 +01:00
parent a52f866f81
commit d6630b6881
1 changed files with 5 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

14
plugins/Toolbox/src/Toolbox.py
View file

@ -69,16 +69,14 @@ class Toolbox(QObject, Extension):
# The responses as given by the server parsed to a list. # The responses as given by the server parsed to a list.
self._server_response_data = { self._server_response_data = {
"authors": [], "authors": [],
"packages": [], "packages": []
"plugins_installed": [],
"materials_installed": []
} # type: Dict[str, List[Any]] } # type: Dict[str, List[Any]]
# Models: # Models:
self._models = { self._models = {
"authors": AuthorsModel(self), "authors": AuthorsModel(self),
"packages": PackagesModel(self), "packages": PackagesModel(self),
} # type: Dict[str, ListModel] } # type: Dict[str, Union[AuthorsModel, PackagesModel]]
self._plugins_showcase_model = PackagesModel(self) self._plugins_showcase_model = PackagesModel(self)
self._plugins_available_model = PackagesModel(self) self._plugins_available_model = PackagesModel(self)
@ -305,11 +303,9 @@ class Toolbox(QObject, Extension):
if plugin_id not in all_plugin_package_ids) if plugin_id not in all_plugin_package_ids)
self._old_plugin_metadata = {k: v for k, v in self._old_plugin_metadata.items() if k in self._old_plugin_ids} self._old_plugin_metadata = {k: v for k, v in self._old_plugin_metadata.items() if k in self._old_plugin_ids}
self._server_response_data["plugins_installed"] = all_packages["plugin"] + list(self._old_plugin_metadata.values()) self._plugins_installed_model.setMetadata(all_packages["plugin"] + list(self._old_plugin_metadata.values()))
self._plugins_installed_model.setMetadata(self._server_response_data["plugins_installed"])
self.metadataChanged.emit() self.metadataChanged.emit()
if "material" in all_packages: if "material" in all_packages:
self._server_response_data["materials_installed"] = all_packages["material"]
self._materials_installed_model.setMetadata(all_packages["material"]) self._materials_installed_model.setMetadata(all_packages["material"])
self.metadataChanged.emit() self.metadataChanged.emit()
@ -527,8 +523,8 @@ class Toolbox(QObject, Extension):
@pyqtSlot(str, result = int) @pyqtSlot(str, result = int)
def getNumberOfInstalledPackagesByAuthor(self, author_id: str) -> int: def getNumberOfInstalledPackagesByAuthor(self, author_id: str) -> int:
count = 0 count = 0
for package in self._server_response_data["materials_installed"]: for package in self._materials_installed_model.items:
if package["author"]["author_id"] == author_id: if package["author_id"] == author_id:
count += 1 count += 1
return count return count