git.iko.soy/unity8
on xenial help sign in
recalc guard
b3fced6Nick Dedekind
qml/Panel/PanelVelocityCalculator.qml+8−5
compare with xenial
unifiedsplit
@@ -30,6 +30,10 @@ Item {
30 calc.reset();
30 calc.reset();
31 }
31 }
32
32
33+ function calculate() {
34+ stopLateralChanges = Math.abs(calc.calculate()) > velocityThreashold;
35+ }
36+
33 onTrackedValueChanged: {
37 onTrackedValueChanged: {
34 calc.trackedPosition = trackedValue;
38 calc.trackedPosition = trackedValue;
35 velocityTimer.start();
39 velocityTimer.start();
@@ -37,18 +41,17 @@ Item {
37
41
38 AxisVelocityCalculator {
42 AxisVelocityCalculator {
39 id: calc
43 id: calc
40− onTrackedPositionChanged: {
44+ onTrackedPositionChanged: calculate();
41− var velocity = Math.abs(calc.calculate());
42− stopLateralChanges = velocity > velocityThreashold;
43− }
44 }
45 }
45
46
46 Timer {
47 Timer {
47 id: velocityTimer
48 id: velocityTimer
48 interval: 50
49 interval: 50
49 onTriggered: {
50 onTriggered: {
51+ var recalculate = calc.trackedPosition == trackedValue;
50 calc.trackedPosition = trackedValue;
52 calc.trackedPosition = trackedValue;
51− root.stopLateralChanges = Math.abs(calc.calculate()) > velocityThreashold;
53+ if (recalculate) calculate();
54+
52 if (root.stopLateralChanges) {
55 if (root.stopLateralChanges) {
53 velocityTimer.start();
56 velocityTimer.start();
54 } else {
57 } else {