mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-12-11 16:00:47 -07:00
Revert "Merge pull request #5726 from Ultimaker/CL-1331_use_API_for_UM3NetworkPrinting"
This reverts commitbec7b6546d, reversing changes made to7094b222b1. The changes there were not accepted. Please see pull request https://github.com/Ultimaker/Cura/pull/5726 for the discussion about this. Conflicts: plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py -> Just in one TODO comment.
This commit is contained in:
Ghostkeeper
parent
288770b991
commit
4e361a068c
5 changed files with 86 additions and 177 deletions
|
|
@ -1,139 +0,0 @@
|
|||
# Copyright (c) 2019 Ultimaker B.V.
|
||||
# Cura is released under the terms of the LGPLv3 or higher.
|
||||
|
||||
from typing import Optional, Dict, List, TYPE_CHECKING, Any
|
||||
from PyQt5.QtCore import QObject, pyqtSignal, pyqtSlot, pyqtProperty
|
||||
from UM.i18n import i18nCatalog
|
||||
from UM.Logger import Logger
|
||||
if TYPE_CHECKING:
|
||||
from cura.CuraApplication import CuraApplication
|
||||
from cura.PrinterOutput.PrinterOutputDevice import PrinterOutputDevice
|
||||
|
||||
i18n_catalog = i18nCatalog("cura")
|
||||
|
||||
## The account API provides a version-proof bridge to use Ultimaker Accounts
|
||||
#
|
||||
# Usage:
|
||||
# ```
|
||||
# from cura.API import CuraAPI
|
||||
# api = CuraAPI()
|
||||
# api.machines.addOutputDeviceToCurrentMachine()
|
||||
# ```
|
||||
|
||||
## Since Cura doesn't have a machine class, we're going to make a fake one to make our lives a
|
||||
# little bit easier.
|
||||
class Machine():
|
||||
def __init__(self) -> None:
|
||||
self.hostname = "" # type: str
|
||||
self.group_id = "" # type: str
|
||||
self.group_name = "" # type: str
|
||||
self.um_network_key = "" # type: str
|
||||
self.configuration = {} # type: Dict[str, Any]
|
||||
self.connection_types = [] # type: List[int]
|
||||
|
||||
class Machines(QObject):
|
||||
|
||||
def __init__(self, application: "CuraApplication", parent = None) -> None:
|
||||
super().__init__(parent)
|
||||
self._application = application
|
||||
|
||||
@pyqtSlot(result="QVariantMap")
|
||||
def getCurrentMachine(self) -> Machine:
|
||||
fake_machine = Machine() # type: Machine
|
||||
global_stack = self._application.getGlobalContainerStack()
|
||||
if global_stack:
|
||||
metadata = global_stack.getMetaData()
|
||||
if "group_id" in metadata:
|
||||
fake_machine.group_id = global_stack.getMetaDataEntry("group_id")
|
||||
if "group_name" in metadata:
|
||||
fake_machine.group_name = global_stack.getMetaDataEntry("group_name")
|
||||
if "um_network_key" in metadata:
|
||||
fake_machine.um_network_key = global_stack.getMetaDataEntry("um_network_key")
|
||||
|
||||
fake_machine.connection_types = global_stack.configuredConnectionTypes
|
||||
|
||||
return fake_machine
|
||||
|
||||
## Set the current machine's friendy name.
|
||||
# This is the same as "group name" since we use "group" and "current machine" interchangeably.
|
||||
# TODO: Maybe make this "friendly name" to distinguish from "hostname"?
|
||||
@pyqtSlot(str)
|
||||
def setCurrentMachineGroupName(self, group_name: str) -> None:
|
||||
Logger.log("d", "Attempting to set the group name of the active machine to %s", group_name)
|
||||
global_stack = self._application.getGlobalContainerStack()
|
||||
if global_stack:
|
||||
# Update a GlobalStacks in the same group with the new group name.
|
||||
group_id = global_stack.getMetaDataEntry("group_id")
|
||||
machine_manager = self._application.getMachineManager()
|
||||
for machine in machine_manager.getMachinesInGroup(group_id):
|
||||
machine.setMetaDataEntry("group_name", group_name)
|
||||
|
||||
# Set the default value for "hidden", which is used when you have a group with multiple types of printers
|
||||
global_stack.setMetaDataEntry("hidden", False)
|
||||
|
||||
## Set the current machine's configuration from an (optional) output device.
|
||||
# If no output device is given, the first one available on the machine will be used.
|
||||
# NOTE: Group and machine are used interchangeably.
|
||||
# NOTE: This doesn't seem to be used anywhere. Maybe delete?
|
||||
@pyqtSlot(QObject)
|
||||
def updateCurrentMachineConfiguration(self, output_device: Optional["PrinterOutputDevice"]) -> None:
|
||||
|
||||
if output_device is None:
|
||||
machine_manager = self._application.getMachineManager()
|
||||
output_device = machine_manager.printerOutputDevices[0]
|
||||
|
||||
hotend_ids = output_device.hotendIds
|
||||
for index in range(len(hotend_ids)):
|
||||
output_device.hotendIdChanged.emit(index, hotend_ids[index])
|
||||
|
||||
material_ids = output_device.materialIds
|
||||
for index in range(len(material_ids)):
|
||||
output_device.materialIdChanged.emit(index, material_ids[index])
|
||||
|
||||
## Add an output device to the current machine.
|
||||
# In practice, this means:
|
||||
# - Setting the output device's network key in the current machine's metadata
|
||||
# - Adding the output device's connection type to the current machine's configured connection
|
||||
# types.
|
||||
# TODO: CHANGE TO HOSTNAME
|
||||
@pyqtSlot(QObject)
|
||||
def addOutputDeviceToCurrentMachine(self, output_device: "PrinterOutputDevice") -> None:
|
||||
if not output_device:
|
||||
return
|
||||
Logger.log("d",
|
||||
"Attempting to set the network key of the active machine to %s",
|
||||
output_device.key)
|
||||
global_stack = self._application.getGlobalContainerStack()
|
||||
if not global_stack:
|
||||
return
|
||||
metadata = global_stack.getMetaData()
|
||||
|
||||
# Global stack already had a connection, but it's changed.
|
||||
if "um_network_key" in metadata:
|
||||
old_network_key = metadata["um_network_key"]
|
||||
|
||||
# Since we might have a bunch of hidden stacks, we also need to change it there.
|
||||
metadata_filter = {"um_network_key": old_network_key}
|
||||
containers = self._application.getContainerRegistry().findContainerStacks(
|
||||
type = "machine", **metadata_filter)
|
||||
for container in containers:
|
||||
container.setMetaDataEntry("um_network_key", output_device.key)
|
||||
|
||||
# Delete old authentication data.
|
||||
Logger.log("d", "Removing old authentication id %s for device %s",
|
||||
global_stack.getMetaDataEntry("network_authentication_id", None),
|
||||
output_device.key)
|
||||
|
||||
container.removeMetaDataEntry("network_authentication_id")
|
||||
container.removeMetaDataEntry("network_authentication_key")
|
||||
|
||||
# Ensure that these containers do know that they are configured for the given
|
||||
# connection type (can be more than one type; e.g. LAN & Cloud)
|
||||
container.addConfiguredConnectionType(output_device.connectionType.value)
|
||||
|
||||
else: # Global stack didn't have a connection yet, configure it.
|
||||
global_stack.setMetaDataEntry("um_network_key", output_device.key)
|
||||
global_stack.addConfiguredConnectionType(output_device.connectionType.value)
|
||||
|
||||
return None
|
||||
|
||||
|
|
@ -6,7 +6,6 @@ from PyQt5.QtCore import QObject, pyqtProperty
|
|||
|
||||
from cura.API.Backups import Backups
|
||||
from cura.API.Interface import Interface
|
||||
from cura.API.Machines import Machines
|
||||
from cura.API.Account import Account
|
||||
|
||||
if TYPE_CHECKING:
|
||||
|
|
@ -45,9 +44,6 @@ class CuraAPI(QObject):
|
|||
# Backups API
|
||||
self._backups = Backups(self._application)
|
||||
|
||||
# Machines API
|
||||
self._machines = Machines(self._application)
|
||||
|
||||
# Interface API
|
||||
self._interface = Interface(self._application)
|
||||
|
||||
|
|
@ -62,10 +58,6 @@ class CuraAPI(QObject):
|
|||
def backups(self) -> "Backups":
|
||||
return self._backups
|
||||
|
||||
@pyqtProperty(QObject)
|
||||
def machines(self) -> "Machines":
|
||||
return self._machines
|
||||
|
||||
@property
|
||||
def interface(self) -> "Interface":
|
||||
return self._interface
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue