summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/tonleiter/fretboard.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/noncore/multimedia/tonleiter/fretboard.cpp b/noncore/multimedia/tonleiter/fretboard.cpp
index d8e48d3..57806be 100644
--- a/noncore/multimedia/tonleiter/fretboard.cpp
+++ b/noncore/multimedia/tonleiter/fretboard.cpp
@@ -102,58 +102,58 @@ void FretBoard::paintFrets(QPainter* p)
void FretBoard::paintStrings(QPainter* p)
{
//draw strings
p->setPen(stringpen);
stringdist=(double)(yheight)/(double)(inst.noOfStrings()-1);
for(int s=0;s<inst.noOfStrings();s++)
{
int stringpos=(int)(stringdist*s);
p->drawLine(xmin,stringpos+ymin,xmax,stringpos+ymin);
int stinglabelid=inst.noOfStrings()-(s+1);
QString label=Note::getNameOfNote(inst.string(stinglabelid));
p->drawText(xmargin/2,stringpos+ymin,label);
}
}
//****************************************************************************
void FretBoard::paintScale(QPainter* p)
{
int dotsize=10;
int scaleid=data->getCurrentScaleID();
Scale scale=data->getScale(scaleid);
int colorstart=255%inst.noOfOctaves();
int colorintervall=(255-colorstart)/inst.noOfOctaves();
for(int s=0;s<inst.noOfStrings();s++)
{
int y=(int)(stringdist*s)+ymin;
int stingid=inst.noOfStrings()-(s+1);
for(int f=0;f<=inst.noOfFrets();f++)
{
int note=inst.string(stingid)+f;
if(scale.noteInScale(data->getCurrentBaseNote(),note))
{
int x=(int)(fretdist*f)+xmin;
int octave=Note::octaveOfBaseNote(data->getCurrentBaseNote(),note);
if(octave>5) octave=5;
p->setPen(QColor(255,0,0));
int c=colorstart+octave*colorintervall;
QColor dotcolor(c,c,255);
p->setBrush(dotcolor);
p->drawEllipse(x-dotsize/2,y-dotsize/2,dotsize,dotsize);
if(data->isDrawNames())
{
- p->setPen(QColor(0,255,0));
+ p->setPen(QColor(255,155,0));
p->drawText(x-dotsize/2,y-dotsize/2,Note::getNameOfNote(note));
}
}
}
}
}
//****************************************************************************
//****************************************************************************