Broccoli/waveview
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixing panel selection

Browse Source
This commit is contained in:
Edward Arthur Bingham 2024-06-15 11:49:24 -04:00
parent eaef475d7a
commit b9d7b24730
4 changed files with 429 additions and 427 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gawio.c
View File

@ -326,7 +326,7 @@ static int aio_panel_add( GawIoData *gawio, char *pline )
UserData *ud = gawio->ud; UserData *ud = gawio->ud;
int i ; int i ;
msg_dbg("Fonction called %s", pline ); msg_dbg("Function called %s", pline );
char *tok = stu_token_next( &pline, " ", " " ); char *tok = stu_token_next( &pline, " ", " " );
if ( ! tok ) { if ( ! tok ) {
gawio->msg = app_strdup(_("Expecting number") ); gawio->msg = app_strdup(_("Expecting number") );

5
src/gawmain.c
View File

@ -606,7 +606,10 @@ void aw_create_main_window ( UserData *ud )
/* create 2 panels */ /* create 2 panels */
for (i = 0 ; i < ud->reqpanels ; i++) { for (i = 0 ; i < ud->reqpanels ; i++) {
ap_panel_add_line(ud, NULL, 0); WavePanel *n = ap_panel_add_line(ud, NULL, 0);
if (i == 0) {
pa_panel_set_selected( n, n->ud );
}
} }

9
src/gawmenus.c
View File

@ -345,7 +345,8 @@ static void aw_pop_add_panel_above_gaction (GSimpleAction *action, GVariant *par
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
if ( wp ) { if ( wp ) {
ap_panel_add_line( wp->ud, wp, 0); WavePanel *n = ap_panel_add_line( wp->ud, wp, 0);
pa_panel_set_selected( n, n->ud );
} }
} }
@ -354,7 +355,8 @@ static void aw_pop_add_panel_below_gaction (GSimpleAction *action, GVariant *par
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
if ( wp ) { if ( wp ) {
ap_panel_add_line( wp->ud, wp, 1); WavePanel *n = ap_panel_add_line( wp->ud, wp, 1);
pa_panel_set_selected( n, n->ud );
} }
} }
@ -362,7 +364,8 @@ static void
aw_add_panel_gaction (GSimpleAction *action, GVariant *param, gpointer user_data) aw_add_panel_gaction (GSimpleAction *action, GVariant *param, gpointer user_data)
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
ap_panel_add_line(ud, NULL, 0); WavePanel *n = ap_panel_add_line(ud, NULL, 0);
pa_panel_set_selected( n, n->ud );
} }
static void static void

794
src/gawzoom.c
View File

