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

minimum layer slider now works

Browse source
This commit is contained in:
Jack Ha 2017-01-03 15:58:35 +01:00
parent e57de296e7
commit cd8eaf7759
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/LayerView/LayerPass.py
View file

@ -80,7 +80,7 @@ class LayerPass(RenderPass):
continue continue
# Render all layers below a certain number as line mesh instead of vertices. # Render all layers below a certain number as line mesh instead of vertices.
if self._layer_view._current_layer_num > -1 and not self._layer_view._only_show_top_layers: if self._layer_view._current_layer_num > -1 and ((not self._layer_view._only_show_top_layers) or (not self._layer_view.getCompatibilityMode())):
start = 0 start = 0
end = 0 end = 0
element_counts = layer_data.getElementCounts() element_counts = layer_data.getElementCounts()

2
plugins/LayerView/LayerView.py
View file

@ -155,8 +155,6 @@ class LayerView(View):
self._minimum_layer_num = value self._minimum_layer_num = value
if self._minimum_layer_num < 0: if self._minimum_layer_num < 0:
self._minimum_layer_num = 0 self._minimum_layer_num = 0
if self._minimum_layer_num > self._current_layer_num:
self._minimum_layer_num = self._current_layer_num
self._startUpdateTopLayers() self._startUpdateTopLayers()

16
plugins/LayerView/LayerView.qml
View file

@ -22,13 +22,18 @@ Item
anchors.leftMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.2 anchors.leftMargin: UM.Theme.getSize("slider_layerview_margin").width * 0.2
orientation: Qt.Vertical orientation: Qt.Vertical
minimumValue: 0; minimumValue: 0;
maximumValue: UM.LayerView.numLayers; maximumValue: UM.LayerView.numLayers-1;
stepSize: 1 stepSize: 1
property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize; property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize;
value: UM.LayerView.minimumLayer value: UM.LayerView.minimumLayer
onValueChanged: UM.LayerView.setMinimumLayer(value) onValueChanged: {
UM.LayerView.setMinimumLayer(value)
if (value > UM.LayerView.currentLayer) {
UM.LayerView.setCurrentLayer(value);
}
}
style: UM.Theme.styles.slider; style: UM.Theme.styles.slider;
} }
@ -48,7 +53,12 @@ Item
property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize; property real pixelsPerStep: ((height - UM.Theme.getSize("slider_handle").height) / (maximumValue - minimumValue)) * stepSize;
value: UM.LayerView.currentLayer value: UM.LayerView.currentLayer
onValueChanged: UM.LayerView.setCurrentLayer(value) onValueChanged: {
UM.LayerView.setCurrentLayer(value);
if (value < UM.LayerView.minimumLayer) {
UM.LayerView.setMinimumLayer(value);
}
}
style: UM.Theme.styles.slider; style: UM.Theme.styles.slider;