From cd899f07c6487cc6c7b4cad2cc0601c3db132eed Mon Sep 17 00:00:00 2001 From: Xiao Pan Date: Sat, 26 Apr 2025 06:48:52 -0700 Subject: add expanders --- remote_plot.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'remote_plot.c') diff --git a/remote_plot.c b/remote_plot.c index 2a77b5c..7c456c0 100644 --- a/remote_plot.c +++ b/remote_plot.c @@ -468,7 +468,10 @@ static void activate (GtkApplication *app, gpointer user_data) GtkWidget *button; GtkWidget *box = gtk_box_new(GTK_ORIENTATION_VERTICAL,1); GtkWidget *scrolled_window; - GtkWidget *flowbox = gtk_flow_box_new(); + GtkWidget *flowbox_volt = gtk_flow_box_new(); + GtkWidget *flowbox_temp = gtk_flow_box_new(); + GtkWidget *expander_volt = gtk_expander_new("Choose cell voltages to plot"); + GtkWidget *expander_temp = gtk_expander_new("Choose cell temperatures to plot"); data->volt_label=gtk_label_new("Average voltage:"); data->temp_label=gtk_label_new("Average temperature:"); @@ -487,6 +490,7 @@ static void activate (GtkApplication *app, gpointer user_data) gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (data->area), draw_function, user_data, NULL); + //gtk_widget_set_vexpand(data->area,TRUE); button = gtk_button_new_with_label ("Print data"); g_signal_connect (button, "clicked", G_CALLBACK (print_data), user_data); @@ -498,13 +502,22 @@ static void activate (GtkApplication *app, gpointer user_data) gtk_widget_set_vexpand (scrolled_window, TRUE); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled_window), box); + for(int i=0;i<(VOLTLEN+TEMPLEN);i++) + { + if(icheckbutton[i]); + else + gtk_flow_box_append(GTK_FLOW_BOX(flowbox_temp), data->checkbutton[i]); + } + gtk_expander_set_child (GTK_EXPANDER (expander_volt), flowbox_volt); + gtk_expander_set_child (GTK_EXPANDER (expander_temp), flowbox_temp); + gtk_box_append(GTK_BOX(box), button); gtk_box_append(GTK_BOX(box), data->volt_label); gtk_box_append(GTK_BOX(box), data->temp_label); gtk_box_append(GTK_BOX(box), data->area); - for(int i=0;i<(VOLTLEN+TEMPLEN);i++) - gtk_flow_box_append(GTK_FLOW_BOX(flowbox), data->checkbutton[i]); - gtk_box_append(GTK_BOX(box), flowbox); + gtk_box_append(GTK_BOX(box), expander_volt); + gtk_box_append(GTK_BOX(box), expander_temp); gtk_window_set_child (GTK_WINDOW (window), scrolled_window); gtk_window_present (GTK_WINDOW (window)); -- cgit v1.2.3-70-g09d2