@ -24,530 +24,526 @@
*/ */
gint az_cmd_zoom_absolute(UserData *ud, double start, double end ) gint az_cmd_zoom_absolute(UserData *ud, double start, double end )
{ {
double scroll_start, scroll_end; double scroll_start, scroll_end;
GawLabels *lbx = ud->xLabels; GawLabels *lbx = ud->xLabels;
msg_dbg("start %f end %f", start, end); msg_dbg("start %f end %f", start, end);
/* set starting drawn x-value */ /* set starting drawn x-value */
if (start > end) { if (start > end) {
int val = start; int val = start;
start = end; start = end;
end = val; end = val;
} }
if (start < lbx->min_val) { if (start < lbx->min_val) {
start = lbx->min_val; start = lbx->min_val;
} }
if (end > lbx->max_val) { if (end > lbx->max_val) {
end = lbx->max_val; end = lbx->max_val;
} }
/* /*
* Needs tp update_vals for the end of this function * Needs tp update_vals for the end of this function
*/ */
al_label_update_vals( lbx, start, end ); al_label_update_vals( lbx, start, end );
/* /*
* Scroll bar always goes from zero to one. * Scroll bar always goes from zero to one.
* Perform an appropriate transform based on lin/log * Perform an appropriate transform based on lin/log
*/ */
if ( lbx->logAxis && lbx->logAble ) { if ( lbx->logAxis && lbx->logAble ) {
scroll_start = (lbx->max_Lval > lbx->min_Lval) ? scroll_start = (lbx->max_Lval > lbx->min_Lval) ?
( lbx->start_Lval - lbx->min_Lval ) / ( lbx->start_Lval - lbx->min_Lval ) /
( lbx->max_Lval - lbx->min_Lval ) : ( lbx->max_Lval - lbx->min_Lval ) :
0.0; 0.0;
scroll_end = (lbx->max_Lval > lbx->min_Lval) ? scroll_end = (lbx->max_Lval > lbx->min_Lval) ?
( lbx->end_Lval - lbx->min_Lval ) / ( lbx->end_Lval - lbx->min_Lval ) /
( lbx->max_Lval - lbx->min_Lval ) : ( lbx->max_Lval - lbx->min_Lval ) :
0.0; 0.0;
} else { } else {
scroll_start = ( lbx->start_val - lbx->min_val ) / scroll_start = ( lbx->start_val - lbx->min_val ) /
( lbx->max_val - lbx->min_val ); ( lbx->max_val - lbx->min_val );
scroll_end = ( lbx->end_val - lbx->min_val ) / scroll_end = ( lbx->end_val - lbx->min_val ) /
( lbx->max_val - lbx->min_val ); ( lbx->max_val - lbx->min_val );
} }
if ( ud->xadj == NULL || lbx->wh == 0 ) { if ( ud->xadj == NULL || lbx->wh == 0 ) {
return 0; return 0;
} }
gdouble page_size; gdouble page_size;
page_size = fabs( scroll_end - scroll_start ); page_size = fabs( scroll_end - scroll_start );
gtk_adjustment_set_page_size (ud->xadj, page_size); gtk_adjustment_set_page_size (ud->xadj, page_size);
msg_dbg("scroll_start %f scroll_end %f", scroll_start, scroll_end); msg_dbg("scroll_start %f scroll_end %f", scroll_start, scroll_end);
gtk_adjustment_set_page_increment(ud->xadj, page_size / 2); gtk_adjustment_set_page_increment(ud->xadj, page_size / 2);
gtk_adjustment_set_step_increment(ud->xadj, page_size / 100); gtk_adjustment_set_step_increment(ud->xadj, page_size / 100);
gtk_adjustment_set_value(ud->xadj, scroll_start); gtk_adjustment_set_value(ud->xadj, scroll_start);
gtk_adjustment_set_lower(ud->xadj, 0.0); gtk_adjustment_set_lower(ud->xadj, 0.0);
gtk_adjustment_set_upper(ud->xadj, 1.0); gtk_adjustment_set_upper(ud->xadj, 1.0);
gtk_adjustment_value_changed (ud->xadj); gtk_adjustment_value_changed (ud->xadj);
return 0; return 0;
} }
void az_zoom_in_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_zoom_in_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
double start; double start;
double end; double end;
GawLabels *lbx = ud->xLabels; GawLabels *lbx = ud->xLabels;
if ( lbx->logAxis && lbx->logAble ) { if ( lbx->logAxis && lbx->logAble ) {
start = pow( 10, lbx->start_Lval + ( lbx->end_Lval - lbx->start_Lval ) / 4 ); start = pow( 10, lbx->start_Lval + ( lbx->end_Lval - lbx->start_Lval ) / 4 );
end = pow( 10, lbx->end_Lval - ( lbx->end_Lval - lbx->start_Lval ) / 4 ); end = pow( 10, lbx->end_Lval - ( lbx->end_Lval - lbx->start_Lval ) / 4 );
} else { } else {
start = lbx->start_val + ( lbx->end_val - lbx->start_val) / 4; start = lbx->start_val + ( lbx->end_val - lbx->start_val) / 4;
end = lbx->end_val - ( lbx->end_val - lbx->start_val) / 4; end = lbx->end_val - ( lbx->end_val - lbx->start_val) / 4;
} }
az_cmd_zoom_absolute(ud, start, end ); az_cmd_zoom_absolute(ud, start, end );
} }
void void
az_pop_zoom_in_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) az_pop_zoom_in_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
az_zoom_in_gaction (action, param, wp->ud); az_zoom_in_gaction (action, param, wp->ud);
} }
void void
az_zoom_out_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) az_zoom_out_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
double start; double start;
double end; double end;
GawLabels *lbx = ud->xLabels; GawLabels *lbx = ud->xLabels;
if ( lbx->logAxis && lbx->logAble ) { if ( lbx->logAxis && lbx->logAble ) {
start = pow( 10, lbx->start_Lval - ( lbx->end_Lval - lbx->start_Lval ) / 2 ); start = pow( 10, lbx->start_Lval - ( lbx->end_Lval - lbx->start_Lval ) / 2 );
end = pow( 10, lbx->end_Lval + ( lbx->end_Lval - lbx->start_Lval ) / 2 ); end = pow( 10, lbx->end_Lval + ( lbx->end_Lval - lbx->start_Lval ) / 2 );
} else { } else {
start = lbx->start_val - ( lbx->end_val - lbx->start_val) / 2; start = lbx->start_val - ( lbx->end_val - lbx->start_val) / 2;
end = lbx->end_val + ( lbx->end_val - lbx->start_val) / 2; end = lbx->end_val + ( lbx->end_val - lbx->start_val) / 2;
} }
az_cmd_zoom_absolute(ud, start, end ); az_cmd_zoom_absolute(ud, start, end );
} }
void void az_pop_zoom_out_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
az_pop_zoom_out_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
az_zoom_out_gaction (action, param, wp->ud); az_zoom_out_gaction (action, param, wp->ud);
} }
void void az_zoom_cursor0_centered_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
az_zoom_cursor0_centered_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
double start; double start;
double end; double end;
GawLabels *lbx = ud->xLabels; GawLabels *lbx = ud->xLabels;
AWCursor *csp = ud->cursors[0]; AWCursor *csp = ud->cursors[0];
msg_dbg("cursors[0] shown %d 0x%x", csp->shown, (unsigned long) csp ); msg_dbg("cursors[0] shown %d 0x%x", csp->shown, (unsigned long) csp );
if ( csp->shown ) { if ( csp->shown ) {
double xval = csp->xval; double xval = csp->xval;
double Lxval = 0; double Lxval = 0;
if ( lbx->logAxis && lbx->logAble ) { if ( lbx->logAxis && lbx->logAble ) {
Lxval = log10(xval); Lxval = log10(xval);
start = pow( 10, lbx->start_Lval + (( Lxval - lbx->start_Lval ) / 4) ); start = pow( 10, lbx->start_Lval + (( Lxval - lbx->start_Lval ) / 4) );
end = pow( 10, lbx->end_Lval + (( Lxval - lbx->end_Lval ) / 4) ); end = pow( 10, lbx->end_Lval + (( Lxval - lbx->end_Lval ) / 4) );
} else { } else {
start = lbx->start_val + ( xval - lbx->start_val ) / 4; start = lbx->start_val + ( xval - lbx->start_val ) / 4;
end = lbx->end_val + ( xval - lbx->end_val ) / 4; end = lbx->end_val + ( xval - lbx->end_val ) / 4;
} }
msg_dbg("xval %f Lxval %f start %f end %f", xval, Lxval, start, end); msg_dbg("xval %f Lxval %f start %f end %f", xval, Lxval, start, end);
az_cmd_zoom_absolute(ud, start, end ); az_cmd_zoom_absolute(ud, start, end );
} else { } else {
msg_info(_( "\n\nThis function will zoom centered on cursor 0\n" msg_info(_( "\n\nThis function will zoom centered on cursor 0\n"
"But you need first set the cursor 0 by left click in DrawingArea\n") ); "But you need first set the cursor 0 by left click in DrawingArea\n") );
} }
} }
void az_zoom_cursors_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_zoom_cursors_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
double start; double start;
double end; double end;
if ( ud->cursors[0]->shown && ud->cursors[1]->shown ) { if ( ud->cursors[0]->shown && ud->cursors[1]->shown ) {
if( ud->cursors[0]->xval < ud->cursors[1]->xval) { if( ud->cursors[0]->xval < ud->cursors[1]->xval) {
start = ud->cursors[0]->xval; start = ud->cursors[0]->xval;
end = ud->cursors[1]->xval; end = ud->cursors[1]->xval;
} else { } else {
start = ud->cursors[1]->xval; start = ud->cursors[1]->xval;
end = ud->cursors[0]->xval; end = ud->cursors[0]->xval;
} }
az_cmd_zoom_absolute(ud, start, end ); az_cmd_zoom_absolute(ud, start, end );
// cu_clear_cursors(ud); // cu_clear_cursors(ud);
} else { } else {
msg_info(_("\n\nThis function will zoom between the 2 cursors\n" msg_info(_("\n\nThis function will zoom between the 2 cursors\n"
"But you need first set the cursor 0 by left click in DrawingArea\n" "But you need first set the cursor 0 by left click in DrawingArea\n"
"and the cursor 1 by middle click in DrawingArea\n") ); "and the cursor 1 by middle click in DrawingArea\n") );
} }
} }
void void
az_pop_zoom_cursors_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) az_pop_zoom_cursors_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
az_zoom_cursors_gaction (action, param, wp->ud); az_zoom_cursors_gaction (action, param, wp->ud);
} }
void az_zoom_x_full_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_zoom_x_full_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
double start; double start;
double end; double end;
GawLabels *lbx = ud->xLabels; GawLabels *lbx = ud->xLabels;
start = lbx->min_val; start = lbx->min_val;
end = lbx->max_val; end = lbx->max_val;
if (lbx->start_val == lbx->min_val && lbx->end_val == lbx->max_val) { if (lbx->start_val == lbx->min_val && lbx->end_val == lbx->max_val) {
msg_info (_("\n\nNo Zoom X to cancel\n")); msg_info (_("\n\nNo Zoom X to cancel\n"));
} }
az_cmd_zoom_absolute(ud, start, end ); az_cmd_zoom_absolute(ud, start, end );
} }
void az_pop_zoom_x_full_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_pop_zoom_x_full_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
az_zoom_x_full_gaction (action, param, wp->ud ); az_zoom_x_full_gaction (action, param, wp->ud );
} }
void az_pop_zoom_y_full_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_pop_zoom_y_full_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
if ( ! wp ) { if ( ! wp ) {
return; return;
} }
GawLabels *lby = wp->yLabels; GawLabels *lby = wp->yLabels;
wp->man_yzoom = 0; wp->man_yzoom = 0;
pa_panel_set_yvals( wp, lby->min_val, lby->max_val); pa_panel_set_yvals( wp, lby->min_val, lby->max_val);
pa_panel_full_redraw(wp); pa_panel_full_redraw(wp);
} }
void az_zoom_y_full_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_zoom_y_full_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
WavePanel *wp = ud->selected_panel; WavePanel *wp = ud->selected_panel;
if ( ! wp) { if ( ! wp) {
msg_info (aw_panel_not_selected_msg); msg_info (aw_panel_not_selected_msg);
ap_all_redraw(ud); ap_all_redraw(ud);
return; return;
} }
az_pop_zoom_y_full_gaction (action, param, wp); az_pop_zoom_y_full_gaction (action, param, wp);
} }
void az_zoom_x_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_zoom_x_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
ud->srange->type = SR_X; ud->srange->type = SR_X;
ud->mouseState = M_SELRANGE_ARMED; ud->mouseState = M_SELRANGE_ARMED;
/* set gdk cursor in all panels */ /* set gdk cursor in all panels */
g_list_foreach(ud->panelList, (GFunc) pa_panel_drawing_set_gdk_cursor, g_list_foreach(ud->panelList, (GFunc) pa_panel_drawing_set_gdk_cursor,
GINT_TO_POINTER (GDK_RIGHT_SIDE) ); GINT_TO_POINTER (GDK_RIGHT_SIDE) );
} }
void az_pop_zoom_x_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_pop_zoom_x_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
az_zoom_x_gaction (action, param, wp->ud); az_zoom_x_gaction (action, param, wp->ud);
} }
void void
az_zoom_y_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) az_zoom_y_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
ud->srange->type = SR_Y; ud->srange->type = SR_Y;
ud->mouseState = M_SELRANGE_ARMED; ud->mouseState = M_SELRANGE_ARMED;
/* set gdk cursor in all panels */ /* set gdk cursor in all panels */
g_list_foreach(ud->panelList, (GFunc) pa_panel_drawing_set_gdk_cursor, g_list_foreach(ud->panelList, (GFunc) pa_panel_drawing_set_gdk_cursor,
GINT_TO_POINTER (GDK_TOP_SIDE) ); GINT_TO_POINTER (GDK_TOP_SIDE) );
} }
void void
az_pop_zoom_y_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) az_pop_zoom_y_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
az_zoom_y_gaction (action, param, wp->ud); az_zoom_y_gaction (action, param, wp->ud);
} }
void void
az_zoom_xy_area_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) az_zoom_xy_area_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
ud->srange->type = SR_XY; ud->srange->type = SR_XY;
ud->mouseState = M_SELRANGE_ARMED; ud->mouseState = M_SELRANGE_ARMED;
/* set gdk cursor in all panels */ /* set gdk cursor in all panels */
g_list_foreach(ud->panelList, (GFunc) pa_panel_drawing_set_gdk_cursor, g_list_foreach(ud->panelList, (GFunc) pa_panel_drawing_set_gdk_cursor,
GINT_TO_POINTER (GDK_TOP_LEFT_CORNER) ); GINT_TO_POINTER (GDK_TOP_LEFT_CORNER) );
} }
void az_pop_zoom_xy_area_gaction (GSimpleAction *action, GVariant *param, gpointer user_data ) void az_pop_zoom_xy_area_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
az_zoom_xy_area_gaction (action, param, wp->ud); az_zoom_xy_area_gaction (action, param, wp->ud);
} }
typedef struct _ToggledData { typedef struct _ToggledData {
WavePanel *wp; WavePanel *wp;
GtkWidget *entry_ys; GtkWidget *entry_ys;
GtkWidget *entry_ye; GtkWidget *entry_ye;
} ToggledData; } ToggledData;
static void static void
az_button_toggled_cb (GtkWidget *widget, ToggledData *pdata) az_button_toggled_cb (GtkWidget *widget, ToggledData *pdata)
{ {
pdata->wp->man_yzoom = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); pdata->wp->man_yzoom = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
if ( pdata->entry_ys ){ if ( pdata->entry_ys ){
gtk_widget_set_sensitive (pdata->entry_ys, pdata->wp->man_yzoom); gtk_widget_set_sensitive (pdata->entry_ys, pdata->wp->man_yzoom);
} }
if ( pdata->entry_ye ){ if ( pdata->entry_ye ){
gtk_widget_set_sensitive (pdata->entry_ye, pdata->wp->man_yzoom); gtk_widget_set_sensitive (pdata->entry_ye, pdata->wp->man_yzoom);
} }
} }
static void static void
az_entry_changed_cb (GtkWidget *widget, gpointer pdata) az_entry_changed_cb (GtkWidget *widget, gpointer pdata)
{ {
const gchar *text; const gchar *text;
double *val = ( double *) pdata; double *val = ( double *) pdata;
text = gtk_entry_get_text (GTK_ENTRY (widget)); text = gtk_entry_get_text (GTK_ENTRY (widget));
*val = str2val((char *) text); *val = str2val((char *) text);
} }
void void az_pop_zoom_dialog_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
az_pop_zoom_dialog_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
WavePanel *wp = (WavePanel *) user_data; WavePanel *wp = (WavePanel *) user_data;
if ( ! wp ) { if ( ! wp ) {
return ; return ;
} }
UserData *ud = wp->ud; UserData *ud = wp->ud;
GtkWidget *dialog; GtkWidget *dialog;
GtkWidget *vbox; GtkWidget *vbox;
gint response; gint response;
static ToggledData *toggledData = NULL; static ToggledData *toggledData = NULL;
GtkWidget *frame; GtkWidget *frame;
GtkWidget *x_table; GtkWidget *x_table;
GtkWidget *y_table; GtkWidget *y_table;
GtkWidget *label; GtkWidget *label;
GtkWidget *entry; GtkWidget *entry;
GtkWidget *button; GtkWidget *button;
gchar *str; gchar *str;
GawLabels *lbx = ud->xLabels; GawLabels *lbx = ud->xLabels;
GawLabels *lby = wp->yLabels; GawLabels *lby = wp->yLabels;
if (! toggledData) { if (! toggledData) {
toggledData = g_new0 (ToggledData, 1); toggledData = g_new0 (ToggledData, 1);
} }
toggledData->wp = wp; toggledData->wp = wp;
dialog = gtk_dialog_new_with_buttons (_("Gaw axis settings"), dialog = gtk_dialog_new_with_buttons (_("Gaw axis settings"),
GTK_WINDOW (ud->window), GTK_WINDOW (ud->window),
GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
_("_Cancel"), _("_Cancel"),
GTK_RESPONSE_REJECT, GTK_RESPONSE_REJECT,
_("_OK"), _("_OK"),
GTK_RESPONSE_ACCEPT, GTK_RESPONSE_ACCEPT,
NULL); NULL);
vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); vbox = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
gtk_container_set_border_width (GTK_CONTAINER (vbox), 8); gtk_container_set_border_width (GTK_CONTAINER (vbox), 8);
/* frame Global X Axis */ /* frame Global X Axis */
frame = gtk_frame_new ( _("Global X Axis")); frame = gtk_frame_new ( _("Global X Axis"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
x_table = gtk_grid_new (); x_table = gtk_grid_new ();
gtk_grid_set_column_spacing( GTK_GRID(x_table), 5); gtk_grid_set_column_spacing( GTK_GRID(x_table), 5);
gtk_grid_set_row_spacing( GTK_GRID (x_table), 2); gtk_grid_set_row_spacing( GTK_GRID (x_table), 2);
gtk_container_add (GTK_CONTAINER (frame), x_table); gtk_container_add (GTK_CONTAINER (frame), x_table);
/* frame Panel Y Axis */ /* frame Panel Y Axis */
frame = gtk_frame_new (_("Panel Y Axis")); frame = gtk_frame_new (_("Panel Y Axis"));
gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0); gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
y_table = gtk_grid_new (); y_table = gtk_grid_new ();
gtk_grid_set_column_spacing( GTK_GRID(y_table), 5); gtk_grid_set_column_spacing( GTK_GRID(y_table), 5);
gtk_grid_set_row_spacing( GTK_GRID (y_table), 2); gtk_grid_set_row_spacing( GTK_GRID (y_table), 2);
gtk_container_add (GTK_CONTAINER (frame), y_table); gtk_container_add (GTK_CONTAINER (frame), y_table);
str = _("min"); str = _("min");
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(x_table), label, gtk_grid_attach(GTK_GRID(x_table), label,
/* left, top, width, height */ /* left, top, width, height */
1, 0, 1, 1 ); 1, 0, 1, 1 );
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(y_table), label, gtk_grid_attach(GTK_GRID(y_table), label,
/* left, top, width, height */ /* left, top, width, height */
1, 0, 1, 1 ); 1, 0, 1, 1 );
str = _("max"); str = _("max");
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(x_table), label, gtk_grid_attach(GTK_GRID(x_table), label,
/* left, top, width, height */ /* left, top, width, height */
2, 0, 1, 1 ); 2, 0, 1, 1 );
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(y_table), label, gtk_grid_attach(GTK_GRID(y_table), label,
/* left, top, width, height */ /* left, top, width, height */
2, 0, 1, 1 ); 2, 0, 1, 1 );
str = _("Current"); str = _("Current");
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(x_table), label, gtk_grid_attach(GTK_GRID(x_table), label,
/* left, top, width, height */ /* left, top, width, height */
0, 2, 1, 1 ); 0, 2, 1, 1 );
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(y_table), label, gtk_grid_attach(GTK_GRID(y_table), label,
/* left, top, width, height */ /* left, top, width, height */
0, 2, 1, 1 ); 0, 2, 1, 1 );
str = _("New:"); str = _("New:");
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(x_table), label, gtk_grid_attach(GTK_GRID(x_table), label,
/* left, top, width, height */ /* left, top, width, height */
0, 3, 1, 1 ); 0, 3, 1, 1 );
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(y_table), label, gtk_grid_attach(GTK_GRID(y_table), label,
/* left, top, width, height */ /* left, top, width, height */
0, 3, 1, 1 ); 0, 3, 1, 1 );
/* X values */ /* X values */
str = val2str(lbx->min_val, ud->up->scientific); str = val2str(lbx->min_val, ud->up->scientific);
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(x_table), label, gtk_grid_attach(GTK_GRID(x_table), label,
/* left, top, width, height */ /* left, top, width, height */
1, 1, 1, 1 ); 1, 1, 1, 1 );
str = val2str(lbx->max_val, ud->up->scientific); str = val2str(lbx->max_val, ud->up->scientific);
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(x_table), label, gtk_grid_attach(GTK_GRID(x_table), label,
/* left, top, width, height */ /* left, top, width, height */
2, 1, 1, 1 ); 2, 1, 1, 1 );
str = val2str(lbx->start_val, ud->up->scientific); str = val2str(lbx->start_val, ud->up->scientific);
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(x_table), label, gtk_grid_attach(GTK_GRID(x_table), label,
/* left, top, width, height */ /* left, top, width, height */
1, 2, 1, 1 ); 1, 2, 1, 1 );
str = val2str(lbx->end_val, ud->up->scientific); str = val2str(lbx->end_val, ud->up->scientific);
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(x_table), label, gtk_grid_attach(GTK_GRID(x_table), label,
/* left, top, width, height */ /* left, top, width, height */
2, 2, 1, 1 ); 2, 2, 1, 1 );
/* Y values */ /* Y values */
str = val2str(lby->min_val, ud->up->scientific); str = val2str(lby->min_val, ud->up->scientific);
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(y_table), label, gtk_grid_attach(GTK_GRID(y_table), label,
/* left, top, width, height */ /* left, top, width, height */
1, 1, 1, 1 ); 1, 1, 1, 1 );
str = val2str(lby->max_val, ud->up->scientific); str = val2str(lby->max_val, ud->up->scientific);
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(y_table), label, gtk_grid_attach(GTK_GRID(y_table), label,
/* left, top, width, height */ /* left, top, width, height */
2, 1, 1, 1 ); 2, 1, 1, 1 );
str = val2str(lby->start_val, ud->up->scientific); str = val2str(lby->start_val, ud->up->scientific);
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(y_table), label, gtk_grid_attach(GTK_GRID(y_table), label,
/* left, top, width, height */ /* left, top, width, height */
1, 2, 1, 1 ); 1, 2, 1, 1 );
str = val2str(lby->end_val, ud->up->scientific); str = val2str(lby->end_val, ud->up->scientific);
label = gtk_label_new( str ); label = gtk_label_new( str );
gtk_grid_attach(GTK_GRID(y_table), label, gtk_grid_attach(GTK_GRID(y_table), label,
/* left, top, width, height */ /* left, top, width, height */
2, 2, 1, 1 ); 2, 2, 1, 1 );
/* new X values in entry */ /* new X values in entry */
str = val2str(lbx->start_val, ud->up->scientific); str = val2str(lbx->start_val, ud->up->scientific);
entry = gtk_entry_new() ; entry = gtk_entry_new() ;
gtk_entry_set_text (GTK_ENTRY (entry), str); gtk_entry_set_text (GTK_ENTRY (entry), str);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (az_entry_changed_cb), G_CALLBACK (az_entry_changed_cb),
( gpointer) &lbx->start_val); ( gpointer) &lbx->start_val);
gtk_grid_attach(GTK_GRID(x_table), entry, gtk_grid_attach(GTK_GRID(x_table), entry,
/* left, top, width, height */ /* left, top, width, height */
1, 3, 1, 1 ); 1, 3, 1, 1 );
str = val2str(lbx->end_val, ud->up->scientific); str = val2str(lbx->end_val, ud->up->scientific);
entry = gtk_entry_new() ; entry = gtk_entry_new() ;
gtk_entry_set_text (GTK_ENTRY (entry), str); gtk_entry_set_text (GTK_ENTRY (entry), str);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (az_entry_changed_cb), G_CALLBACK (az_entry_changed_cb),
( gpointer) &lbx->end_val); ( gpointer) &lbx->end_val);
gtk_grid_attach(GTK_GRID(x_table), entry, gtk_grid_attach(GTK_GRID(x_table), entry,
/* left, top, width, height */ /* left, top, width, height */
2, 3, 1, 1 ); 2, 3, 1, 1 );
/* new Y values in entry */ /* new Y values in entry */
str = val2str(lby->start_val, ud->up->scientific); str = val2str(lby->start_val, ud->up->scientific);
entry = gtk_entry_new() ; entry = gtk_entry_new() ;
toggledData->entry_ys = entry; toggledData->entry_ys = entry;
gtk_entry_set_text (GTK_ENTRY (entry), str); gtk_entry_set_text (GTK_ENTRY (entry), str);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (az_entry_changed_cb), G_CALLBACK (az_entry_changed_cb),
( gpointer) &lby->start_val); ( gpointer) &lby->start_val);
gtk_grid_attach(GTK_GRID(y_table), entry, gtk_grid_attach(GTK_GRID(y_table), entry,
/* left, top, width, height */ /* left, top, width, height */
1, 3, 1, 1 ); 1, 3, 1, 1 );
gtk_widget_set_sensitive (entry, wp->man_yzoom); gtk_widget_set_sensitive (entry, wp->man_yzoom);
str = val2str(lby->end_val, ud->up->scientific); str = val2str(lby->end_val, ud->up->scientific);
entry = gtk_entry_new() ; entry = gtk_entry_new() ;
toggledData->entry_ye = entry; toggledData->entry_ye = entry;
gtk_entry_set_text (GTK_ENTRY (entry), str); gtk_entry_set_text (GTK_ENTRY (entry), str);
g_signal_connect (entry, "changed", g_signal_connect (entry, "changed",
G_CALLBACK (az_entry_changed_cb), G_CALLBACK (az_entry_changed_cb),
( gpointer) &lby->end_val); ( gpointer) &lby->end_val);
gtk_grid_attach(GTK_GRID(y_table), entry, gtk_grid_attach(GTK_GRID(y_table), entry,
/* left, top, width, height */ /* left, top, width, height */
2, 3, 1, 1 ); 2, 3, 1, 1 );
gtk_widget_set_sensitive (entry, wp->man_yzoom); gtk_widget_set_sensitive (entry, wp->man_yzoom);
/* Full Scale button */ /* Full Scale button */
str = _("Zoom to"); str = _("Zoom to");
button = gtk_toggle_button_new_with_label (str) ; button = gtk_toggle_button_new_with_label (str) ;
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), wp->man_yzoom); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button), wp->man_yzoom);
g_signal_connect (button, "toggled", g_signal_connect (button, "toggled",
G_CALLBACK (az_button_toggled_cb), G_CALLBACK (az_button_toggled_cb),
( gpointer) toggledData ); ( gpointer) toggledData );
gtk_grid_attach(GTK_GRID(y_table), button, gtk_grid_attach(GTK_GRID(y_table), button,
/* left, top, width, height */ /* left, top, width, height */
0, 0, 1, 1 ); 0, 0, 1, 1 );
gtk_widget_show_all (vbox); gtk_widget_show_all (vbox);
response = gtk_dialog_run (GTK_DIALOG (dialog)); response = gtk_dialog_run (GTK_DIALOG (dialog));
if (response == GTK_RESPONSE_ACCEPT) { if (response == GTK_RESPONSE_ACCEPT) {
msg_dbg(_("dialog OK")); msg_dbg(_("dialog OK"));
az_cmd_zoom_absolute(ud, lbx->start_val, lbx->end_val ); az_cmd_zoom_absolute(ud, lbx->start_val, lbx->end_val );
ap_all_redraw(ud); ap_all_redraw(ud);
} else { } else {
pa_panel_set_yvals( wp, lby->min_val, lby->max_val); pa_panel_set_yvals( wp, lby->min_val, lby->max_val);
wp->man_yzoom = 0; wp->man_yzoom = 0;
} }
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
} }
void void az_zoom_dialog_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
az_zoom_dialog_gaction (GSimpleAction *action, GVariant *param, gpointer user_data )
{ {
UserData *ud = (UserData *) user_data; UserData *ud = (UserData *) user_data;
if ( ud->selected_panel == NULL) { if ( ud->selected_panel == NULL) {
msg_info (aw_panel_not_selected_msg); msg_info (aw_panel_not_selected_msg);
return ; return ;
} }
WavePanel *wp = ud->selected_panel ; WavePanel *wp = ud->selected_panel ;
az_pop_zoom_dialog_gaction ( action, param, wp); az_pop_zoom_dialog_gaction ( action, param, wp);
} }