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

Fix merge conflicts, add can_send_raw_gcode ability, rename to sendRawCommand, small fixes

Browse source
This commit is contained in:
ChrisTerBeke 2018-03-15 16:51:25 +01:00
commit d4d9a58d04
13 changed files with 602 additions and 139 deletions
Download patch file Download diff file Expand all files Collapse all files

49
resources/qml/PrinterOutput/ManualPrinterControl.qml
View file

@ -100,30 +100,29 @@ Item
Column
{
// enabled:
// {
// if (printerModel == null)
// {
// return false; //Can't control the printer if not connected
// }
//
// if (!connectedDevice.acceptsCommands)
// {
// return false; //Not allowed to do anything.
// }
//
// if(activePrintJob == null)
// {
// return true
// }
//
// if (activePrintJob.state == "printing" || activePrintJob.state == "resuming" || activePrintJob.state == "pausing" || activePrintJob.state == "error" || activePrintJob.state == "offline")
// {
// return false; //Printer is in a state where it can't react to manual control
// }
// return true;
// }
enabled:
{
if (printerModel == null)
{
return false; //Can't control the printer if not connected
}
if (!connectedDevice.acceptsCommands)
{
return false; //Not allowed to do anything.
}
if(activePrintJob == null)
{
return true
}
if (activePrintJob.state == "printing" || activePrintJob.state == "resuming" || activePrintJob.state == "pausing" || activePrintJob.state == "error" || activePrintJob.state == "offline")
{
return false; //Printer is in a state where it can't react to manual control
}
return true;
}
MonitorSection
{
@ -458,7 +457,7 @@ Item
id: customCommandControl
// state
visible: printerModel != null ? printerModel.canPreHeatBed: true
visible: printerModel != null ? printerModel.canSendRawGcode: true
enabled: {
if (printerModel == null) {
return false // Can't preheat if not connected
@ -534,7 +533,7 @@ Item
// we also clear the text field
Keys.onReturnPressed:
{
printerModel.sendCustomCommand(customCommandControlInput.text)
printerModel.sendRawCommand(customCommandControlInput.text)
customCommandControlInput.text = ""
}
}