Merge branch 'CURA-5677_auto_stop_sim_on_layer_change' of github.com:Ultimaker/Cura into 3.5

This commit is contained in:
Jaime van Kessel 2018-09-11 10:40:01 +02:00
commit 8a6c4a9fb6

View File

@ -667,8 +667,11 @@ Item
{ {
target: UM.SimulationView target: UM.SimulationView
onMaxLayersChanged: layerSlider.setUpperValue(UM.SimulationView.currentLayer) onMaxLayersChanged: layerSlider.setUpperValue(UM.SimulationView.currentLayer)
onMinimumLayerChanged: layerSlider.setLowerValue(UM.SimulationView.minimumLayer) onCurrentLayerChanged:
onCurrentLayerChanged: layerSlider.setUpperValue(UM.SimulationView.currentLayer) {
playButton.pauseSimulation()
layerSlider.setUpperValue(UM.SimulationView.currentLayer)
}
} }
// make sure the slider handlers show the correct value after switching views // make sure the slider handlers show the correct value after switching views
@ -723,6 +726,7 @@ Item
UM.SimulationView.setSimulationRunning(true) UM.SimulationView.setSimulationRunning(true)
iconSource = "./resources/simulation_pause.svg" iconSource = "./resources/simulation_pause.svg"
simulationTimer.start() simulationTimer.start()
status = 1
} }
} }
@ -766,6 +770,7 @@ Item
{ {
UM.SimulationView.setCurrentLayer(currentLayer+1) UM.SimulationView.setCurrentLayer(currentLayer+1)
UM.SimulationView.setCurrentPath(0) UM.SimulationView.setCurrentPath(0)
playButton.resumeSimulation()
} }
} }
else else