X-Git-Url: https://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fcinelerra%2Fscopewindow.C;h=6f34a1555e1267556aae30c98da7ea0d795f7def;hb=26d01a213db5d4f6ee57224cc9a9ea37bd74318c;hp=d02a473bf561a8bc96db28991f2d7f1b8b3b8284;hpb=fd310b768dfc78c91a6ddc26b9a25914e5b248d7;p=goodguy%2Fcinelerra.git diff --git a/cinelerra-5.1/cinelerra/scopewindow.C b/cinelerra-5.1/cinelerra/scopewindow.C index d02a473b..6f34a155 100644 --- a/cinelerra-5.1/cinelerra/scopewindow.C +++ b/cinelerra-5.1/cinelerra/scopewindow.C @@ -455,6 +455,7 @@ void ScopeGUI::reset() frame_w = 1; use_smooth = 1; use_refresh = 0; + use_release = 0; use_wave_gain = 5; use_vect_gain = 5; use_hist = 0; @@ -919,6 +920,7 @@ void ScopeGUI::process(VFrame *output_frame) void ScopeGUI::update_toggles() { scope_menu->update_toggles(); + settings->update_toggles(); } ScopePanel::ScopePanel(ScopeGUI *gui, int x, int y, int w, int h) @@ -1297,7 +1299,11 @@ int ScopeSettingOn::handle_event() break; case SCOPE_REFRESH: gui->use_refresh = v; + gui->use_release = 0; break; + case SCOPE_RELEASE: + gui->use_release = v; + gui->use_refresh = 0; } gui->toggle_event(); gui->update_toggles(); @@ -1307,9 +1313,11 @@ int ScopeSettingOn::handle_event() } ScopeSettings::ScopeSettings(ScopeGUI *gui, int x, int y) - : BC_PopupMenu(x, y, xS(125), _("Settings")) + : BC_PopupMenu(x, y, xS(150), _("Settings")) { this->gui = gui; + refresh_on = 0; + release_on = 0; } void ScopeSettings::create_objects() @@ -1319,10 +1327,13 @@ void ScopeSettings::create_objects() smooth_on->set_checked(gui->use_smooth); if( gui->use_refresh >= 0 ) { add_item(refresh_on = - new ScopeSettingOn(this, _("Realtime"), SCOPE_REFRESH)); + new ScopeSettingOn(this, _("Refresh on Stop"), SCOPE_REFRESH)); + add_item(release_on = + new ScopeSettingOn(this, _("Refresh on Release"), SCOPE_RELEASE)); refresh_on->set_checked(gui->use_refresh); + release_on->set_checked(gui->use_release); } - add_item(new BC_MenuItem(_("-Graticule-"))); + add_item(new BC_MenuItem(_("-VectorWheel Grids-"))); gui->grat_paths.remove_all_objects(); ScopeGratItem *item; @@ -1346,6 +1357,14 @@ void ScopeSettings::create_objects() } } +void ScopeSettings::update_toggles() +{ + if( refresh_on ) + refresh_on->set_checked(gui->use_refresh); + if( release_on ) + release_on->set_checked(gui->use_release); +} + ScopeGratItem::ScopeGratItem(ScopeSettings *settings, const char *text, int idx) : BC_MenuItem(text) {