GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-15 02:35:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update ManualPrinterControl

Browse Source 
CURA-5943
This commit is contained in:
Lipu Fei 2018-11-22 13:58:18 +01:00
parent cf0994037c
commit 5a16918391
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
resources/qml/PrinterOutput/ManualPrinterControl.qml
View File

@ -1,12 +1,12 @@
// Copyright (c) 2017 Ultimaker B.V. // Copyright (c) 2017 Ultimaker B.V.
// Cura is released under the terms of the LGPLv3 or higher. // Cura is released under the terms of the LGPLv3 or higher.
import QtQuick 2.2 import QtQuick 2.10
import QtQuick.Controls 1.1 import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Styles 1.4
import QtQuick.Layouts 1.1 import QtQuick.Layouts 1.3
import UM 1.2 as UM import UM 1.3 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
import "." import "."
@ -14,8 +14,10 @@ import "."
Item Item
{ {
property var printerModel property var printerModel: null
property var activePrintJob: printerModel != null ? printerModel.activePrintJob : null property var activePrintJob: printerModel != null ? printerModel.activePrintJob : null
property var connectedPrinter: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
implicitWidth: parent.width implicitWidth: parent.width
implicitHeight: childrenRect.height implicitHeight: childrenRect.height
@ -388,7 +390,7 @@ Item
if (printerModel == null) { if (printerModel == null) {
return false // Can't send custom commands if not connected. return false // Can't send custom commands if not connected.
} }
if (!connectedPrinter.acceptsCommands) { if (connectedPrinter == null || !connectedPrinter.acceptsCommands) {
return false // Not allowed to do anything return false // Not allowed to do anything
} }
if (connectedPrinter.jobState == "printing" || connectedPrinter.jobState == "pre_print" || connectedPrinter.jobState == "resuming" || connectedPrinter.jobState == "pausing" || connectedPrinter.jobState == "paused" || connectedPrinter.jobState == "error" || connectedPrinter.jobState == "offline") { if (connectedPrinter.jobState == "printing" || connectedPrinter.jobState == "pre_print" || connectedPrinter.jobState == "resuming" || connectedPrinter.jobState == "pausing" || connectedPrinter.jobState == "paused" || connectedPrinter.jobState == "error" || connectedPrinter.jobState == "offline") {