3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Cleanup debugging things for cura-6874

Browse source 
CURA-6874
This commit is contained in:
Nino van Hooff 2019-10-30 10:54:22 +01:00
parent 6bef16bbec
commit 958a922808
3 changed files with 11 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

11
plugins/PreviewStage/PreviewMain.qml
View file

@ -17,21 +17,14 @@ Item
property var safeArea: parent property var safeArea: parent
// Subtract the actionPanel from the safe area. This way the view won't draw interface elements under/over it // Subtract the actionPanel from the safe area. This way the view won't draw interface elements under/over it
Rectangle Item
{ {
id: childSafeArea id: childSafeArea
x: safeArea.x - parent.x x: safeArea.x - parent.x
y: safeArea.y - parent.y y: safeArea.y - parent.y
width: actionPanelWidget.x - x width: actionPanelWidget.x - x
height: actionPanelWidget.y - y height: actionPanelWidget.y - y
visible: false // true for debug only visible: false
color:"#800000FF"
Component.onCompleted: {
print("parent", parent.x, parent.y)
print("parent safe", safeArea.x, safeArea.y)
print("previewmain safe", childSafeArea.x, childSafeArea.y, childSafeArea.width, childSafeArea.height)
}
} }
Loader Loader

14
plugins/SimulationView/SimulationViewMainComponent.qml
View file

@ -18,10 +18,10 @@ Item
property bool isSimulationPlaying: false property bool isSimulationPlaying: false
readonly property var layerSliderSafeYMin: safeArea.y readonly property real layerSliderSafeYMin: safeArea.y
readonly property var layerSliderSafeYMax: safeArea.y + safeArea.height readonly property real layerSliderSafeYMax: safeArea.y + safeArea.height
readonly property var pathSliderSafeXMin: safeArea.x + playButton.width //todo playbutton margin or group button + slider in an item? readonly property real pathSliderSafeXMin: safeArea.x + playButton.width
readonly property var pathSliderSafeXMax: safeArea.x + safeArea.width readonly property real pathSliderSafeXMax: safeArea.x + safeArea.width
visible: UM.SimulationView.layerActivity && CuraApplication.platformActivity visible: UM.SimulationView.layerActivity && CuraApplication.platformActivity
@ -30,9 +30,9 @@ Item
{ {
id: pathSlider id: pathSlider
readonly property var preferredWidth: UM.Theme.getSize("slider_layerview_size").height // not a typo, should be as long as layerview slider readonly property real preferredWidth: UM.Theme.getSize("slider_layerview_size").height // not a typo, should be as long as layerview slider
readonly property var margin: UM.Theme.getSize("default_margin").width readonly property real margin: UM.Theme.getSize("default_margin").width
readonly property var pathSliderSafeWidth: pathSliderSafeXMax - pathSliderSafeXMin readonly property real pathSliderSafeWidth: pathSliderSafeXMax - pathSliderSafeXMin
height: UM.Theme.getSize("slider_handle").width height: UM.Theme.getSize("slider_handle").width
width: preferredWidth + margin * 2 < pathSliderSafeWidth ? preferredWidth : pathSliderSafeWidth - margin * 2 width: preferredWidth + margin * 2 < pathSliderSafeWidth ? preferredWidth : pathSliderSafeWidth - margin * 2

5
resources/qml/Cura.qml
View file

@ -302,14 +302,13 @@ UM.MainWindow
} }
// A hint for the loaded content view. Overlay items / controls can safely be placed in this area // A hint for the loaded content view. Overlay items / controls can safely be placed in this area
Rectangle { Item {
id: mainSafeArea id: mainSafeArea
anchors.left: viewOrientationControls.right anchors.left: viewOrientationControls.right
anchors.right: main.right anchors.right: main.right
anchors.top: main.top anchors.top: main.top
anchors.bottom: main.bottom anchors.bottom: main.bottom
visible: false // set to true for debugging only visible: false
color:"#8000FF00"
} }
Loader Loader