int EditPanel::calculate_w(MWindow *mwindow, int use_keyframe, int total_buttons)
{
- int result = 0;
- int button_w = mwindow->theme->get_image_set("ibeam")[0]->get_w();
- if( use_keyframe ) {
+ int button_w = xS(24); // mwindow->theme->get_image_set("meters")[0]->get_w();
+ int result = button_w * total_buttons;
+ if( use_keyframe )
result += 2*(button_w + mwindow->theme->toggle_margin);
- }
-
- result += button_w * total_buttons;
return result;
}
int EditPanel::calculate_h(MWindow *mwindow)
{
- return mwindow->theme->get_image_set("ibeam")[0]->get_h();
+ return mwindow->theme->get_image_set("meters")[0]->get_h();
}
void EditPanel::create_buttons()
x1 += paste->get_w();
}
- if( use_meters ) {
- if( meter_panel ) {
- meters = new MeterShow(mwindow, meter_panel, x1, y1);
- subwindow->add_subwindow(meters);
- x1 += meters->get_w();
- }
- else
- printf("EditPanel::create_objects: meter_panel == 0\n");
- }
-
if( use_labels ) {
labelbutton = new EditLabelbutton(mwindow, this, x1, y1);
subwindow->add_subwindow(labelbutton);
scope_dialog = new EditPanelScopeDialog(mwindow, this);
}
+ if( use_meters ) {
+ if( meter_panel ) {
+ meters = new MeterShow(mwindow, meter_panel, x1, y1);
+ subwindow->add_subwindow(meters);
+ x1 += meters->get_w();
+ }
+ else
+ printf("EditPanel::create_objects: meter_panel == 0\n");
+ }
+
if( use_commercial ) {
commercial = new EditCommercial(mwindow, this, x1, y1);
subwindow->add_subwindow(commercial);
x1 += paste->get_w();
}
- if( use_meters ) {
- meters->reposition_window(x1, y1);
- x1 += meters->get_w();
- }
-
if( use_labels ) {
labelbutton->reposition_window(x1, y1);
x1 += labelbutton->get_w();
scope->reposition_window(x1, y1-yS(1));
x1 += scope->get_w();
}
+
+ if( use_meters ) {
+ meters->reposition_window(x1, y1);
+ x1 += meters->get_w();
+ }
}
void EditPanel::create_objects()
delete gui_lock;
}
+void EditPanelScopeDialog::handle_close_event(int result)
+{
+ scope_gui = 0;
+}
void EditPanelScopeDialog::handle_done_event(int result)
{
gui_lock->lock("EditPanelScopeDialog::handle_done_event");
: ScopeGUI(mwindow->theme,
mwindow->session->scope_x, mwindow->session->scope_y,
mwindow->session->scope_w, mwindow->session->scope_h,
- mwindow->preferences->processors)
+ mwindow->get_cpus())
{
this->mwindow = mwindow;
this->dialog = dialog;
use_vector = session->use_vector;
use_hist_parade = session->use_hist_parade;
use_wave_parade = session->use_wave_parade;
+ use_wave_gain = session->use_wave_gain;
+ use_vect_gain = session->use_vect_gain;
+ use_smooth = session->use_smooth;
+ use_refresh = session->use_refresh;
+ use_release = session->use_release;
+ use_graticule = session->use_graticule;
ScopeGUI::create_objects();
}
session->use_vector = use_vector;
session->use_hist_parade = use_hist_parade;
session->use_wave_parade = use_wave_parade;
+ session->use_wave_gain = use_wave_gain;
+ session->use_vect_gain = use_vect_gain;
+ session->use_smooth = use_smooth;
+ session->use_refresh = use_refresh;
+ session->use_release = use_release;
+ session->use_graticule = use_graticule;
}
int EditPanelScopeGUI::translation_event()