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

Added print progress to sidebar

Browse source 
CL-893
This commit is contained in:
Jaime van Kessel 2018-08-23 15:07:31 +02:00
parent 8c2cd510d8
commit 5176ead0e2
1 changed files with 86 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

90
plugins/UM3NetworkPrinting/ClusterControlItem.qml
View file

@ -5,12 +5,16 @@ import QtQuick.Controls.Styles 1.3
import UM 1.3 as UM import UM 1.3 as UM
import Cura 1.0 as Cura import Cura 1.0 as Cura
Component Component
{ {
Rectangle Rectangle
{ {
id: base id: base
property var lineColor: "#DCDCDC" // TODO: Should be linked to theme. property var lineColor: "#DCDCDC" // TODO: Should be linked to theme.
property var cornerRadius: 4 * screenScaleFactor // TODO: Should be linked to theme. property var cornerRadius: 4 * screenScaleFactor // TODO: Should be linked to theme.
visible: OutputDevice != null visible: OutputDevice != null
anchors.fill: parent anchors.fill: parent
@ -41,8 +45,6 @@ Component
ScrollView ScrollView
{ {
id: queuedPrintJobs
anchors anchors
{ {
top: activePrintersLabel.bottom top: activePrintersLabel.bottom
@ -60,7 +62,7 @@ Component
delegate: Rectangle delegate: Rectangle
{ {
width: parent.width width: parent.width
height: childrenRect.height + 2 * UM.Theme.getSize("default_margin").height height: childrenRect.height + UM.Theme.getSize("default_margin").height
id: base id: base
property var collapsed: true property var collapsed: true
@ -89,7 +91,7 @@ Component
anchors.top: parent.top anchors.top: parent.top
width: 50 width: 50
height: 50 height: 50
color: "blue" color: modelData.activePrintJob != undefined ? UM.Theme.getColor("primary") : UM.Theme.getColor("setting_control_disabled")
} }
Label Label
@ -249,6 +251,86 @@ Component
} }
} }
} }
ProgressBar
{
property var progress:
{
var result = modelData.activePrintJob.timeElapsed / modelData.activePrintJob.timeTotal
if(result > 1.0)
{
result = 1.0
}
return result
}
id: jobProgressBar
width: parent.width
value: progress
anchors.top: detailedInfo.bottom
anchors.topMargin: UM.Theme.getSize("default_margin").height
visible: modelData.activePrintJob != null && modelData.activePrintJob != undefined
style: ProgressBarStyle
{
property var progressText:
{
if(modelData.activePrintJob == null)
{
return ""
}
if(modelData.activePrintJob.state == "wait_cleanup")
{
return "Finshed"
}
else if(modelData.activePrintJob.state == "pre_print")
{
return "Preparing"
}
else
{
return OutputDevice.formatDuration(modelData.activePrintJob.timeTotal - modelData.activePrintJob.timeElapsed)
}
}
background: Rectangle
{
implicitWidth: 100
implicitHeight: visible ? 24 : 0
color: UM.Theme.getColor("viewport_background")
}
progress: Rectangle
{
color: UM.Theme.getColor("primary")
id: progressItem
function getTextOffset()
{
if(progressItem.width + progressLabel.width < control.width)
{
return progressItem.width + UM.Theme.getSize("default_margin").width
}
else
{
return progressItem.width - progressLabel.width - UM.Theme.getSize("default_margin").width
}
}
Label
{
id: progressLabel
anchors.left: parent.left
anchors.leftMargin: getTextOffset()
text: progressText
anchors.verticalCenter: parent.verticalCenter
color: progressItem.width + progressLabel.width < control.width ? "black" : "white"
width: contentWidth
}
}
}
}
} }
} }
} }