diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py
index e5286e7032..060df10559 100755
--- a/cura/Settings/MachineManager.py
+++ b/cura/Settings/MachineManager.py
@@ -22,6 +22,7 @@ from UM.Settings.SettingFunction import SettingFunction
from UM.Signal import postponeSignals, CompressTechnique
import cura.CuraApplication # Imported like this to prevent circular references.
+from UM.Util import parseBool
from cura.Machines.ContainerNode import ContainerNode
from cura.Machines.ContainerTree import ContainerTree
@@ -490,6 +491,10 @@ class MachineManager(QObject):
def activeMachineIsGroup(self) -> bool:
return bool(self._printer_output_devices) and len(self._printer_output_devices[0].printers) > 1
+ @pyqtProperty(bool, notify = printerConnectedStatusChanged)
+ def activeMachineIsLinkedToCurrentAccount(self) -> bool:
+ return parseBool(self.activeMachine.getMetaDataEntry("linked_to_account", "True"))
+
@pyqtProperty(bool, notify = printerConnectedStatusChanged)
def activeMachineHasNetworkConnection(self) -> bool:
# A network connection is only available if any output device is actually a network connected device.
diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
index 30c26a2c24..fcec33415a 100644
--- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
+++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDeviceManager.py
@@ -1,7 +1,7 @@
# Copyright (c) 2019 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
import os
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Set
from PyQt5.QtCore import QTimer
from PyQt5.QtNetwork import QNetworkReply
@@ -11,6 +11,7 @@ from UM.Logger import Logger # To log errors talking to the API.
from UM.Message import Message
from UM.Settings.Interfaces import ContainerInterface
from UM.Signal import Signal
+from UM.Util import parseBool
from cura.API import Account
from cura.API.Account import SyncState
from cura.CuraApplication import CuraApplication
@@ -31,6 +32,7 @@ class CloudOutputDeviceManager:
META_CLUSTER_ID = "um_cloud_cluster_id"
META_NETWORK_KEY = "um_network_key"
SYNC_SERVICE_NAME = "CloudOutputDeviceManager"
+ META_LINKED_TO_ACCOUNT = "linked_to_account"
# The translation catalog for this device.
I18N_CATALOG = i18nCatalog("cura")
@@ -41,6 +43,10 @@ class CloudOutputDeviceManager:
def __init__(self) -> None:
# Persistent dict containing the remote clusters for the authenticated user.
self._remote_clusters = {} # type: Dict[str, CloudOutputDevice]
+
+ # Dictionary containing all the cloud printers loaded in Cura
+ self._um_cloud_printers = {} # type: Dict[str, GlobalStack]
+
self._account = CuraApplication.getInstance().getCuraAPI().account # type: Account
self._api = CloudApiClient(CuraApplication.getInstance(), on_error = lambda error: Logger.log("e", str(error)))
self._account.loginStateChanged.connect(self._onLoginStateChanged)
@@ -98,23 +104,36 @@ class CloudOutputDeviceManager:
def _onGetRemoteClustersFinished(self, clusters: List[CloudClusterResponse]) -> None:
"""Callback for when the request for getting the clusters is finished."""
+ self._um_cloud_printers = {m.getMetaDataEntry(self.META_CLUSTER_ID): m for m in
+ CuraApplication.getInstance().getContainerRegistry().findContainerStacks(
+ type = "machine") if m.getMetaDataEntry(self.META_CLUSTER_ID, None)}
new_clusters = []
all_clusters = {c.cluster_id: c for c in clusters} # type: Dict[str, CloudClusterResponse]
online_clusters = {c.cluster_id: c for c in clusters if c.is_online} # type: Dict[str, CloudClusterResponse]
+ # Add the new printers in Cura. If a printer was previously added and is rediscovered, set its metadata to
+ # reflect that and mark the printer not removed from the account
for device_id, cluster_data in all_clusters.items():
if device_id not in self._remote_clusters:
new_clusters.append(cluster_data)
-
+ if device_id in self._um_cloud_printers and not parseBool(self._um_cloud_printers[device_id].getMetaDataEntry(self.META_LINKED_TO_ACCOUNT, "true")):
+ self._um_cloud_printers[device_id].setMetaDataEntry(self.META_LINKED_TO_ACCOUNT, True)
self._onDevicesDiscovered(new_clusters)
- removed_device_keys = set(self._remote_clusters.keys()) - set(online_clusters.keys())
- for device_id in removed_device_keys:
+ # Remove the CloudOutput device for offline printers
+ offline_device_keys = set(self._remote_clusters.keys()) - set(online_clusters.keys())
+ for device_id in offline_device_keys:
self._onDiscoveredDeviceRemoved(device_id)
- if new_clusters or removed_device_keys:
- self.discoveredDevicesChanged.emit()
+ # Handle devices that were previously added in Cura but do not exist in the account anymore (i.e. they were
+ # removed from the account)
+ removed_device_keys = set(self._um_cloud_printers.keys()) - set(all_clusters.keys())
if removed_device_keys:
+ self._devicesRemovedFromAccount(removed_device_keys)
+
+ if new_clusters or offline_device_keys or removed_device_keys:
+ self.discoveredDevicesChanged.emit()
+ if offline_device_keys:
# If the removed device was active we should connect to the new active device
self._connectToActiveMachine()
@@ -144,10 +163,13 @@ class CloudOutputDeviceManager:
if machine_manager.getMachine(device.printerType, {self.META_CLUSTER_ID: device.key}) is None \
and machine_manager.getMachine(device.printerType, {self.META_NETWORK_KEY: cluster_data.host_name + "*"}) is None: # The host name is part of the network key.
new_devices.append(device)
-
elif device.getId() not in self._remote_clusters:
self._remote_clusters[device.getId()] = device
remote_clusters_added = True
+ # If a printer that was removed from the account is re-added, change its metadata to mark it not removed
+ # from the account
+ elif not parseBool(self._um_cloud_printers[device.key].getMetaDataEntry(self.META_LINKED_TO_ACCOUNT, "true")):
+ self._um_cloud_printers[device.key].setMetaDataEntry(self.META_LINKED_TO_ACCOUNT, True)
# Inform the Cloud printers model about new devices.
new_devices_list_of_dicts = [{
@@ -204,19 +226,91 @@ class CloudOutputDeviceManager:
max_disp_devices = 3
if len(new_devices) > max_disp_devices:
num_hidden = len(new_devices) - max_disp_devices + 1
- device_name_list = ["- {} ({})".format(device.name, device.printerTypeName) for device in new_devices[0:num_hidden]]
- device_name_list.append(self.I18N_CATALOG.i18nc("info:hidden list items", "- and {} others", num_hidden))
+ device_name_list = ["{} ({})".format(device.name, device.printerTypeName) for device in new_devices[0:num_hidden]]
+ device_name_list.append(self.I18N_CATALOG.i18nc("info:hidden list items", "... and {} others", num_hidden))
device_names = "\n".join(device_name_list)
else:
- device_names = "\n".join(["- {} ({})".format(device.name, device.printerTypeName) for device in new_devices])
+ device_names = "\n".join(["{} ({})".format(device.name, device.printerTypeName) for device in new_devices])
message_text = self.I18N_CATALOG.i18nc(
"info:status",
- "Cloud printers added from your account:\n{}",
+ "Cloud printers added from your account:\n",
device_names
)
message.setText(message_text)
+ def _devicesRemovedFromAccount(self, removed_device_ids: Set[str]) -> None:
+ """
+ Removes the CloudOutputDevice from the received device ids and marks the specific printers as "removed from
+ account". In addition, it generates a message to inform the user about the printers that are no longer linked to
+ his/her account. The message is not generated if all the printers have been previously reported as not linked
+ to the account.
+
+ :param removed_device_ids: Set of device ids, whose CloudOutputDevice needs to be removed
+ :return: None
+ """
+
+ if not CuraApplication.getInstance().getCuraAPI().account.isLoggedIn:
+ return
+
+ # Do not report device ids which have been previously marked as non-linked to the account
+ ignored_device_ids = set()
+ for device_id in removed_device_ids:
+ if not parseBool(self._um_cloud_printers[device_id].getMetaDataEntry(self.META_LINKED_TO_ACCOUNT, "true")):
+ ignored_device_ids.add(device_id)
+ # Keep the reported_device_ids list in a class variable, so that the message button actions can access it and
+ # take the necessary steps to fulfill their purpose.
+ self.reported_device_ids = removed_device_ids - ignored_device_ids
+ if len(self.reported_device_ids) == 0:
+ return
+
+ # Generate message
+ removed_printers_message = Message(
+ title = self.I18N_CATALOG.i18ncp(
+ "info:status",
+ "Cloud connection is not available for a printer",
+ "Cloud connection is not available for some printers",
+ len(self.reported_device_ids)
+ ),
+ lifetime = 0
+ )
+ device_names = "\n".join(["{} ({})".format(self._um_cloud_printers[device].name, self._um_cloud_printers[device].definition.name) for device in self.reported_device_ids])
+ message_text = self.I18N_CATALOG.i18ncp(
+ "info:status",
+ "The following cloud printer is not linked to your account:\n",
+ "The following cloud printers are not linked to your account:\n",
+ len(self.reported_device_ids)
+ )
+ message_text += self.I18N_CATALOG.i18nc(
+ "info:status",
+ "\nTo establish a connection, please visit the "
+ "Ultimaker Digital Factory.",
+ device_names
+ )
+ removed_printers_message.setText(message_text)
+ removed_printers_message.addAction("keep_printer_configurations_action",
+ name = self.I18N_CATALOG.i18nc("@action:button", "Keep printer configurations"),
+ icon = "",
+ description = "Keep the configuration of the cloud printer(s) synced with Cura which are not linked to your account.",
+ button_align = Message.ActionButtonAlignment.ALIGN_RIGHT)
+ removed_printers_message.actionTriggered.connect(self._onRemovedPrintersMessageActionTriggered)
+
+ # Remove the output device from the printers
+ for device_id in removed_device_ids:
+ device = self._um_cloud_printers.get(device_id, None) # type: Optional[GlobalStack]
+ if not device:
+ continue
+ output_device_manager = CuraApplication.getInstance().getOutputDeviceManager()
+ if device_id in output_device_manager.getOutputDeviceIds():
+ output_device_manager.removeOutputDevice(device_id)
+ if device_id in self._remote_clusters:
+ del self._remote_clusters[device_id]
+
+ # Update the printer's metadata to mark it as not linked to the account
+ device.setMetaDataEntry(self.META_LINKED_TO_ACCOUNT, False)
+
+ removed_printers_message.show()
+
def _onDiscoveredDeviceRemoved(self, device_id: str) -> None:
device = self._remote_clusters.pop(device_id, None) # type: Optional[CloudOutputDevice]
if not device:
@@ -301,3 +395,8 @@ class CloudOutputDeviceManager:
container_cluster_id = container.getMetaDataEntry(self.META_CLUSTER_ID, None)
if container_cluster_id in self._remote_clusters.keys():
del self._remote_clusters[container_cluster_id]
+
+ @staticmethod
+ def _onRemovedPrintersMessageActionTriggered(removed_printers_message: Message, action: str) -> None:
+ if action == "keep_printer_configurations_action":
+ removed_printers_message.hide()
diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 56a3d858ec..0907767eea 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -35,14 +35,21 @@ Cura.ExpandablePopup
}
}
- readonly property string connectionStatusMessage: {
+ function getConnectionStatusMessage() {
if (connectionStatus == "printer_cloud_not_available")
{
if(Cura.API.connectionStatus.isInternetReachable)
{
if (Cura.API.account.isLoggedIn)
{
- return catalog.i18nc("@status", "The cloud printer is offline. Please check if the printer is turned on and connected to the internet.")
+ if (Cura.MachineManager.activeMachineIsLinkedToCurrentAccount)
+ {
+ return catalog.i18nc("@status", "The cloud printer is offline. Please check if the printer is turned on and connected to the internet.")
+ }
+ else
+ {
+ return catalog.i18nc("@status", "This printer is not linked to your account. Please visit the Ultimaker Digital Factory to establish a connection.")
+ }
}
else
{
@@ -139,12 +146,13 @@ Cura.ExpandablePopup
{
id: connectionStatusTooltipHoverArea
anchors.fill: parent
- hoverEnabled: connectionStatusMessage !== ""
+ hoverEnabled: getConnectionStatusMessage() !== ""
acceptedButtons: Qt.NoButton // react to hover only, don't steal clicks
onEntered:
{
machineSelector.mouseArea.entered() // we want both this and the outer area to be entered
+ tooltip.tooltipText = getConnectionStatusMessage()
tooltip.show()
}
onExited: { tooltip.hide() }
@@ -155,7 +163,7 @@ Cura.ExpandablePopup
id: tooltip
width: 250 * screenScaleFactor
- tooltipText: connectionStatusMessage
+ tooltipText: getConnectionStatusMessage()
arrowSize: UM.Theme.getSize("button_tooltip_arrow").width
x: connectionStatusImage.x - UM.Theme.getSize("narrow_margin").width
y: connectionStatusImage.y + connectionStatusImage.height + UM.Theme.getSize("narrow_margin").height