GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-09-26 21:03:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't use printerConnected from Sidebar.qml

Browse Source 
We don't need it if we just check for connectedPrinter to not be null each time.

Contributes to issue CURA-3161.
This commit is contained in:
Ghostkeeper 2017-02-10 11:11:39 +01:00
parent 45c045131b
commit 4ce755021a
No known key found for this signature in database
GPG Key ID: C5F96EE2BC0F7E75
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
resources/qml/PrintMonitor.qml
View File

@ -12,7 +12,7 @@ import Cura 1.0 as Cura
Column Column
{ {
id: printMonitor id: printMonitor
property var connectedPrinter: printerConnected ? Cura.MachineManager.printerOutputDevices[0] : null property var connectedPrinter: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
Cura.ExtrudersModel Cura.ExtrudersModel
{ {
@ -30,7 +30,7 @@ Column
Label Label
{ {
id: connectedPrinterNameLabel id: connectedPrinterNameLabel
text: printerConnected ? connectedPrinter.name : catalog.i18nc("@info:status", "No printer connected") text: connectedPrinter != null ? connectedPrinter.name : catalog.i18nc("@info:status", "No printer connected")
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.left: parent.left anchors.left: parent.left
@ -43,7 +43,7 @@ Column
Label Label
{ {
id: connectedPrinterAddressLabel id: connectedPrinterAddressLabel
text: (printerConnected && connectedPrinter.address != null) ? connectedPrinter.address : "" text: (connectedPrinter != null && connectedPrinter.address != null) ? connectedPrinter.address : ""
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
color: UM.Theme.getColor("text_inactive") color: UM.Theme.getColor("text_inactive")
anchors.left: parent.left anchors.left: parent.left
@ -56,8 +56,8 @@ Column
} }
Label Label
{ {
text: printerConnected ? connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.") text: connectedPrinter != null ? connectedPrinter.connectionText : catalog.i18nc("@info:status", "The printer is not connected.")
color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") color: connectedPrinter != null && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
font: UM.Theme.getFont("very_small") font: UM.Theme.getFont("very_small")
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
anchors.left: parent.left anchors.left: parent.left
@ -104,7 +104,7 @@ Column
} }
Text //Temperature indication. Text //Temperature indication.
{ {
text: printerConnected ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : "" text: connectedPrinter != null ? Math.round(connectedPrinter.hotendTemperatures[index]) + "°C" : ""
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: UM.Theme.getSize("default_margin").width anchors.rightMargin: UM.Theme.getSize("default_margin").width
@ -116,10 +116,10 @@ Column
id: materialColor id: materialColor
width: materialName.height * 0.75 width: materialName.height * 0.75
height: materialName.height * 0.75 height: materialName.height * 0.75
color: printerConnected ? connectedPrinter.materialColors[index] : "#00000000" //Need to check for printerConnected or materialColors[index] gives an error. color: connectedPrinter != null ? connectedPrinter.materialColors[index] : "#00000000"
border.width: UM.Theme.getSize("default_lining").width border.width: UM.Theme.getSize("default_lining").width
border.color: UM.Theme.getColor("lining") border.color: UM.Theme.getColor("lining")
visible: printerConnected visible: connectedPrinter != null
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: UM.Theme.getSize("default_margin").width anchors.leftMargin: UM.Theme.getSize("default_margin").width
anchors.verticalCenter: materialName.verticalCenter anchors.verticalCenter: materialName.verticalCenter
@ -127,7 +127,7 @@ Column
Text //Material name. Text //Material name.
{ {
id: materialName id: materialName
text: printerConnected ? connectedPrinter.materialNames[index] : "" text: connectedPrinter != null ? connectedPrinter.materialNames[index] : ""
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.left: materialColor.right anchors.left: materialColor.right
@ -137,7 +137,7 @@ Column
} }
Text //Variant name. Text //Variant name.
{ {
text: printerConnected ? connectedPrinter.hotendIds[index] : "" text: connectedPrinter != null ? connectedPrinter.hotendIds[index] : ""
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.right: parent.right anchors.right: parent.right
@ -170,7 +170,7 @@ Column
Text //Target temperature. Text //Target temperature.
{ {
id: bedTargetTemperature id: bedTargetTemperature
text: printerConnected ? connectedPrinter.targetBedTemperature + "°C" : "" text: connectedPrinter != null ? connectedPrinter.targetBedTemperature + "°C" : ""
font: UM.Theme.getFont("small") font: UM.Theme.getFont("small")
color: UM.Theme.getColor("text_inactive") color: UM.Theme.getColor("text_inactive")
anchors.right: parent.right anchors.right: parent.right
@ -180,7 +180,7 @@ Column
Text //Current temperature. Text //Current temperature.
{ {
id: bedCurrentTemperature id: bedCurrentTemperature
text: printerConnected ? connectedPrinter.bedTemperature + "°C" : "" text: connectedPrinter != null ? connectedPrinter.bedTemperature + "°C" : ""
font: UM.Theme.getFont("large") font: UM.Theme.getFont("large")
color: UM.Theme.getColor("text") color: UM.Theme.getColor("text")
anchors.right: bedTargetTemperature.left anchors.right: bedTargetTemperature.left
@ -306,7 +306,7 @@ Column
{ {
preheatCountdown.visible = false; preheatCountdown.visible = false;
running = false; running = false;
if (printerConnected) if (connectedPrinter != null)
{ {
connectedPrinter.cancelPreheatBed() connectedPrinter.cancelPreheatBed()
} }
@ -332,7 +332,7 @@ Column
height: UM.Theme.getSize("setting_control").height height: UM.Theme.getSize("setting_control").height
enabled: enabled:
{ {
if (!printerConnected) if (!connectedPrinter != null)
{ {
return false; //Can't preheat if not connected. return false; //Can't preheat if not connected.
} }
@ -484,19 +484,19 @@ Column
{ {
sourceComponent: monitorItem sourceComponent: monitorItem
property string label: catalog.i18nc("@label", "Job Name") property string label: catalog.i18nc("@label", "Job Name")
property string value: printerConnected ? connectedPrinter.jobName : "" property string value: connectedPrinter != null ? connectedPrinter.jobName : ""
} }
Loader Loader
{ {
sourceComponent: monitorItem sourceComponent: monitorItem
property string label: catalog.i18nc("@label", "Printing Time") property string label: catalog.i18nc("@label", "Printing Time")
property string value: printerConnected ? getPrettyTime(connectedPrinter.timeTotal) : "" property string value: connectedPrinter != null ? getPrettyTime(connectedPrinter.timeTotal) : ""
} }
Loader Loader
{ {
sourceComponent: monitorItem sourceComponent: monitorItem
property string label: catalog.i18nc("@label", "Estimated time left") property string label: catalog.i18nc("@label", "Estimated time left")
property string value: printerConnected ? getPrettyTime(connectedPrinter.timeTotal - connectedPrinter.timeElapsed) : "" property string value: connectedPrinter != null ? getPrettyTime(connectedPrinter.timeTotal - connectedPrinter.timeElapsed) : ""
} }
Component Component
@ -515,7 +515,7 @@ Column
width: parent.width * 0.4 width: parent.width * 0.4
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: label text: label
color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") color: connectedPrinter != null && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
elide: Text.ElideRight elide: Text.ElideRight
} }
@ -524,7 +524,7 @@ Column
width: parent.width * 0.6 width: parent.width * 0.6
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
text: value text: value
color: printerConnected && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text") color: connectedPrinter != null && printerAcceptsCommands ? UM.Theme.getColor("setting_control_text") : UM.Theme.getColor("setting_control_disabled_text")
font: UM.Theme.getFont("default") font: UM.Theme.getFont("default")
elide: Text.ElideRight elide: Text.ElideRight
} }