X-Git-Url: https://git.cinelerra-gg.org/git/?p=goodguy%2Fcinelerra.git;a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fscopewindow.C;h=b02206ab89d465467ac163e8dbe512a4b193f794;hp=25e386f414580e4d62b2573c9c0785f2bc62f3c8;hb=7ffa6954689f14a41a3bae7a0fdb3f2abeaa9679;hpb=b5bfe3e40a7255ae60a21d885587ada6e145e3d5 diff --git a/cinelerra-5.1/cinelerra/scopewindow.C b/cinelerra-5.1/cinelerra/scopewindow.C index 25e386f4..b02206ab 100644 --- a/cinelerra-5.1/cinelerra/scopewindow.C +++ b/cinelerra-5.1/cinelerra/scopewindow.C @@ -20,6 +20,7 @@ #include "bcsignals.h" #include "bccolors.h" +#include "boxblur.h" #include "clip.h" #include "cursors.h" #include "language.h" @@ -40,13 +41,25 @@ ScopeUnit::ScopeUnit(ScopeGUI *gui, this->gui = gui; } -void ScopeUnit::draw_point(unsigned char **rows, - int x, int y, int r, int g, int b) -{ - unsigned char *pixel = rows[y] + x * 4; - pixel[0] = b; - pixel[1] = g; - pixel[2] = r; + +#define incr_point(rows,h, iv,comp) { \ +if(iy >= 0 && iy < h) { \ + uint8_t *vp = rows[iy] + ix*3 + (comp); \ + int v = *vp+(iv); *vp = v>0xff ? 0xff : v; } \ +} +#define incr_points(rows,h, rv,gv,bv) { \ +if(iy >= 0 && iy < h) { \ + uint8_t *vp = rows[iy] + ix*3; \ + int v = *vp+(rv); *vp++ = v>0xff ? 0xff : v; \ + v = *vp+(gv); *vp++ = v>0xff ? 0xff : v; \ + v = *vp+(bv); *vp = v>0xff ? 0xff : v; } \ +} +#define clip_points(rows,h, rv,gv,bv) { \ +if(iy >= 0 && iy < h) { \ + uint8_t *vp = rows[iy] + ix*3; \ + int v = *vp+(rv); *vp++ = v>0xff ? 0xff : v<0 ? 0 : v; \ + v = *vp+(gv); *vp++ = v>0xff ? 0xff : v<0 ? 0 : v; \ + v = *vp+(bv); *vp = v>0xff ? 0xff : v<0 ? 0 : v; } \ } #define PROCESS_PIXEL(column) { \ @@ -56,7 +69,7 @@ void ScopeUnit::draw_point(unsigned char **rows, CLAMP(v_i, 0, TOTAL_BINS - 1); \ bins[3][v_i]++; \ } \ - else if(use_hist_parade) { \ + if(use_hist_parade) { \ int r_i = (r - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \ int g_i = (g - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \ int b_i = (b - FLOAT_MIN) * (TOTAL_BINS / (FLOAT_MAX - FLOAT_MIN)); \ @@ -69,68 +82,85 @@ void ScopeUnit::draw_point(unsigned char **rows, } \ /* Calculate waveform */ \ if(use_wave || use_wave_parade) { \ - int ix = (column) * wave_w / w; \ - if(ix >= 0 && ix < wave_w) { \ - if(use_wave_parade) { \ - int iy = wave_h - (int)((r - FLOAT_MIN) / \ + int ix = column * wave_w / dat_w; \ + if(ix >= 0 && ix < wave_w-1) { \ + if(use_wave_parade > 0) { \ + ix /= 3; \ + int iy = wave_h - ((r - FLOAT_MIN) / \ (FLOAT_MAX - FLOAT_MIN) * wave_h); \ - if(iy >= 0 && iy < wave_h) \ - draw_point(waveform_rows, ix / 3, iy, 0xff, 0x0, 0x0); \ - iy = wave_h - (int)((g - FLOAT_MIN) / \ + incr_point(waveform_rows,wave_h, winc,0); \ + ix += wave_w/3; \ + iy = wave_h - ((g - FLOAT_MIN) / \ (FLOAT_MAX - FLOAT_MIN) * wave_h); \ - if(iy >= 0 && iy < wave_h) \ - draw_point(waveform_rows, ix / 3 + wave_w / 3, iy, 0x0, 0xff, 0x0); \ - iy = wave_h - (int)((b - FLOAT_MIN) / \ + incr_point(waveform_rows,wave_h, winc,1); \ + ix += wave_w/3; \ + iy = wave_h - ((b - FLOAT_MIN) / \ (FLOAT_MAX - FLOAT_MIN) * wave_h); \ - if(iy >= 0 && iy < wave_h) \ - draw_point(waveform_rows, ix / 3 + wave_w / 3 * 2, iy, 0x0, 0x0, 0xff); \ + incr_point(waveform_rows,wave_h, winc,2); \ } \ - else { \ - int iy = wave_h - (int)((intensity - FLOAT_MIN) / \ + else if(use_wave_parade < 0) { \ + int iy = wave_h - ((r - FLOAT_MIN) / \ + (FLOAT_MAX - FLOAT_MIN) * wave_h); \ + clip_points(waveform_rows,wave_h, winc,-winc,-winc); \ + iy = wave_h - ((g - FLOAT_MIN) / \ (FLOAT_MAX - FLOAT_MIN) * wave_h); \ - if(iy >= 0 && iy < wave_h) \ - draw_point(waveform_rows, ix, iy, 0xff, 0xff, 0xff); \ + clip_points(waveform_rows,wave_h, -winc,winc,-winc); \ + iy = wave_h - ((b - FLOAT_MIN) / \ + (FLOAT_MAX - FLOAT_MIN) * wave_h); \ + clip_points(waveform_rows,wave_h, -winc,-winc,winc); \ + } \ + else { float yinc = 3*winc; \ + float rinc = yinc*(r-FLOAT_MIN) / (FLOAT_MAX-FLOAT_MIN) + 3; \ + float ginc = yinc*(g-FLOAT_MIN) / (FLOAT_MAX-FLOAT_MIN) + 3; \ + float binc = yinc*(b-FLOAT_MIN) / (FLOAT_MAX-FLOAT_MIN) + 3; \ + int iy = wave_h - ((intensity - FLOAT_MIN) / \ + (FLOAT_MAX - FLOAT_MIN) * wave_h); \ + incr_points(waveform_rows,wave_h, rinc, ginc, binc); \ } \ } \ } \ /* Calculate vectorscope */ \ if(use_vector) { \ - float adjacent = cos((h + 90) / 360 * 2 * M_PI); \ - float opposite = sin((h + 90) / 360 * 2 * M_PI); \ + float th = 90 - h; \ + if( th < 0 ) th += 360; \ + double t = TO_RAD(th); \ + float adjacent = -cos(t), opposite = sin(t); \ int ix = vector_w / 2 + adjacent * (s) / (FLOAT_MAX) * radius; \ - int y = vector_h / 2 - opposite * (s) / (FLOAT_MAX) * radius; \ + int iy = vector_h / 2 - opposite * (s) / (FLOAT_MAX) * radius; \ CLAMP(ix, 0, vector_w - 1); \ - CLAMP(y, 0, vector_h - 1); \ /* Get color with full saturation & value */ \ float r_f, g_f, b_f; \ + if( (h=h-90) < 0 ) h += 360; \ HSV::hsv_to_rgb(r_f, g_f, b_f, h, s, 1); \ - draw_point(vector_rows, ix, y, \ - (int)(CLIP(r_f, 0, 1) * 255), \ - (int)(CLIP(g_f, 0, 1) * 255), \ - (int)(CLIP(b_f, 0, 1) * 255)); \ + int rv = CLIP(r_f, 0, 1) * vinc + 3; \ + int gv = CLIP(g_f, 0, 1) * vinc + 3; \ + int bv = CLIP(b_f, 0, 1) * vinc + 3; \ + incr_points(vector_rows,vector_h, rv,gv,bv); \ } \ } -#define PROCESS_RGB_PIXEL(column, max) { \ - r = (float)*row++ / max; \ - g = (float)*row++ / max; \ - b = (float)*row++ / max; \ +#define PROCESS_RGB_PIXEL(type,max, column) { \ + type *rp = (type *)row; \ + r = (float)rp[0] / max; \ + g = (float)rp[1] / max; \ + b = (float)rp[2] / max; \ HSV::rgb_to_hsv(r, g, b, h, s, v); \ intensity = v; \ PROCESS_PIXEL(column) \ } -#define PROCESS_BGR_PIXEL(column, max) { \ - b = (float)*row++ / max; \ - g = (float)*row++ / max; \ - r = (float)*row++ / max; \ +#define PROCESS_BGR_PIXEL(type,max, column) { \ + type *rp = (type *)row; \ + b = (float)rp[0] / max; \ + g = (float)rp[1] / max; \ + r = (float)rp[2] / max; \ HSV::rgb_to_hsv(r, g, b, h, s, v); \ intensity = v; \ PROCESS_PIXEL(column) \ } #define PROCESS_YUV_PIXEL(column, y_in, u_in, v_in) { \ - YUV::yuv.yuv_to_rgb_f(r, g, b, (float)y_in / 255, (float)(u_in - 0x80) / 255, (float)(v_in - 0x80) / 255); \ + YUV::yuv.yuv_to_rgb_f(r, g, b, y_in, u_in, v_in); \ HSV::rgb_to_hsv(r, g, b, h, s, v); \ intensity = v; \ PROCESS_PIXEL(column) \ @@ -148,119 +178,146 @@ void ScopeUnit::process_package(LoadPackage *package) int use_vector = gui->use_vector; int use_wave = gui->use_wave; int use_wave_parade = gui->use_wave_parade; - BC_Bitmap *waveform_bitmap = gui->waveform_bitmap; - BC_Bitmap *vector_bitmap = gui->vector_bitmap; - int wave_h = waveform_bitmap->get_h(); - int wave_w = waveform_bitmap->get_w(); - int vector_h = vector_bitmap->get_h(); - int vector_w = vector_bitmap->get_w(); - - int w = gui->output_frame->get_w(); + VFrame *waveform_vframe = gui->waveform_vframe; + VFrame *vector_vframe = gui->vector_vframe; + int wave_h = waveform_vframe->get_h(); + int wave_w = waveform_vframe->get_w(); + int vector_h = vector_vframe->get_h(); + int vector_w = vector_vframe->get_w(); + int dat_w = gui->data_frame->get_w(); + int dat_h = gui->data_frame->get_h(); + int winc = (wave_w * wave_h) / (dat_w * dat_h); + if( use_wave_parade ) winc *= 3; + winc += 2; winc *= gui->use_wave_gain; + int vinc = 3*(vector_w * vector_h) / (dat_w * dat_h) + 2; + vinc *= gui->use_vect_gain; float radius = MIN(gui->vector_w / 2, gui->vector_h / 2); - unsigned char **waveform_rows = waveform_bitmap->get_row_pointers(); - unsigned char **vector_rows = vector_bitmap->get_row_pointers(); - unsigned char **rows = gui->output_frame->get_rows(); + uint8_t **waveform_rows = waveform_vframe->get_rows(); + uint8_t **vector_rows = vector_vframe->get_rows(); + uint8_t **rows = gui->data_frame->get_rows(); - switch( gui->output_frame->get_color_model() ) { + switch( gui->data_frame->get_color_model() ) { case BC_RGB888: for( int y=pkg->row1; yrow2; ++y ) { - unsigned char *row = rows[y]; - for( int x=0; xrow1; yrow2; ++y ) { - unsigned char *row = rows[y]; - for( int x=0; xrow1; yrow2; ++y ) { + uint8_t *row = rows[y]; + for( int x=0; xrow1; yrow2; ++y ) { + uint8_t *row = rows[y]; + for( int x=0; xrow1; yrow2; ++y ) { - unsigned char *row = rows[y]; - for( int x=0; xrow1; yrow2; ++y ) { - unsigned char *row = rows[y]; - for( int x=0; xrow1; yrow2; ++y ) { - float *row = (float*)rows[y]; - for( int x=0; xrow1; yrow2; ++y ) { - float *row = (float*)rows[y]; - for( int x=0; xrow1; yrow2; ++y ) { - unsigned char *row = rows[y]; - for( int x=0; xrow1; yrow2; ++y ) { - unsigned char *row = rows[y]; - for( int x=0; xoutput_frame->get_y(); - unsigned char *up = gui->output_frame->get_u(); - unsigned char *vp = gui->output_frame->get_v(); + uint8_t *yp = gui->data_frame->get_y(); + uint8_t *up = gui->data_frame->get_u(); + uint8_t *vp = gui->data_frame->get_v(); for( int y=pkg->row1; yrow2; ++y ) { - unsigned char *y_row = yp + y * w; - unsigned char *u_row = up + (y / 2) * (w / 2); - unsigned char *v_row = vp + (y / 2) * (w / 2); - for( int x=0; xrow1; yrow2; ++y ) { - unsigned char *row = rows[y]; - for( int x=0; xoutput_frame->get_color_model()); + __LINE__, gui->data_frame->get_color_model()); break; } } @@ -279,7 +336,7 @@ ScopeEngine::~ScopeEngine() void ScopeEngine::init_packages() { - int y = 0, h = gui->output_frame->get_h(); + int y = 0, h = gui->data_frame->get_h(); for( int i=0,n=LoadServer::get_total_packages(); irow1 = y; @@ -314,9 +371,8 @@ void ScopeEngine::process() for(int i=0,n=get_total_clients(); ibins[j][k] += unit->bins[j][k]; - } + int *bp = gui->bins[j], *up = unit->bins[j]; + for( int k=TOTAL_BINS; --k>=0; ++bp,++up ) *bp += *up; } } } @@ -331,6 +387,7 @@ ScopeGUI::ScopeGUI(Theme *theme, this->y = y; this->w = w; this->h = h; + this->temp_frame = 0; this->theme = theme; this->cpus = cpus; reset(); @@ -343,24 +400,37 @@ ScopeGUI::ScopeGUI(PluginClient *plugin, int w, int h) this->y = get_y(); this->w = w; this->h = h; + this->temp_frame = 0; this->theme = plugin->get_theme(); this->cpus = plugin->PluginClient::smp + 1; + wave_slider = 0; + vect_slider = 0; reset(); } ScopeGUI::~ScopeGUI() { - delete waveform_bitmap; - delete vector_bitmap; + delete waveform_vframe; + delete vector_vframe; delete engine; + delete box_blur; + delete temp_frame; + delete wave_slider; + delete vect_slider; } void ScopeGUI::reset() { + output_frame = 0; + data_frame = 0; frame_w = 1; - waveform_bitmap = 0; - vector_bitmap = 0; + use_smooth = 1; + use_wave_gain = 5; + use_vect_gain = 5; + waveform_vframe = 0; + vector_vframe = 0; engine = 0; + box_blur = 0; use_hist = 0; use_wave = 1; use_vector = 1; @@ -369,7 +439,8 @@ void ScopeGUI::reset() waveform = 0; vectorscope = 0; histogram = 0; - wave_w = wave_h = vector_w = vector_h = 0; + wave_w = wave_h = 0; + vector_w = vector_h = 0; } @@ -384,65 +455,67 @@ void ScopeGUI::create_objects() lock_window("ScopeGUI::create_objects"); int x = theme->widget_border; int y = theme->widget_border; - add_subwindow(hist_on = new ScopeToggle(this, x, y, &use_hist)); - x += hist_on->get_w() + theme->widget_border; - - add_subwindow(hist_parade_on = new ScopeToggle(this, x, y, &use_hist_parade)); - x += hist_parade_on->get_w() + theme->widget_border; - - add_subwindow(waveform_on = new ScopeToggle(this, x, y, &use_wave)); - x += waveform_on->get_w() + theme->widget_border; - add_subwindow(waveform_parade_on = new ScopeToggle(this, x, y, &use_wave_parade)); - x += waveform_parade_on->get_w() + theme->widget_border; - - add_subwindow(vector_on = new ScopeToggle(this, x, y, &use_vector)); - x += vector_on->get_w() + theme->widget_border; - + add_subwindow(smooth = new ScopeSmooth(this, x, y)); + y += smooth->get_h() + theme->widget_border; + add_subwindow(scope_menu = new ScopeMenu(this, x, y)); + scope_menu->create_objects(); + x += scope_menu->get_w() + theme->widget_border; add_subwindow(value_text = new BC_Title(x, y, "")); - x += value_text->get_w() + theme->widget_border; - - y += vector_on->get_h() + theme->widget_border; + y += scope_menu->get_h() + theme->widget_border; create_panels(); - update_toggles(); show_window(); + update_scope(); unlock_window(); } void ScopeGUI::create_panels() { calculate_sizes(get_w(), get_h()); + int slider_w = xS(100); if( (use_wave || use_wave_parade) ) { + int px = wave_x + wave_w - slider_w - xS(5); + int py = wave_y - ScopeGain::calculate_h() - yS(5); if( !waveform ) { add_subwindow(waveform = new ScopeWaveform(this, wave_x, wave_y, wave_w, wave_h)); waveform->create_objects(); + wave_slider = new ScopeWaveSlider(this, px, py, slider_w); + wave_slider->create_objects(); } else { waveform->reposition_window( wave_x, wave_y, wave_w, wave_h); waveform->clear_box(0, 0, wave_w, wave_h); + wave_slider->reposition_window(px, py); } } else if( !(use_wave || use_wave_parade) && waveform ) { - delete waveform; waveform = 0; + delete waveform; waveform = 0; + delete wave_slider; wave_slider = 0; } if( use_vector ) { + int vx = vector_x + vector_w - slider_w - xS(5); + int vy = vector_y - ScopeGain::calculate_h() - yS(5); if( !vectorscope ) { add_subwindow(vectorscope = new ScopeVectorscope(this, vector_x, vector_y, vector_w, vector_h)); vectorscope->create_objects(); + vect_slider = new ScopeVectSlider(this, vx, vy, slider_w); + vect_slider->create_objects(); } else { vectorscope->reposition_window( vector_x, vector_y, vector_w, vector_h); vectorscope->clear_box(0, 0, vector_w, vector_h); + vect_slider->reposition_window(vx, vy); } } else if( !use_vector && vectorscope ) { delete vectorscope; vectorscope = 0; + delete vect_slider; vect_slider = 0; } if( (use_hist || use_hist_parade) ) { @@ -463,7 +536,7 @@ void ScopeGUI::create_panels() delete histogram; histogram = 0; } - allocate_bitmaps(); + allocate_vframes(); clear_points(0); draw_overlays(1, 1, 0); } @@ -491,6 +564,7 @@ void ScopeGUI::toggle_event() void ScopeGUI::calculate_sizes(int w, int h) { int margin = theme->widget_border; + int menu_h = smooth->get_h() + scope_menu->get_h() + margin * 3; int text_w = get_text_width(SMALLFONT, "000") + margin * 2; int total_panels = ((use_hist || use_hist_parade) ? 1 : 0) + ((use_wave || use_wave_parade) ? 1 : 0) + @@ -504,7 +578,7 @@ void ScopeGUI::calculate_sizes(int w, int h) if( use_vector ) { vector_x = w - panel_w + text_w; vector_w = w - margin - vector_x; - vector_y = vector_on->get_h() + margin * 2; + vector_y = menu_h; vector_h = h - vector_y - margin; if( vector_w > vector_h ) { @@ -519,7 +593,7 @@ void ScopeGUI::calculate_sizes(int w, int h) // Histogram is always 1st panel if( use_hist || use_hist_parade ) { hist_x = x; - hist_y = vector_on->get_h() + margin * 2; + hist_y = menu_h; hist_w = panel_w - margin; hist_h = h - hist_y - margin; @@ -529,7 +603,7 @@ void ScopeGUI::calculate_sizes(int w, int h) if( use_wave || use_wave_parade ) { wave_x = x + text_w; - wave_y = vector_on->get_h() + margin * 2; + wave_y = menu_h; wave_w = panel_w - margin - text_w; wave_h = h - wave_y - margin; } @@ -537,21 +611,21 @@ void ScopeGUI::calculate_sizes(int w, int h) } -void ScopeGUI::allocate_bitmaps() +void ScopeGUI::allocate_vframes() { - if(waveform_bitmap) delete waveform_bitmap; - if(vector_bitmap) delete vector_bitmap; + if(waveform_vframe) delete waveform_vframe; + if(vector_vframe) delete vector_vframe; int w, h; -//printf("ScopeGUI::allocate_bitmaps %d %d %d %d %d\n", __LINE__, +//printf("ScopeGUI::allocate_vframes %d %d %d %d %d\n", __LINE__, // wave_w, wave_h, vector_w, vector_h); int xs16 = xS(16), ys16 = yS(16); w = MAX(wave_w, xs16); h = MAX(wave_h, ys16); - waveform_bitmap = new_bitmap(w, h); + waveform_vframe = new VFrame(w, h, BC_RGB888); w = MAX(vector_w, xs16); h = MAX(vector_h, ys16); - vector_bitmap = new_bitmap(w, h); + vector_vframe = new VFrame(w, h, BC_RGB888); } @@ -561,10 +635,14 @@ int ScopeGUI::resize_event(int w, int h) this->w = w; this->h = h; calculate_sizes(w, h); + int margin = theme->widget_border; if( waveform ) { waveform->reposition_window(wave_x, wave_y, wave_w, wave_h); waveform->clear_box(0, 0, wave_w, wave_h); + int px = wave_x + wave_w - wave_slider->get_w() - margin; + int py = wave_y - wave_slider->get_h() - margin; + wave_slider->reposition_window(px, py); } if( histogram ) { @@ -575,10 +653,14 @@ int ScopeGUI::resize_event(int w, int h) if( vectorscope ) { vectorscope->reposition_window(vector_x, vector_y, vector_w, vector_h); vectorscope->clear_box(0, 0, vector_w, vector_h); + int vx = vector_x + vector_w - vect_slider->get_w() - margin; + int vy = vector_y - vect_slider->get_h() - margin; + vect_slider->reposition_window(vx, vy); } - allocate_bitmaps(); + allocate_vframes(); clear_points(0); + update_scope(); draw_overlays(1, 1, 1); return 1; } @@ -596,8 +678,9 @@ void ScopeGUI::draw_overlays(int overlays, int borders, int flush) { BC_Resources *resources = BC_WindowBase::get_resources(); int text_color = GREEN; + int dark_color = (text_color>>2) & 0x3f3f3f; if( resources->bg_color == 0xffffff ) { - text_color = BLACK; + text_color = dark_color; } if( overlays && borders ) { @@ -622,55 +705,48 @@ void ScopeGUI::draw_overlays(int overlays, int borders, int flush) // Waveform overlay if( waveform && (use_wave || use_wave_parade) ) { - set_color(text_color); for( int i=0; i<=WAVEFORM_DIVISIONS; ++i ) { int y = wave_h * i / WAVEFORM_DIVISIONS; int text_y = y + wave_y + get_text_ascent(SMALLFONT) / 2; CLAMP(text_y, waveform->get_y() + get_text_ascent(SMALLFONT), waveform->get_y() + waveform->get_h() - 1); char string[BCTEXTLEN]; - sprintf(string, "%d", (int)((FLOAT_MAX - + sprintf(string, "%d", (int)lround((FLOAT_MAX - i * (FLOAT_MAX - FLOAT_MIN) / WAVEFORM_DIVISIONS) * 100)); int text_x = wave_x - get_text_width(SMALLFONT, string) - theme->widget_border; + set_color(text_color); draw_text(text_x, text_y, string); - CLAMP(y, 0, waveform->get_h() - 1); + set_color(dark_color); waveform->draw_line(0, y, wave_w, y); - //waveform->draw_rectangle(0, 0, wave_w, wave_h); + waveform->draw_rectangle(0, 0, wave_w, wave_h); } set_line_dashes(0); waveform->draw_point(); set_line_dashes(1); waveform->flash(0); } - - // Vectorscope overlay if( vectorscope && use_vector ) { - set_color(text_color); + set_line_dashes(1); int radius = MIN(vector_w / 2, vector_h / 2); for( int i=1; i<=VECTORSCOPE_DIVISIONS; i+=2 ) { - int x = vector_w / 2 - radius * i / VECTORSCOPE_DIVISIONS; int y = vector_h / 2 - radius * i / VECTORSCOPE_DIVISIONS; int text_y = y + vector_y + get_text_ascent(SMALLFONT) / 2; - int w = radius * i / VECTORSCOPE_DIVISIONS * 2; - int h = radius * i / VECTORSCOPE_DIVISIONS * 2; + set_color(text_color); char string[BCTEXTLEN]; - sprintf(string, "%d", (int)((FLOAT_MAX / VECTORSCOPE_DIVISIONS * i) * 100)); int text_x = vector_x - get_text_width(SMALLFONT, string) - theme->widget_border; draw_text(text_x, text_y, string); -//printf("ScopeGUI::draw_overlays %d %d %d %s\n", __LINE__, text_x, text_y, string); - + int x = vector_w / 2 - radius * i / VECTORSCOPE_DIVISIONS; + int w = radius * i / VECTORSCOPE_DIVISIONS * 2; + int h = radius * i / VECTORSCOPE_DIVISIONS * 2; + if( i+2 > VECTORSCOPE_DIVISIONS ) + set_line_dashes(0); + set_color(dark_color); vectorscope->draw_circle(x, y, w, h); - //vectorscope->draw_rectangle(0, 0, vector_w, vector_h); } - // vectorscope->draw_circle(vector_w / 2 - radius, - // vector_h / 2 - radius, - // radius * 2, - // radius * 2); - - set_line_dashes(0); + set_color(text_color); vectorscope->draw_point(); set_line_dashes(1); vectorscope->flash(0); @@ -705,34 +781,38 @@ void ScopeGUI::process(VFrame *output_frame) { lock_window("ScopeGUI::process"); this->output_frame = output_frame; - frame_w = output_frame->get_w(); + int ow = output_frame->get_w(), oh = output_frame->get_h(); + if( use_smooth ) { + VFrame::get_temp(temp_frame, ow, oh, BC_RGB161616); + temp_frame->transfer_from(output_frame); + if( !box_blur ) box_blur = new BoxBlur(cpus); + box_blur->blur(temp_frame, temp_frame, 2, 2); + data_frame = temp_frame; + } + else + data_frame = output_frame; + frame_w = data_frame->get_w(); //float radius = MIN(vector_w / 2, vector_h / 2); - bzero(waveform_bitmap->get_data(), waveform_bitmap->get_data_size()); - bzero(vector_bitmap->get_data(), vector_bitmap->get_data_size()); + bzero(waveform_vframe->get_data(), waveform_vframe->get_data_size()); + bzero(vector_vframe->get_data(), vector_vframe->get_data_size()); engine->process(); if( histogram ) histogram->draw(0, 0); if( waveform ) - waveform->draw_bitmap(waveform_bitmap, 1, 0, 0); + waveform->draw_vframe(waveform_vframe); if( vectorscope ) - vectorscope->draw_bitmap(vector_bitmap, 1, 0, 0); + vectorscope->draw_vframe(vector_vframe); draw_overlays(1, 0, 1); unlock_window(); } - void ScopeGUI::update_toggles() { - hist_parade_on->update(use_hist_parade); - hist_on->update(use_hist); - waveform_parade_on->update(use_wave_parade); - waveform_on->update(use_wave); - vector_on->update(use_vector); + scope_menu->update_toggles(); } - ScopePanel::ScopePanel(ScopeGUI *gui, int x, int y, int w, int h) : BC_SubWindow(x, y, w, h, BLACK) { @@ -823,7 +903,6 @@ void ScopeWaveform::update_point(int x, int y) } float value = ((float)get_h() - y) / get_h() * (FLOAT_MAX - FLOAT_MIN) + FLOAT_MIN; - char string[BCTEXTLEN]; sprintf(string, "X: %d Value: %.3f", frame_x, value); gui->value_text->update(string, 0); @@ -956,30 +1035,29 @@ void ScopeHistogram::update_point(int x, int y) void ScopeHistogram::draw_mode(int mode, int color, int y, int h) { // Highest of all bins - int normalize = 0; - for( int i=0; ibins[mode][i] > normalize) normalize = gui->bins[mode][i]; - } + int normalize = 1, w = get_w(); + int *bin = gui->bins[mode], v; + for( int i=0; i normalize ) normalize = v; + double norm = normalize>1 ? log(normalize) : 1e-4; + double vnorm = h / norm; set_color(color); - for( int i=0; ibins[mode][k], max); - } + for(int i=accum_start; i max ) max = v; // max = max * h / normalize; - max = (int)(log(max) / log(normalize) * h); - draw_line(i, y + h - max, i, y + h); + max = log(max) * vnorm; + draw_line(x,y+h - max, x,y+h); } } - void ScopeHistogram::draw(int flash, int flush) { clear_box(0, 0, get_w(), get_h()); - if( gui->use_hist_parade ) { draw_mode(0, 0xff0000, 0, get_h() / 3); draw_mode(1, 0x00ff00, get_h() / 3, get_h() / 3); @@ -993,68 +1071,181 @@ void ScopeHistogram::draw(int flash, int flush) if(flush) this->flush(); } -ScopeToggle::ScopeToggle(ScopeGUI *gui, int x, int y, int *value) - : BC_Toggle(x, y, get_image_set(gui, value), *value) -{ - this->gui = gui; - this->value = value; - if( value == &gui->use_hist_parade ) { - set_tooltip(_("Histogram Parade")); - } - else if( value == &gui->use_hist ) - { - set_tooltip(_("Histogram")); - } - else if( value == &gui->use_wave_parade ) { - set_tooltip(_("Waveform Parade")); - } - else if( value == &gui->use_wave ) { - set_tooltip(_("Waveform")); - } - else { - set_tooltip(_("Vectorscope")); - } -} -VFrame** ScopeToggle::get_image_set(ScopeGUI *gui, int *value) +ScopeScopesOn::ScopeScopesOn(ScopeMenu *scope_menu, const char *text, int id) + : BC_MenuItem(text) { - if( value == &gui->use_hist_parade ) { - return gui->theme->get_image_set("histogram_rgb_toggle"); - } - else if( value == &gui->use_hist ) { - return gui->theme->get_image_set("histogram_toggle"); - } - else if( value == &gui->use_wave_parade ) { - return gui->theme->get_image_set("waveform_rgb_toggle"); - } - else if( value == &gui->use_wave ) { - return gui->theme->get_image_set("waveform_toggle"); - } - else { - return gui->theme->get_image_set("scope_toggle"); - } + this->scope_menu = scope_menu; + this->id = id; } -int ScopeToggle::handle_event() +int ScopeScopesOn::handle_event() { - *value = get_value(); - if( value == &gui->use_hist_parade ) { - if( get_value() ) gui->use_hist = 0; - } - else if( value == &gui->use_hist ) - { - if( get_value() ) gui->use_hist_parade = 0; - } - else if( value == &gui->use_wave_parade ) { - if( get_value() ) gui->use_wave = 0; - } - else if( value == &gui->use_wave ) { - if( get_value() ) gui->use_wave_parade = 0; + int v = get_checked() ? 0 : 1; + set_checked(v); + ScopeGUI *gui = scope_menu->gui; + switch( id ) { + case SCOPE_HISTOGRAM: + gui->use_hist = v; + if( v ) gui->use_hist_parade = 0; + break; + case SCOPE_HISTOGRAM_RGB: + gui->use_hist_parade = v; + if( v ) gui->use_hist = 0; + break; + case SCOPE_WAVEFORM: + gui->use_wave = v; + if( v ) gui->use_wave_parade = 0; + break; + case SCOPE_WAVEFORM_RGB: + gui->use_wave_parade = v; + if( v ) gui->use_wave = 0; + break; + case SCOPE_WAVEFORM_PLY: + gui->use_wave_parade = -v; + if( v ) gui->use_wave = 0; + break; + case SCOPE_VECTORSCOPE: + gui->use_vector = v; + break; } gui->toggle_event(); gui->update_toggles(); gui->create_panels(); + gui->update_scope(); gui->show_window(); return 1; } +ScopeMenu::ScopeMenu(ScopeGUI *gui, int x, int y) + : BC_PopupMenu(x, y, xS(100), _("Scopes")) +{ + this->gui = gui; +} + +void ScopeMenu::create_objects() +{ + add_item(hist_on = + new ScopeScopesOn(this, _("Histogram"), SCOPE_HISTOGRAM)); + add_item(hist_rgb_on = + new ScopeScopesOn(this, _("Histogram RGB"), SCOPE_HISTOGRAM_RGB)); + add_item(new BC_MenuItem("-")); + add_item(wave_on = + new ScopeScopesOn(this, _("Waveform"), SCOPE_WAVEFORM)); + add_item(wave_rgb_on = + new ScopeScopesOn(this, _("Waveform RGB"), SCOPE_WAVEFORM_RGB)); + add_item(wave_ply_on = + new ScopeScopesOn(this, _("Waveform ply"), SCOPE_WAVEFORM_PLY)); + add_item(new BC_MenuItem("-")); + add_item(vect_on = + new ScopeScopesOn(this, _("Vectorscope"), SCOPE_VECTORSCOPE)); +} + +void ScopeMenu::update_toggles() +{ + hist_on->set_checked(gui->use_hist); + hist_rgb_on->set_checked(gui->use_hist_parade); + wave_on->set_checked(gui->use_wave); + wave_rgb_on->set_checked(gui->use_wave_parade>0); + wave_ply_on->set_checked(gui->use_wave_parade<0); + vect_on->set_checked(gui->use_vector); +} + + +ScopeGainReset::ScopeGainReset(ScopeGain *gain, int x, int y) + : BC_Button(x, y, gain->gui->theme->get_image_set("reset_button")) +{ + this->gain = gain; +} + +int ScopeGainReset::calculate_w(BC_Theme *theme) +{ + VFrame *vfrm = *theme->get_image_set("reset_button"); + return vfrm->get_w(); +} + +int ScopeGainReset::handle_event() +{ + gain->slider->update(5); + return gain->handle_event(); +} + +ScopeGainSlider::ScopeGainSlider(ScopeGain *gain, int x, int y, int w) + : BC_ISlider(x, y, 0, w, w, 1, 9, *gain->value) +{ + this->gain = gain; +} + +int ScopeGainSlider::handle_event() +{ + return gain->handle_event(); +} + +ScopeGain::ScopeGain(ScopeGUI *gui, int x, int y, int w, int *value) +{ + this->gui = gui; + this->x = x; + this->y = y; + this->w = w; + this->value = value; + + slider = 0; + reset = 0; +} +ScopeGain::~ScopeGain() +{ + delete reset; + delete slider; +} + +int ScopeGain::calculate_h() +{ + return BC_ISlider::get_span(0); +} + +void ScopeGain::create_objects() +{ + reset_w = ScopeGainReset::calculate_w(gui->theme); + gui->add_subwindow(slider = new ScopeGainSlider(this, x, y, w-reset_w-xS(5))); + gui->add_subwindow(reset = new ScopeGainReset(this, x+w-reset_w, y)); +} + +int ScopeGain::handle_event() +{ + *value = slider->get_value(); + gui->update_scope(); + gui->toggle_event(); + return 1; +} + +void ScopeGain::reposition_window(int x, int y) +{ + this->x = x; this->y = y; + slider->reposition_window(x, y); + reset->reposition_window(x+w-reset_w, y); +} + +ScopeWaveSlider::ScopeWaveSlider(ScopeGUI *gui, int x, int y, int w) + : ScopeGain(gui, x, y, w, &gui->use_wave_gain) +{ +} + +ScopeVectSlider::ScopeVectSlider(ScopeGUI *gui, int x, int y, int w) + : ScopeGain(gui, x, y, w, &gui->use_vect_gain) +{ +} + +ScopeSmooth::ScopeSmooth(ScopeGUI *gui, int x, int y) + : BC_CheckBox(x, y, gui->use_smooth, _("Smooth")) +{ + this->gui = gui; +} + +int ScopeSmooth::handle_event() +{ + gui->use_smooth = get_value(); + gui->update_scope(); + gui->toggle_event(); + return 1; +} +