Rev 2005 | Rev 2009 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
| Rev 2005 | Rev 2006 | ||
|---|---|---|---|
| Line 45... | Line 45... | ||
| 45 | ni.octave += o; |
45 | ni.octave += o; |
| 46 | calc_note_freq (i, si); |
46 | calc_note_freq (i, si); |
| 47 | }
|
47 | }
|
| 48 | 48 | ||
| 49 | void range::stamplabel (const string& lbl, int L, int B, int T/*, int w, int h*/) { |
49 | void range::stamplabel (const string& lbl, int L, int B, int T/*, int w, int h*/) { |
| 50 | /*glColor3f (0, 0, 0);
|
- | |
| 51 | draw_block (L, B, w, h);
|
- | |
| 52 | draw_block (L, T, w, h);*/
|
- | |
| 53 | glColor3f (1, 1, 1); |
50 | glColor3f (1, 1, 1); |
| 54 | draw_string (lbl, L, B); |
51 | draw_string (lbl, L, B); |
| 55 | draw_string (lbl, L, T); |
52 | draw_string (lbl, L, T); |
| 56 | }
|
53 | }
|
| 57 | 54 | ||
| Line 68... | Line 65... | ||
| 68 | pts[6]=L; pts[7]=extents.top; |
65 | pts[6]=L; pts[7]=extents.top; |
| 69 | glVertexPointer (2, GL_INT, 0, pts); |
66 | glVertexPointer (2, GL_INT, 0, pts); |
| 70 | glDrawArrays (GL_LINE_LOOP, 0, 4); |
67 | glDrawArrays (GL_LINE_LOOP, 0, 4); |
| 71 | 68 | ||
| 72 | string& n0 = notes[0].name; |
69 | string& n0 = notes[0].name; |
| 73 | //int w, h; get_char_width_height (n0, w, h);
|
- | |
| 74 | stamplabel (n0, L, B, T/*, w, h*/); |
70 | stamplabel (n0, L, B, T); |
| 75 | 71 | ||
| 76 | if (show_frequency) { |
72 | if (show_frequency) { |
| 77 | string& h0 = notes[0].hz_name; |
73 | string& h0 = notes[0].hz_name; |
| 78 | //get_char_width_height (h0, w, h);
|
- | |
| 79 | stamplabel (h0, L, B2, T2/*, w, h*/); |
74 | stamplabel (h0, L, B2, T2); |
| 80 | }
|
75 | }
|
| 81 | 76 | ||
| 82 | if (label == BOTH) { |
77 | if (label == BOTH) { |
| 83 | string& n1 = notes[1].name; |
78 | string& n1 = notes[1].name; |
| 84 | //get_char_width_height (n1, w, h);
|
- | |
| 85 | stamplabel (n1, R, B, T/* w, h*/); |
79 | stamplabel (n1, R, B, T); |
| 86 | if (show_frequency) { |
80 | if (show_frequency) { |
| 87 | string& h1 = notes[1].hz_name; |
81 | string& h1 = notes[1].hz_name; |
| 88 | //get_char_width_height (h1, w, h);
|
- | |
| 89 | stamplabel (h1, R, B2, T2/*, w, h*/); |
82 | stamplabel (h1, R, B2, T2); |
| 90 | }
|
83 | }
|
| 91 | }
|
84 | }
|
| 92 | 85 | ||
| 93 | }
|
86 | }
|
| 94 | 87 | ||