3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-11-23 02:41:01 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Progress is now shown for LegacyPrinter while printing

Browse source 
CL-541
This commit is contained in:
Jaime van Kessel 2017-11-24 09:22:50 +01:00
parent 4597bb09ed
commit c523a6ddf6
5 changed files with 64 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

1
plugins/UM3NetworkPrinting/LegacyUM3OutputDevice.py
View file

@ -568,6 +568,7 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice):
if not self._printers:
self._printers = [PrinterOutputModel(output_controller=None, number_of_extruders=self._number_of_extruders)]
self.printersChanged.emit()
# LegacyUM3 always has a single printer.
printer = self._printers[0]

8
plugins/UM3NetworkPrinting/UM3InfoComponents.qml
View file

@ -13,7 +13,7 @@ Item
property bool isUM3: Cura.MachineManager.activeQualityDefinitionId == "ultimaker3"
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
property bool authenticationRequested: printerConnected && Cura.MachineManager.printerOutputDevices[0].authenticationState == 2 // AuthState.AuthenticationRequested
property bool authenticationRequested: printerConnected && (Cura.MachineManager.printerOutputDevices[0].authenticationState == 2 || Cura.MachineManager.printerOutputDevices[0].authenticationState == 5) // AuthState.AuthenticationRequested or AuthenticationReceived.
Row
{
@ -119,7 +119,9 @@ Item
onClicked: manager.loadConfigurationFromPrinter()
function isClusterPrinter() {
if(Cura.MachineManager.printerOutputDevices.length == 0)
return false
//TODO: Hardcoded this for the moment now. These info components might also need to move.
/*if(Cura.MachineManager.printerOutputDevices.length == 0)
{
return false;
}
@ -129,7 +131,7 @@ Item
{
return false;
}
return true;
return true;*/
}
}
}

1
plugins/UM3NetworkPrinting/UM3OutputDevicePlugin.py
View file

@ -84,7 +84,6 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
def _onDeviceConnectionStateChanged(self, key):
if key not in self._discovered_devices:
return
print("STATE CHANGED", key)
if self._discovered_devices[key].isConnected():
self.getOutputDeviceManager().addOutputDevice(self._discovered_devices[key])
else: