GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-13 18:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Sidebar and main view via loader

Browse Source
This commit is contained in:
ChrisTerBeke 2017-12-06 13:33:05 +01:00
parent a57a5aab6b
commit 2d044a37ae
6 changed files with 50 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/MonitorStage/MonitorStage.py
View File

@ -1,6 +1,8 @@
# 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 os.path
from UM.Application import Application from UM.Application import Application
from UM.Resources import Resources
from cura.Stages.CuraStage import CuraStage from cura.Stages.CuraStage import CuraStage
@ -10,6 +12,11 @@ class MonitorStage(CuraStage):
def __init__(self): def __init__(self):
super().__init__() super().__init__()
Application.getInstance().engineCreatedSignal.connect(self._engineCreated) Application.getInstance().engineCreatedSignal.connect(self._engineCreated)
# TODO: connect output device state to icon source
def _engineCreated(self): def _engineCreated(self):
# Note: currently the sidebar component for prepare and monitor stages is the same, this will change with the printer output device refactor!
sidebar_component_path = os.path.join(Resources.getPath(Application.getInstance().ResourceTypes.QmlFiles), "Sidebar.qml")
sidebar_component = Application.getInstance().createQmlComponent(sidebar_component_path)
self.addDisplayComponent("sidebar", sidebar_component)
self.setIconSource(Application.getInstance().getTheme().getIcon("tab_status_connected")) self.setIconSource(Application.getInstance().getTheme().getIcon("tab_status_connected"))

45
resources/qml/Cura.qml
View File

@ -358,15 +358,13 @@ UM.MainWindow
Topbar Topbar
{ {
id: topbar id: topbar
anchors.left:parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
monitoringPrint: base.showPrintMonitor
onStartMonitoringPrint: base.showPrintMonitor = true
onStopMonitoringPrint: base.showPrintMonitor = false
} }
Loader { Loader
{
id: sidebar id: sidebar
anchors anchors
@ -382,39 +380,30 @@ UM.MainWindow
sourceComponent: UM.Controller.activeStage.sidebarComponent sourceComponent: UM.Controller.activeStage.sidebarComponent
} }
Rectangle Loader
{ {
id: viewportOverlay id: main
color: UM.Theme.getColor("viewport_overlay")
anchors anchors
{ {
top: topbar.bottom top: topbar.bottom
bottom: parent.bottom bottom: parent.bottom
left:parent.left left: parent.left
right: sidebar.left right: sidebar.left
// horizontalCenter: parent.horizontalCenter
// verticalCenter: parent.verticalCenter
// horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2
// verticalCenterOffset: UM.Theme.getSize("sidebar_header").height / 2
} }
visible: opacity > 0
opacity: base.showPrintMonitor ? 1 : 0
MouseArea { // MouseArea
anchors.fill: parent // {
acceptedButtons: Qt.AllButtons // anchors.fill: parent
// acceptedButtons: Qt.AllButtons
// onWheel: wheel.accepted = true
// }
onWheel: wheel.accepted = true sourceComponent: UM.Controller.activeStage.mainComponent
}
}
Loader
{
sourceComponent: Cura.MachineManager.printerOutputDevices.length > 0 ? Cura.MachineManager.printerOutputDevices[0].monitorItem: null
visible: base.showPrintMonitor
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenterOffset: - UM.Theme.getSize("sidebar").width / 2
anchors.verticalCenterOffset: UM.Theme.getSize("sidebar_header").height / 2
property real maximumWidth: viewportOverlay.width
property real maximumHeight: viewportOverlay.height
} }
UM.MessageStack UM.MessageStack

2
resources/qml/Settings/SettingView.qml
View File

