From a24e5033d634104308ba51cd7d9ca9afbb284f21 Mon Sep 17 00:00:00 2001 From: James Bunton Date: Mon, 13 Mar 2017 12:47:06 +1100 Subject: [PATCH] Fixed octave display --- instrument.cpp | 2 +- stringinstrument.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/instrument.cpp b/instrument.cpp index 9a3b7c4..546100e 100644 --- a/instrument.cpp +++ b/instrument.cpp @@ -98,7 +98,7 @@ QString Instrument::midi2string(int num) for(octave = 0; num >= 12; octave++) { num -= 12; } - return QString(midnotes[num] + " - Octave: " + QString::number(octave - 6)); // Middle C is then "C - Octave: 3" + return QString(midnotes[num] + " - Octave: " + QString::number(octave - 2)); // Middle C is then "C - Octave: 3" } bool Instrument::checkSharp(int note) diff --git a/stringinstrument.cpp b/stringinstrument.cpp index 9d0a9f9..b37d809 100644 --- a/stringinstrument.cpp +++ b/stringinstrument.cpp @@ -174,7 +174,7 @@ void StringInstrument::paintEvent(QPaintEvent *) { for(int i = 0; i < 4; i++) { QString text; text += "Playing note: "; - text += midi2string(note[i]); + text += midi2string(noteStart + note[i]); text += " - Volume: " + QString::number(volume[i] / 30); paint.drawText(45, (i+1)*20, text); } -- 2.39.2