Rev 2302 | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 2302 | Rev 2304 | ||
---|---|---|---|
Line 37... | Line 37... | ||
37 | sprintf (lbuf1, "min %1.2f / max %1.2f", sample_t::lmin, sample_t::lmax); |
37 | sprintf (lbuf1, "min %1.2f / max %1.2f", sample_t::lmin, sample_t::lmax); |
38 | sprintf (rbuf1, "min %1.2f / max %1.2f", sample_t::rmin, sample_t::rmax); |
38 | sprintf (rbuf1, "min %1.2f / max %1.2f", sample_t::rmin, sample_t::rmax); |
39 | lr = 0; lg = lb = 1.0f; |
39 | lr = 0; lg = lb = 1.0f; |
40 | rr = rg = 1.0; rb = 0.0f; |
40 | rr = rg = 1.0; rb = 0.0f; |
41 | opacity = 1.0f; |
41 | opacity = 1.0f; |
- | 42 | distort = 0; |
|
42 | }
|
43 | }
|
43 | 44 | ||
44 | oscilloscope::~oscilloscope () { |
45 | oscilloscope::~oscilloscope () { |
45 | save (); |
46 | save (); |
46 | delete[] samples; |
47 | delete[] samples; |
Line 223... | Line 224... | ||
223 | int ly = int (l * win.height); |
224 | int ly = int (l * win.height); |
224 | int ry = int (r * win.height); |
225 | int ry = int (r * win.height); |
225 | 226 | ||
226 | // distortion is red
|
227 | // distortion is red
|
227 | //
|
228 | //
|
- | 229 | ||
228 | float l2 = l * l; |
230 | float l2 = l * l; |
229 | float lrr = lr, lgg = lg, lbb = lb; |
231 | float lrr = lr, lgg = lg, lbb = lb; |
- | 232 | ||
230 | if (l2 > 1.0f) {lrr = 1; lgg = 0; lbb = 0;} |
233 | if (l2 > 1.0f) {lrr = 1; lgg = 0; lbb = 0; distort = 1;} |
231 | 234 | ||
232 | float rrr = rr, rgg = rg, rbb = rb; |
235 | float rrr = rr, rgg = rg, rbb = rb; |
233 | float r2 = r * r; |
236 | float r2 = r * r; |
234 | if (r2 > 1.0f) {rrr = 1; rgg = 0; rbb = 0;} |
237 | if (r2 > 1.0f) {rrr = 1; rgg = 0; rbb = 0; distort = 1;} |
235 | 238 | ||
236 | vertices [vi] = x1; |
239 | vertices [vi] = x1; |
237 | vertices [vi+1] = y0; |
240 | vertices [vi+1] = y0; |
238 | vertices [vi+2] = x1; |
241 | vertices [vi+2] = x1; |
239 | vertices [vi+3] = y0 + ly; |
242 | vertices [vi+3] = y0 + ly; |
Line 275... | Line 278... | ||
275 | 278 | ||
276 | }
|
279 | }
|
277 | 280 | ||
278 | // draw L and R labels
|
281 | // draw L and R labels
|
279 | //
|
282 | //
|
280 | glColor3f (lr , lg, lb); |
283 | if (limit) glColor3f (1, 0, 0); else glColor3f (lr , lg, lb); |
281 | draw_string (lbuf1, leftx, lly, 0); |
284 | draw_string (lbuf1, leftx, lly, 0); |
282 | glBegin (GL_LINES); |
285 | glBegin (GL_LINES); |
283 | glVertex2i (leftx, win.midy); |
286 | glVertex2i (leftx, win.midy); |
284 | glVertex2i (rightx, win.midy); |
287 | glVertex2i (rightx, win.midy); |
285 | glEnd (); |
288 | glEnd (); |
286 | 289 | ||
287 | glColor3f (rr, rg, rb); |
290 | if (limit) glColor3f (1, 0, 0); else glColor3f (rr, rg, rb); |
288 | draw_string (rbuf1, rightx, lry, 0); |
291 | draw_string (rbuf1, rightx, lry, 0); |
289 | glBegin (GL_LINES); |
292 | glBegin (GL_LINES); |
290 | glVertex2i (rightx, win.midy); |
293 | glVertex2i (rightx, win.midy); |
291 | glVertex2i (endx, win.midy); |
294 | glVertex2i (endx, win.midy); |
292 | glEnd (); |
295 | glEnd (); |
293 | 296 | ||
- | 297 | //distort = 0;
|
|
- | 298 | ||
294 | fold.draw (); |
299 | fold.draw (); |
295 | 300 | ||
296 | }
|
301 | }
|
297 | 302 | ||
298 | void oscilloscope::set_folded (int f) { |
303 | void oscilloscope::set_folded (int f) { |