From fe1402462015421f82011ce6ac6735fb522268d6 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 5 Apr 2019 17:49:29 +0200 Subject: [PATCH] Move existNetworkInstances into discover action --- cura/Settings/MachineManager.py | 7 ------- plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 267baf085f..736cb06d49 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -1455,13 +1455,6 @@ class MachineManager(QObject): if self.hasUserSettings and self._application.getPreferences().getValue("cura/active_mode") == 1: self._application.discardOrKeepProfileChanges() - - ## This method checks if there is an instance connected to the given network_key - def existNetworkInstances(self, network_key: str) -> bool: - metadata_filter = {"um_network_key": network_key} - containers = CuraContainerRegistry.getInstance().findContainerStacks(type = "machine", **metadata_filter) - return bool(containers) - @pyqtSlot("QVariant") def setGlobalVariant(self, container_node: "ContainerNode") -> None: self.blurSettings.emit() diff --git a/plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py b/plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py index 0f2106bc9c..28e7b60a0e 100644 --- a/plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py +++ b/plugins/UM3NetworkPrinting/src/DiscoverUM3Action.py @@ -157,7 +157,9 @@ class DiscoverUM3Action(MachineAction): @pyqtSlot(str, result = bool) def existsKey(self, key: str) -> bool: - return CuraApplication.getInstance().getMachineManager().existNetworkInstances(network_key = key) + metadata_filter = {"um_network_key": key} + containers = CuraContainerRegistry.getInstance().findContainerStacks(type="machine", **metadata_filter) + return bool(containers) @pyqtSlot() def loadConfigurationFromPrinter(self) -> None: