-rw-r--r-- | noncore/multimedia/tonleiter/fretboard.cpp | 2 |
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 | |||
@@ -54,106 +54,106 @@ void FretBoard::resizeEvent(QResizeEvent* re) | |||
54 | } | 54 | } |
55 | //**************************************************************************** | 55 | //**************************************************************************** |
56 | void FretBoard::paintBoard(QPainter* p) | 56 | void FretBoard::paintBoard(QPainter* p) |
57 | { | 57 | { |
58 | //debug | 58 | //debug |
59 | QColor bgc=QColor(142,138,120); | 59 | QColor bgc=QColor(142,138,120); |
60 | p->setPen(QPen(bgc,5)); | 60 | p->setPen(QPen(bgc,5)); |
61 | p->setBrush(QBrush(bgc)); | 61 | p->setBrush(QBrush(bgc)); |
62 | p->drawRect(xmin,ymin,xwidth,yheight); | 62 | p->drawRect(xmin,ymin,xwidth,yheight); |
63 | 63 | ||
64 | } | 64 | } |
65 | //**************************************************************************** | 65 | //**************************************************************************** |
66 | void FretBoard::paintFrets(QPainter* p) | 66 | void FretBoard::paintFrets(QPainter* p) |
67 | { | 67 | { |
68 | //draw frets | 68 | //draw frets |
69 | p->setPen(fretpen); | 69 | p->setPen(fretpen); |
70 | p->setBrush(markerbrush); | 70 | p->setBrush(markerbrush); |
71 | fretdist=(double)(xwidth)/(double)(inst.noOfFrets()); | 71 | fretdist=(double)(xwidth)/(double)(inst.noOfFrets()); |
72 | 72 | ||
73 | int markerwidth = (int)(fretdist/4.0); | 73 | int markerwidth = (int)(fretdist/4.0); |
74 | if(markerwidth>5) | 74 | if(markerwidth>5) |
75 | markerwidth=5; | 75 | markerwidth=5; |
76 | else if(markerwidth<2) | 76 | else if(markerwidth<2) |
77 | markerwidth=2; | 77 | markerwidth=2; |
78 | 78 | ||
79 | for(int f=0;f<=inst.noOfFrets();f++) | 79 | for(int f=0;f<=inst.noOfFrets();f++) |
80 | { | 80 | { |
81 | int fretpos=(int)(fretdist*f); | 81 | int fretpos=(int)(fretdist*f); |
82 | p->drawLine(fretpos+xmin,ymin,fretpos+xmin,ymax); | 82 | p->drawLine(fretpos+xmin,ymin,fretpos+xmin,ymax); |
83 | 83 | ||
84 | int above_octave=f%12; | 84 | int above_octave=f%12; |
85 | int octave=(f-above_octave)/12; | 85 | int octave=(f-above_octave)/12; |
86 | int marker=f-12*octave; | 86 | int marker=f-12*octave; |
87 | 87 | ||
88 | 88 | ||
89 | if(marker==5 || marker==7 || marker==9) | 89 | if(marker==5 || marker==7 || marker==9) |
90 | { | 90 | { |
91 | p->drawEllipse(fretpos+xmin,ymax+ymargin,markerwidth,markerwidth); | 91 | p->drawEllipse(fretpos+xmin,ymax+ymargin,markerwidth,markerwidth); |
92 | } | 92 | } |
93 | else if(marker==0 && f!=0) | 93 | else if(marker==0 && f!=0) |
94 | { | 94 | { |
95 | p->drawEllipse(fretpos+xmin,ymax+ymargin+2*markerwidth,markerwidth,markerwidth); | 95 | p->drawEllipse(fretpos+xmin,ymax+ymargin+2*markerwidth,markerwidth,markerwidth); |
96 | p->drawEllipse(fretpos+xmin,ymax+ymargin-2*markerwidth,markerwidth,markerwidth); | 96 | p->drawEllipse(fretpos+xmin,ymax+ymargin-2*markerwidth,markerwidth,markerwidth); |
97 | } | 97 | } |
98 | 98 | ||
99 | } | 99 | } |
100 | } | 100 | } |
101 | //**************************************************************************** | 101 | //**************************************************************************** |
102 | void FretBoard::paintStrings(QPainter* p) | 102 | void 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 | //**************************************************************************** |
119 | void FretBoard::paintScale(QPainter* p) | 119 | void 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 | //**************************************************************************** |