summaryrefslogtreecommitdiff
authorwaspe <waspe>2003-11-17 20:33:37 (UTC)
committer waspe <waspe>2003-11-17 20:33:37 (UTC)
commitede1a10411dd859c6473aadbc7fa54bf2419380d (patch) (unidiff)
treed8561730a0932e57a25a15441a579cdaae1919fd
parent9ea83d1fc66171dbbcf8d1d435eedbb75c346935 (diff)
downloadopie-ede1a10411dd859c6473aadbc7fa54bf2419380d.zip
opie-ede1a10411dd859c6473aadbc7fa54bf2419380d.tar.gz
opie-ede1a10411dd859c6473aadbc7fa54bf2419380d.tar.bz2
changed color of notes
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)
102void FretBoard::paintStrings(QPainter* p) 102void FretBoard::paintStrings(QPainter* p)
103{ 103{
104 //draw strings 104 //draw strings
105 p->setPen(stringpen); 105 p->setPen(stringpen);
106 106
107 stringdist=(double)(yheight)/(double)(inst.noOfStrings()-1); 107 stringdist=(double)(yheight)/(double)(inst.noOfStrings()-1);
108 for(int s=0;s<inst.noOfStrings();s++) 108 for(int s=0;s<inst.noOfStrings();s++)
109 { 109 {
110 int stringpos=(int)(stringdist*s); 110 int stringpos=(int)(stringdist*s);
111 p->drawLine(xmin,stringpos+ymin,xmax,stringpos+ymin); 111 p->drawLine(xmin,stringpos+ymin,xmax,stringpos+ymin);
112 112
113 int stinglabelid=inst.noOfStrings()-(s+1); 113 int stinglabelid=inst.noOfStrings()-(s+1);
114 QString label=Note::getNameOfNote(inst.string(stinglabelid)); 114 QString label=Note::getNameOfNote(inst.string(stinglabelid));
115 p->drawText(xmargin/2,stringpos+ymin,label); 115 p->drawText(xmargin/2,stringpos+ymin,label);
116 } 116 }
117} 117}
118//**************************************************************************** 118//****************************************************************************
119void FretBoard::paintScale(QPainter* p) 119void FretBoard::paintScale(QPainter* p)
120{ 120{
121 int dotsize=10; 121 int dotsize=10;
122 int scaleid=data->getCurrentScaleID(); 122 int scaleid=data->getCurrentScaleID();
123 Scale scale=data->getScale(scaleid); 123 Scale scale=data->getScale(scaleid);
124 124
125 int colorstart=255%inst.noOfOctaves(); 125 int colorstart=255%inst.noOfOctaves();
126 int colorintervall=(255-colorstart)/inst.noOfOctaves(); 126 int colorintervall=(255-colorstart)/inst.noOfOctaves();
127 127
128 for(int s=0;s<inst.noOfStrings();s++) 128 for(int s=0;s<inst.noOfStrings();s++)
129 { 129 {
130 int y=(int)(stringdist*s)+ymin; 130 int y=(int)(stringdist*s)+ymin;
131 int stingid=inst.noOfStrings()-(s+1); 131 int stingid=inst.noOfStrings()-(s+1);
132 for(int f=0;f<=inst.noOfFrets();f++) 132 for(int f=0;f<=inst.noOfFrets();f++)
133 { 133 {
134 int note=inst.string(stingid)+f; 134 int note=inst.string(stingid)+f;
135 if(scale.noteInScale(data->getCurrentBaseNote(),note)) 135 if(scale.noteInScale(data->getCurrentBaseNote(),note))
136 { 136 {
137 int x=(int)(fretdist*f)+xmin; 137 int x=(int)(fretdist*f)+xmin;
138 138
139 int octave=Note::octaveOfBaseNote(data->getCurrentBaseNote(),note); 139 int octave=Note::octaveOfBaseNote(data->getCurrentBaseNote(),note);
140 if(octave>5) octave=5; 140 if(octave>5) octave=5;
141 p->setPen(QColor(255,0,0)); 141 p->setPen(QColor(255,0,0));
142 int c=colorstart+octave*colorintervall; 142 int c=colorstart+octave*colorintervall;
143 QColor dotcolor(c,c,255); 143 QColor dotcolor(c,c,255);
144 p->setBrush(dotcolor); 144 p->setBrush(dotcolor);
145 145
146 p->drawEllipse(x-dotsize/2,y-dotsize/2,dotsize,dotsize); 146 p->drawEllipse(x-dotsize/2,y-dotsize/2,dotsize,dotsize);
147 147
148 if(data->isDrawNames()) 148 if(data->isDrawNames())
149 { 149 {
150 p->setPen(QColor(0,255,0)); 150 p->setPen(QColor(255,155,0));
151 p->drawText(x-dotsize/2,y-dotsize/2,Note::getNameOfNote(note)); 151 p->drawText(x-dotsize/2,y-dotsize/2,Note::getNameOfNote(note));
152 } 152 }
153 153
154 } 154 }
155 } 155 }
156 } 156 }
157} 157}
158//**************************************************************************** 158//****************************************************************************
159//**************************************************************************** 159//****************************************************************************