Fixed octave display

diff --git a/instrument.cpp b/instrument.cpp
index 9a3b7c4f5e8505ff9ae890219ecda4c52558df2d..546100e2cb071905c9ad251dfe1e6edffce8dac9 100644 (file)
--- a/instrument.cpp
+++ b/instrument.cpp
@@ -98,7 +98,7 @@ QString Instrument::midi2string(int num)
        for(octave = 0; num >= 12; octave++) {
                num -= 12;
        }
        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)
 }
 
 bool Instrument::checkSharp(int note)

diff --git a/stringinstrument.cpp b/stringinstrument.cpp
index 9d0a9f918a0f08841b8529e71150473c15e9535b..b37d8097c2ed57accd867e0614b2cc834dbc9b40 100644 (file)
--- 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: ";
        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);
        }
                text += " - Volume: " + QString::number(volume[i] / 30);
                paint.drawText(45, (i+1)*20, text);
        }