v1.5.0: bigger spaced euro sign, trend arrows on flip/nixie, two-phase flip cascade (reset to 0 over 2s then new values), fix nixie flicker endurance
This commit is contained in:
+68
-39
@@ -1,9 +1,11 @@
|
||||
/*
|
||||
* Split-flap display mode — airport departure board style.
|
||||
* Only digits are shown as flaps; the euro sign is rendered as plain
|
||||
* text (default font, white) next to the board, and the trend shows
|
||||
* on a small LED. Changed characters flip with a cascading animation
|
||||
* spread over the configured number of seconds.
|
||||
* text (default font, white) next to the board, followed by a trend
|
||||
* arrow (green up / red down; unchanged keeps the last arrow).
|
||||
* On a price change the board first resets every flap to "0" (swept
|
||||
* over ~2 s), then takes the new values (swept over the remainder of
|
||||
* the cascade setting).
|
||||
* Pure QtQuick so it can be tested outside the plasmoid shell.
|
||||
*/
|
||||
|
||||
@@ -14,8 +16,15 @@ Row {
|
||||
|
||||
// wired by the parent loader
|
||||
property string display: "--"
|
||||
property color trendColor: "#9e9e9e"
|
||||
// seconds over which the cascade to a new price is spread
|
||||
// 1 = up, -1 = down, 0 = unchanged -> keep showing the last arrow
|
||||
property int trendDir: 0
|
||||
property int lastDir: 0
|
||||
onTrendDirChanged: {
|
||||
if (trendDir !== 0) {
|
||||
lastDir = trendDir;
|
||||
}
|
||||
}
|
||||
// total seconds over which the reset-to-zero + new value cycle spreads
|
||||
property int flapSeconds: 3
|
||||
|
||||
spacing: height * 0.06
|
||||
@@ -31,9 +40,9 @@ Row {
|
||||
return out;
|
||||
}
|
||||
|
||||
// UI-only derived values (euro visibility); logic must not rely on these —
|
||||
// QML gives no ordering guarantee between a change handler and the
|
||||
// re-evaluation of dependent bindings.
|
||||
// UI-only derived values (euro/arrow visibility); logic must not rely
|
||||
// on these — QML gives no ordering guarantee between a change handler
|
||||
// and the re-evaluation of dependent bindings.
|
||||
readonly property string digitsOnly: digitsOf(display)
|
||||
readonly property string boardText: digitsOnly.length > 0 ? digitsOnly : "--"
|
||||
|
||||
@@ -58,21 +67,21 @@ Row {
|
||||
var digits = digitsOf(display);
|
||||
var nc = (digits.length > 0 ? digits : "--").split("");
|
||||
var n = Math.max(chars.length, nc.length);
|
||||
// spread the changed cells evenly across flapSeconds
|
||||
var changed = [];
|
||||
|
||||
// Phase 1: every flap resets to "0", swept over ~2 s.
|
||||
// Phase 2: every flap takes its new value, swept over the
|
||||
// remainder of the total cascade time.
|
||||
var total = Math.max(1, flapSeconds) * 1000;
|
||||
var resetSpan = Math.min(2000, Math.floor(total * 2 / 3));
|
||||
var valueStart = resetSpan;
|
||||
var resetStep = n > 1 ? Math.floor(Math.max(0, resetSpan - flapDuration) / (n - 1)) : 0;
|
||||
var valueStep = n > 1 ? Math.floor(Math.max(0, total - valueStart - flapDuration) / (n - 1)) : 0;
|
||||
|
||||
for (var i = 0; i < n; i++) {
|
||||
var from = i < chars.length ? chars[i] : "";
|
||||
var cell = rep.itemAt(i);
|
||||
var to = i < nc.length ? nc[i] : "";
|
||||
if (from !== to) {
|
||||
changed.push([i, to]);
|
||||
}
|
||||
}
|
||||
var span = Math.max(1, flapSeconds) * 1000 - flapDuration;
|
||||
var step = changed.length > 1 ? Math.max(0, Math.floor(span / (changed.length - 1))) : 0;
|
||||
for (var j = 0; j < changed.length; j++) {
|
||||
var cell = rep.itemAt(changed[j][0]);
|
||||
if (cell) {
|
||||
cell.flipTo(changed[j][1], j * step);
|
||||
cell.schedule(to, i * resetStep, valueStart + i * valueStep);
|
||||
}
|
||||
}
|
||||
chars = nc;
|
||||
@@ -92,28 +101,43 @@ Row {
|
||||
border.color: "#26262b"
|
||||
border.width: 1
|
||||
|
||||
// plain property (not a binding) so the flip animation
|
||||
// controls when the character actually changes
|
||||
// plain properties (not bindings) so the animations control
|
||||
// when the character actually changes
|
||||
property string ch: ""
|
||||
property string pendingCh: ""
|
||||
property string targetCh: ""
|
||||
property string animCh: ""
|
||||
|
||||
Component.onCompleted: {
|
||||
ch = root.chars[index] !== undefined ? root.chars[index] : "";
|
||||
}
|
||||
|
||||
function flipTo(newCh, delay) {
|
||||
// schedule the two-phase cycle: reset to "0", then target
|
||||
function schedule(t, resetDelay, valueDelay) {
|
||||
targetCh = t;
|
||||
resetTimer.interval = Math.max(0, resetDelay);
|
||||
resetTimer.restart();
|
||||
valueTimer.interval = Math.max(0, valueDelay);
|
||||
valueTimer.restart();
|
||||
}
|
||||
|
||||
function startFlip(newCh) {
|
||||
if (newCh === ch) {
|
||||
return;
|
||||
}
|
||||
pendingCh = newCh;
|
||||
delayTimer.interval = Math.max(0, delay);
|
||||
delayTimer.restart();
|
||||
animCh = newCh;
|
||||
flipAnim.restart();
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: delayTimer
|
||||
id: resetTimer
|
||||
interval: 0
|
||||
onTriggered: flipAnim.start()
|
||||
onTriggered: cell.startFlip("0")
|
||||
}
|
||||
|
||||
Timer {
|
||||
id: valueTimer
|
||||
interval: 0
|
||||
onTriggered: cell.startFlip(cell.targetCh)
|
||||
}
|
||||
|
||||
transform: Scale {
|
||||
@@ -132,7 +156,7 @@ Row {
|
||||
easing.type: Easing.InQuad
|
||||
}
|
||||
ScriptAction {
|
||||
script: cell.ch = cell.pendingCh
|
||||
script: cell.ch = cell.animCh
|
||||
}
|
||||
NumberAnimation {
|
||||
target: scaleTransform
|
||||
@@ -163,6 +187,12 @@ Row {
|
||||
}
|
||||
}
|
||||
|
||||
// breathing room between the board and the currency sign
|
||||
Item {
|
||||
width: root.height * 0.22
|
||||
height: 1
|
||||
}
|
||||
|
||||
// euro sign in the plain-text font, white
|
||||
Text {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
@@ -170,17 +200,16 @@ Row {
|
||||
visible: root.digitsOnly.length > 0
|
||||
color: "#ffffff"
|
||||
font.family: Qt.application.font.family
|
||||
font.pixelSize: root.height * 0.66
|
||||
font.pixelSize: root.height * 0.85
|
||||
}
|
||||
|
||||
// trend LED (green/red/grey)
|
||||
Rectangle {
|
||||
width: root.height * 0.14
|
||||
height: width
|
||||
radius: width / 2
|
||||
// trend arrow: green up / red down; unchanged keeps the last arrow
|
||||
Text {
|
||||
anchors.verticalCenter: parent.verticalCenter
|
||||
color: root.trendColor
|
||||
border.color: "#26262b"
|
||||
border.width: 1
|
||||
text: root.lastDir > 0 ? "\u25B2" : "\u25BC"
|
||||
visible: root.digitsOnly.length > 0 && root.lastDir !== 0
|
||||
color: root.lastDir > 0 ? "#2ecc71" : "#e74c3c"
|
||||
font.family: Qt.application.font.family
|
||||
font.pixelSize: root.height * 0.5
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user