@ -24,7 +24,7 @@ Item
{ {
id: globalProfileRow id: globalProfileRow
height: UM.Theme.getSize("sidebar_setup").height height: UM.Theme.getSize("sidebar_setup").height
visible: !sidebar.monitoringPrint && !sidebar.hideSettings // visible: !sidebar.monitoringPrint && !sidebar.hideSettings
anchors anchors
{ {

2
resources/qml/Sidebar.qml
View File

@ -26,7 +26,7 @@ Component
property var connectedPrinter: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null property var connectedPrinter: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
property int backendState: UM.Backend.state property int backendState: UM.Backend.state
property bool monitoringPrint: false property bool monitoringPrint: UM.Controller.activeStage.id == "MonitorStage"
property variant printDuration: PrintInformation.currentPrintTime property variant printDuration: PrintInformation.currentPrintTime
property variant printMaterialLengths: PrintInformation.materialLengths property variant printMaterialLengths: PrintInformation.materialLengths

8
resources/qml/SidebarHeader.qml
View File

@ -40,7 +40,7 @@ Column
id: extruderSelectionRow id: extruderSelectionRow
width: parent.width width: parent.width
height: Math.floor(UM.Theme.getSize("sidebar_tabs").height * 2 / 3) height: Math.floor(UM.Theme.getSize("sidebar_tabs").height * 2 / 3)
visible: machineExtruderCount.properties.value > 1 && !sidebar.monitoringPrint visible: machineExtruderCount.properties.value > 1
anchors anchors
{ {
@ -229,7 +229,7 @@ Column
{ {
id: materialRow id: materialRow
height: UM.Theme.getSize("sidebar_setup").height height: UM.Theme.getSize("sidebar_setup").height
visible: Cura.MachineManager.hasMaterials && !sidebar.monitoringPrint && !sidebar.hideSettings visible: Cura.MachineManager.hasMaterials
anchors anchors
{ {
@ -279,7 +279,7 @@ Column
{ {
id: variantRow id: variantRow
height: UM.Theme.getSize("sidebar_setup").height height: UM.Theme.getSize("sidebar_setup").height
visible: Cura.MachineManager.hasVariants && !sidebar.monitoringPrint && !sidebar.hideSettings visible: Cura.MachineManager.hasVariants
anchors anchors
{ {
@ -319,7 +319,7 @@ Column
{ {
id: materialInfoRow id: materialInfoRow
height: Math.floor(UM.Theme.getSize("sidebar_setup").height / 2) height: Math.floor(UM.Theme.getSize("sidebar_setup").height / 2)
visible: (Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials) && !sidebar.monitoringPrint && !sidebar.hideSettings visible: Cura.MachineManager.hasVariants || Cura.MachineManager.hasMaterials
anchors anchors
{ {

45
resources/qml/Topbar.qml
View File

@ -16,27 +16,22 @@ Rectangle
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: UM.Theme.getSize("sidebar_header").height height: UM.Theme.getSize("sidebar_header").height
color: base.monitoringPrint ? UM.Theme.getColor("topbar_background_color_monitoring") : UM.Theme.getColor("topbar_background_color") color: UM.Controller.activeStage.id == "MonitorStage" ? UM.Theme.getColor("topbar_background_color_monitoring") : UM.Theme.getColor("topbar_background_color")
property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0 property bool printerConnected: Cura.MachineManager.printerOutputDevices.length != 0
property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands property bool printerAcceptsCommands: printerConnected && Cura.MachineManager.printerOutputDevices[0].acceptsCommands
property bool monitoringPrint: false
// outgoing signal
signal startMonitoringPrint()
signal stopMonitoringPrint()
// update monitoring status when event was triggered outside topbar // update monitoring status when event was triggered outside topbar
Component.onCompleted: { // Component.onCompleted: {
startMonitoringPrint.connect(function () { // startMonitoringPrint.connect(function () {
base.monitoringPrint = true // base.monitoringPrint = true
UM.Controller.disableModelRendering() // UM.Controller.disableModelRendering()
}) // })
stopMonitoringPrint.connect(function () { // stopMonitoringPrint.connect(function () {
base.monitoringPrint = false // base.monitoringPrint = false
UM.Controller.enableModelRendering() // UM.Controller.enableModelRendering()
}) // })
} // }
UM.I18nCatalog UM.I18nCatalog
{ {
@ -79,9 +74,10 @@ Rectangle
text: model.name text: model.name
checkable: true checkable: true
checked: model.active checked: model.active
exclusiveGroup: sidebarHeaderBarGroup exclusiveGroup: topbarMenuGroup
style: UM.Theme.styles.topbar_header_tab style: UM.Theme.styles.topbar_header_tab
height: UM.Theme.getSize("sidebar_header").height height: UM.Theme.getSize("sidebar_header").height
width: UM.Theme.getSize("topbar_button").width
onClicked: UM.Controller.setActiveStage(model.id) onClicked: UM.Controller.setActiveStage(model.id)
iconSource: model.stage.iconSource iconSource: model.stage.iconSource
@ -90,6 +86,8 @@ Rectangle
} }
} }
ExclusiveGroup { id: topbarMenuGroup }
// Button // Button
// { // {
// id: showMonitor // id: showMonitor
@ -149,8 +147,6 @@ Rectangle
// } // }
// } // }
// } // }
ExclusiveGroup { id: sidebarHeaderBarGroup }
} }
ToolButton ToolButton
@ -218,17 +214,16 @@ Rectangle
menu: PrinterMenu { } menu: PrinterMenu { }
} }
//View orientation Item // View orientation Item
Row Row
{ {
id: viewOrientationControl id: viewOrientationControl
height: 30 height: 30
spacing: 2 spacing: 2
visible: UM.Controller.activeStage.id != "MonitorStage"
visible: !base.monitoringPrint anchors
{
anchors {
verticalCenter: base.verticalCenter verticalCenter: base.verticalCenter
right: viewModeButton.right right: viewModeButton.right
rightMargin: UM.Theme.getSize("default_margin").width + viewModeButton.width rightMargin: UM.Theme.getSize("default_margin").width + viewModeButton.width
@ -306,7 +301,7 @@ Rectangle
} }
style: UM.Theme.styles.combobox style: UM.Theme.styles.combobox
visible: !base.monitoringPrint visible: UM.Controller.activeStage.id != "MonitorStage"
model: UM.ViewModel { } model: UM.ViewModel { }
textRole: "name" textRole: "name"