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

Add-by-IP onboarding: Create (and set active) new device. [CURA-6294]

Browse source
This commit is contained in:
Remco Burema 2019-03-13 17:36:03 +01:00
parent bb17ab14da
commit b12b6892ca
2 changed files with 15 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

3
plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py
View file

@ -301,7 +301,8 @@ class UM3OutputDevicePlugin(OutputDevicePlugin):
self._onRemoveDevice(instance_name) self._onRemoveDevice(instance_name)
self._onAddDevice(instance_name, address, properties) self._onAddDevice(instance_name, address, properties)
if device: if device and address in self._manual_instances:
self.getOutputDeviceManager().addOutputDevice(device)
self.addManualDeviceSignal.emit(self.getPluginId(), device.getId(), address, properties) self.addManualDeviceSignal.emit(self.getPluginId(), device.getId(), address, properties)
def _onRemoveDevice(self, device_id): def _onRemoveDevice(self, device_id):

63
resources/qml/WelcomePages/AddPrinterByIpContent.qml
View file

@ -22,47 +22,6 @@ Item
property bool hasSentRequest: false property bool hasSentRequest: false
property bool haveConnection: false property bool haveConnection: false
Timer
{
id: tempTimerButton
interval: 1200
running: false
repeat: false
onTriggered:
{
hasPushedAdd = true
tempTimerRequest.running = true
}
}
// TODO: Remove timers after review interface!
Timer
{
id: tempTimerRequest
interval: 1200
running: false
repeat: false
onTriggered:
{
hasSentRequest = true
tempTimerConnection.running = true
}
}
// TODO: Remove timers after review interface!
Timer
{
id: tempTimerConnection
interval: 1200
running: false
repeat: false
onTriggered: haveConnection = true
}
// TODO: Remove timers after review interface!
Label Label
{ {
id: titleLabel id: titleLabel
@ -141,14 +100,9 @@ Item
text: catalog.i18nc("@button", "Add") text: catalog.i18nc("@button", "Add")
onClicked: onClicked:
{ {
// TEMP: Simulate successfull connection to printer with 127.0.0.1 or unsuccessful with anything else
// TODO, alter after review interface, now it just starts the timers.
if (hostnameField.text.trim() != "") if (hostnameField.text.trim() != "")
{ {
addPrinterByIpScreen.hasPushedAdd = true addPrinterByIpScreen.hasPushedAdd = true
tempTimerRequest.running = true
UM.OutputDeviceManager.addManualDevice(hostnameField.text, hostnameField.text) UM.OutputDeviceManager.addManualDevice(hostnameField.text, hostnameField.text)
} }
} }
@ -203,13 +157,13 @@ Item
columns: 2 columns: 2
columnSpacing: 20 columnSpacing: 20
Text { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Type") } Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Type") }
Label { id: typeText; font: UM.Theme.getFont("default"); text: "?" } Label { id: typeText; font: UM.Theme.getFont("default"); text: "?" }
Text { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Firmware version") } Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Firmware version") }
Label { id: firmwareText; font: UM.Theme.getFont("default"); text: "0.0.0.0" } Label { id: firmwareText; font: UM.Theme.getFont("default"); text: "0.0.0.0" }
Text { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Address") } Label { font: UM.Theme.getFont("default"); text: catalog.i18nc("@label", "Address") }
Label { id: addressText; font: UM.Theme.getFont("default"); text: "0.0.0.0" } Label { id: addressText; font: UM.Theme.getFont("default"); text: "0.0.0.0" }
Connections Connections
@ -230,6 +184,7 @@ Item
onManualDeviceChanged: onManualDeviceChanged:
{ {
printerNameLabel.text = UM.OutputDeviceManager.manualDeviceProperty("name") printerNameLabel.text = UM.OutputDeviceManager.manualDeviceProperty("name")
addPrinterByIpScreen.haveConnection = true
} }
} }
} }
@ -260,7 +215,15 @@ Item
text: catalog.i18nc("@button", "Connect") text: catalog.i18nc("@button", "Connect")
width: 140 width: 140
fixedWidthMode: true fixedWidthMode: true
onClicked: base.showNextPage() onClicked:
{
Cura.MachineManager.addMachine(
UM.OutputDeviceManager.manualDeviceProperty("printer_type"),
UM.OutputDeviceManager.manualDeviceProperty("name")
)
UM.OutputDeviceManager.setActiveDevice(UM.OutputDeviceManager.manualDeviceProperty("device_id"))
base.showNextPage()
}
enabled: addPrinterByIpScreen.haveConnection enabled: addPrinterByIpScreen.haveConnection
} }