From 400e109aab8bb0e0b14467b376ebb67a36c50cb9 Mon Sep 17 00:00:00 2001 From: Louis-Joseph Fournier Date: Tue, 5 Jan 2016 22:02:44 +0100 Subject: [PATCH] Screen: display la ref and temperament --- qml/Scene.qml | 4 +++- qml/TunerScreen.qml | 17 +++++++++++++++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/qml/Scene.qml b/qml/Scene.qml index 60b4e63..d245e14 100644 --- a/qml/Scene.qml +++ b/qml/Scene.qml @@ -34,9 +34,11 @@ Item { id: tuner property int note: 2 property int octave: 4 - property double freq: 440 + property double la: 440 property double deviation: 0.12 property bool found: true + property variant temperament_list: ["Weikmeister III", "equal"] + property int temperament_idx: 0 } TunerScreen { diff --git a/qml/TunerScreen.qml b/qml/TunerScreen.qml index acf2e10..40a23f6 100644 --- a/qml/TunerScreen.qml +++ b/qml/TunerScreen.qml @@ -152,4 +152,21 @@ Item { index: tuner.octave } } + + // frequency and temperament + Column { + x: is_portrait ? theme.paddingLarge : meter.x + meter.width / 6 + y: is_portrait ? theme.paddingLarge : meter.y + meter.height - theme.fontSizeSmall * 4 - theme.paddingLarge + width: parent.width * 0.4 + height: width / 2 + + Text { + text: tuner.la + " hz" + font.pixelSize: theme.fontSizeSmall + } + Text { + text: tuner.temperament_list[tuner.temperament_idx] + font.pixelSize: theme.fontSizeSmall + } + } }