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

Hide the slider controls when there are no layers

Browse source 
(and code cleanup)
This commit is contained in:
fieldOfView 2017-03-06 17:46:42 +01:00
parent af265be900
commit 2b49484dc7
1 changed files with 30 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

49
plugins/LayerView/LayerView.qml
View file

@ -350,6 +350,9 @@ Item
property real minimumRange: 0 property real minimumRange: 0
property bool roundValues: true property bool roundValues: true
property var activeHandle: upperHandle
property bool layersVisible: UM.LayerView.layerActivity && Printer.platformActivity ? true : false
function getUpperValueFromHandle() function getUpperValueFromHandle()
{ {
var result = upperHandle.y / (height - (2 * handleSize + minimumRangeHandleSize)); var result = upperHandle.y / (height - (2 * handleSize + minimumRangeHandleSize));
@ -357,6 +360,7 @@ Item
result = roundValues ? Math.round(result) | 0 : result; result = roundValues ? Math.round(result) | 0 : result;
return result; return result;
} }
function getLowerValueFromHandle() function getLowerValueFromHandle()
{ {
var result = (lowerHandle.y - (handleSize + minimumRangeHandleSize)) / (height - (2 * handleSize + minimumRangeHandleSize)); var result = (lowerHandle.y - (handleSize + minimumRangeHandleSize)) / (height - (2 * handleSize + minimumRangeHandleSize));
@ -364,7 +368,6 @@ Item
result = roundValues ? Math.round(result) : result; result = roundValues ? Math.round(result) : result;
return result; return result;
} }
property var activeHandle: upperHandle
function setUpperValue(value) function setUpperValue(value)
{ {
@ -390,7 +393,6 @@ Item
rangeHandle.height = lowerHandle.y - (upperHandle.y + upperHandle.height); rangeHandle.height = lowerHandle.y - (upperHandle.y + upperHandle.height);
} }
Connections Connections
{ {
target: UM.LayerView target: UM.LayerView
@ -414,7 +416,18 @@ Item
width: parent.handleSize width: parent.handleSize
height: parent.minimumRangeHandleSize height: parent.minimumRangeHandleSize
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
visible: slider.layersVisible
property real value: UM.LayerView.currentLayer property real value: UM.LayerView.currentLayer
function setValue(value)
{
var range = upperHandle.value - lowerHandle.value;
value = Math.min(value, slider.maximumValue);
value = Math.max(value, slider.minimumValue + range);
UM.LayerView.setCurrentLayer(value);
UM.LayerView.setMinimumLayer(value - range);
}
Rectangle { Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
@ -443,14 +456,6 @@ Item
UM.LayerView.setMinimumLayer(lower_value); UM.LayerView.setMinimumLayer(lower_value);
} }
} }
function setValue(value)
{
var range = upperHandle.value - lowerHandle.value;
value = Math.min(value, slider.maximumValue);
value = Math.max(value, slider.minimumValue + range);
UM.LayerView.setCurrentLayer(value);
UM.LayerView.setMinimumLayer(value - range);
}
} }
Rectangle { Rectangle {
@ -461,7 +466,14 @@ Item
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
radius: parent.handleRadius radius: parent.handleRadius
color: parent.upperHandleColor color: parent.upperHandleColor
visible: slider.layersVisible
property real value: UM.LayerView.currentLayer property real value: UM.LayerView.currentLayer
function setValue(value)
{
UM.LayerView.setCurrentLayer(value);
}
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -483,10 +495,6 @@ Item
UM.LayerView.setCurrentLayer(slider.getUpperValueFromHandle()); UM.LayerView.setCurrentLayer(slider.getUpperValueFromHandle());
} }
} }
function setValue(value)
{
UM.LayerView.setCurrentLayer(value);
}
} }
Rectangle { Rectangle {
@ -497,7 +505,14 @@ Item
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
radius: parent.handleRadius radius: parent.handleRadius
color: parent.lowerHandleColor color: parent.lowerHandleColor
visible: slider.layersVisible
property real value: UM.LayerView.minimumLayer property real value: UM.LayerView.minimumLayer
function setValue(value)
{
UM.LayerView.setMinimumLayer(value);
}
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
@ -519,10 +534,6 @@ Item
UM.LayerView.setMinimumLayer(slider.getLowerValueFromHandle()); UM.LayerView.setMinimumLayer(slider.getLowerValueFromHandle());
} }
} }
function setValue(value)
{
UM.LayerView.setMinimumLayer(value);
}
} }
Rectangle Rectangle
@ -538,7 +549,7 @@ Item
border.color: UM.Theme.getColor("slider_groove_border") border.color: UM.Theme.getColor("slider_groove_border")
color: UM.Theme.getColor("tool_panel_background") color: UM.Theme.getColor("tool_panel_background")
visible: UM.LayerView.layerActivity && Printer.platformActivity ? true : false visible: slider.layersVisible
TextField TextField
{ {