Refactored most of the code into separate functions

CURA-7038
This commit is contained in:
Dimitriovski 2019-12-23 16:58:44 +01:00
parent bd8c1e4c96
commit 4375118a9f
No known key found for this signature in database
GPG key ID: 4E62757E2B0D304D
2 changed files with 44 additions and 112 deletions

View file

@ -1,17 +1,9 @@
# Copyright (c) 2018 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import re
from typing import Dict
from PyQt5.QtCore import Qt
from PyQt5.QtCore import Qt, pyqtProperty
from UM.Logger import Logger
from UM.Qt.ListModel import ListModel
from .ConfigsModel import ConfigsModel
from UM.PluginRegistry import PluginRegistry
## Model that holds Cura packages. By setting the filter property the instances held by this model can be changed.
@ -19,32 +11,10 @@ class SubscribedPackagesModel(ListModel):
def __init__(self, parent = None):
super().__init__(parent)
self.addRoleName(Qt.UserRole + 1, "name")
self.addRoleName(Qt.UserRole + 2, "icon_url")
self.addRoleName(Qt.UserRole + 3, "is_compatible")
def update(self):
# items1 = []
# items2 = []
toolbox = PluginRegistry.getInstance().getPluginObject("Toolbox")
# print("Compatible: {}".format(toolbox.subscribed_compatible_packages))
# print("Incompatible: {}".format(toolbox.subscribed_incompatible_packages))
# for incompatible in toolbox.subscribed_incompatible_packages:
# items1.append({
# "name": incompatible.package_id,
# "icon_url": incompatible.icon_url
# })
#
# for compatible in toolbox.subscribed_compatible_packages:
# items2.append({
# "name": compatible.package_id,
# "icon_url": compatible.icon_url
# })
print("self.subscribed_packages: {}".format(toolbox.subscribed_packages))
# final_list = items1 + items2
self.setItems(toolbox.subscribed_packages)
# self.setItems(final_list)