Select the UM3 that we are connected to if it is in the list

CURA-2035
This commit is contained in:
fieldOfView 2016-08-09 15:54:20 +02:00
parent 7e8eb2044a
commit 7011520845
2 changed files with 23 additions and 0 deletions

View file

@ -55,3 +55,13 @@ class DiscoverUM3Action(MachineAction):
if self._network_plugin: if self._network_plugin:
# Ensure that the connection states are refreshed. # Ensure that the connection states are refreshed.
self._network_plugin.reCheckConnections() self._network_plugin.reCheckConnections()
@pyqtSlot(result = str)
def getStoredKey(self):
global_container_stack = Application.getInstance().getGlobalContainerStack()
if global_container_stack:
meta_data = global_container_stack.getMetaData()
if "um_network_key" in meta_data:
return global_container_stack.getMetaDataEntry("um_network_key")
return ""

View file

@ -97,6 +97,18 @@ Cura.MachineAction
{ {
id: listview id: listview
model: manager.foundDevices model: manager.foundDevices
onModelChanged:
{
var selectedKey = manager.getStoredKey();
for(var i = 0; i < model.length; i++) {
if(model[i].getKey() == selectedKey)
{
currentIndex = i;
return
}
}
currentIndex = -1;
}
width: parent.width width: parent.width
currentIndex: -1 currentIndex: -1
onCurrentIndexChanged: base.selectedPrinter = listview.model[currentIndex] onCurrentIndexChanged: base.selectedPrinter = listview.model[currentIndex]
@ -134,6 +146,7 @@ Cura.MachineAction
{ {
width: parent.width * 0.5 width: parent.width * 0.5
visible: base.selectedPrinter visible: base.selectedPrinter
spacing: UM.Theme.getSize("default_margin").height
Label Label
{ {
width: parent.width width: parent.width