3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-11 08:47:50 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

CURA-4870 Add name of the group and hidden property to the network

Browse source 
printers. The printer menu shows the printers grouped by group and the
hidden printers are never listed.
This commit is contained in:
Diego Prado Gesto 2018-03-09 12:42:49 +01:00
parent 4be4d08d97
commit 260cad36cb
4 changed files with 34 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cura/Settings/MachineManager.py
View file

@ -496,6 +496,12 @@ class MachineManager(QObject):
return self._global_container_stack.getMetaDataEntry("um_network_key")
return ""
@pyqtProperty(str, notify = globalContainerChanged)
def activeMachineNetworkGroupName(self) -> str:
if self._global_container_stack:
return self._global_container_stack.getMetaDataEntry("connect_group_name")
return ""
@pyqtProperty(QObject, notify = globalContainerChanged)
def activeMachine(self) -> Optional["GlobalStack"]:
return self._global_container_stack
@ -1070,8 +1076,10 @@ class MachineManager(QObject):
new_machine = self.getMachine(machine_definition_id, metadata_filter = {"um_network_key": self.activeMachineNetworkKey})
# If there is no machine, then create a new one
if not new_machine:
new_machine = CuraStackBuilder.createMachine(machine_definition_id + "_instance", machine_definition_id)
new_machine = CuraStackBuilder.createMachine(machine_definition_id + "_sync", machine_definition_id)
new_machine.addMetaDataEntry("um_network_key", self.activeMachineNetworkKey)
new_machine.addMetaDataEntry("connect_group_name", self.activeMachineNetworkGroupName)
new_machine.addMetaDataEntry("hidden", True)
else:
Logger.log("i", "Found a %s with the key %s. Let's use it!", machine_name, self.activeMachineNetworkKey)

18
plugins/UM3NetworkPrinting/DiscoverUM3Action.py
View file

@ -97,6 +97,23 @@ class DiscoverUM3Action(MachineAction):
else:
return []
@pyqtSlot(str)
def setGroupName(self, group_name):
Logger.log("d", "Attempting to set the group name of the active machine to %s", group_name)
global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack:
meta_data = global_container_stack.getMetaData()
if "connect_group_name" in meta_data:
global_container_stack.setMetaDataEntry("connect_group_name", group_name)
# TODO Find all the places where there is the same group name and change it accordingly
else:
global_container_stack.addMetaDataEntry("connect_group_name", group_name)
global_container_stack.addMetaDataEntry("hidden", False)
if self._network_plugin:
# Ensure that the connection states are refreshed.
self._network_plugin.reCheckConnections()
@pyqtSlot(str)
def setKey(self, key):
Logger.log("d", "Attempting to set the network key of the active machine to %s", key)
@ -109,6 +126,7 @@ class DiscoverUM3Action(MachineAction):
Logger.log("d", "Removing old authentication id %s for device %s", global_container_stack.getMetaDataEntry("network_authentication_id", None), key)
global_container_stack.removeMetaDataEntry("network_authentication_id")
global_container_stack.removeMetaDataEntry("network_authentication_key")
# TODO Find all the places where there is the same key and change it accordingly
else:
global_container_stack.addMetaDataEntry("um_network_key", key)

6
plugins/UM3NetworkPrinting/DiscoverUM3Action.qml
View file

@ -32,10 +32,12 @@ Cura.MachineAction
if(base.selectedDevice && base.completeProperties)
{
var printerKey = base.selectedDevice.key
var printerName = base.selectedDevice.name // TODO To change when the groups have a name
if(manager.getStoredKey() != printerKey)
{
manager.setKey(printerKey);
completed();
manager.setKey(printerKey)
manager.setGroupName(printerName) // TODO To change when the groups have a name
completed()
}
}
}

6
resources/qml/Menus/NetworkPrinterMenu.qml
View file

@ -9,14 +9,14 @@ import Cura 1.0 as Cura
Instantiator {
model: UM.ContainerStacksModel {
filter: {"type": "machine", "um_network_key": "*"}
filter: {"type": "machine", "um_network_key": "*", "hidden": "False"}
}
MenuItem {
// TODO: Use printer_group icon when it's a cluster. Not use it for now since it doesn't look as expected
// iconSource: UM.Theme.getIcon("printer_single")
text: model.name;
text: model.metadata["connect_group_name"]
checkable: true;
checked: Cura.MachineManager.activeMachineId == model.id
checked: Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
exclusiveGroup: group;
onTriggered: Cura.MachineManager.setActiveMachine(model.id);
}