From 61fb16da5233ea70b09b7428d0ad783ec65939c9 Mon Sep 17 00:00:00 2001 From: Jean Sirmai Date: Thu, 22 Aug 2024 00:53:23 +0200 Subject: [PATCH] cleaning / adding a scroll bar allowing to detail the data along the time elapsed during the simulation in results --- include/widget.h | 7 +++++-- src/fsm/measure.c | 3 ++- src/widget/results/display.c | 8 ++++++++ src/widget/state/dispatch.c | 2 +- src/widget/state/middle.c | 15 ++++++++------- src/widget/synth/dispatch.c | 5 +++-- 6 files changed, 27 insertions(+), 13 deletions(-) diff --git a/include/widget.h b/include/widget.h index 0fdcfed..3a4562d 100644 --- a/include/widget.h +++ b/include/widget.h @@ -128,8 +128,11 @@ void *widget_get_time_dependent_results_and_time_controls(); // defined in : widget / state / middle // defined in : widget / state / bottom -void *widget_get_space_view(); // middle -void *widget_get_graph_view_control(); // middle +#define PARTITION_SPACE_VS_CAMERA_IN_STATE 1850 +#define PARTITION_SPACE_VS_CAMERA_IN_SYNTH 1560 + +void *widget_get_space_view (int partition_space_vs_camera); // middle +void *widget_get_graph_view_control(); // middle void *widget_get_space_edit_control(); // bottom void *widget_get_sequence_control(); // bottom diff --git a/src/fsm/measure.c b/src/fsm/measure.c index 20204d1..42be564 100644 --- a/src/fsm/measure.c +++ b/src/fsm/measure.c @@ -122,7 +122,8 @@ void fsm_measures_list_init () //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ //------------------------------------------------------------------------------ -//------------------------------------------------------------------------------ +//------------------------------------------------------------------------------' +// https://chgi.developpez.com/liste/ < a l'air plutôt bien fait // https://learntutorials.net/fr/c/topic/560/listes-liees < ^c^v vvv diff --git a/src/widget/results/display.c b/src/widget/results/display.c index 8ec6ebe..51027b8 100644 --- a/src/widget/results/display.c +++ b/src/widget/results/display.c @@ -45,6 +45,14 @@ void *widget_get_display_results_box () { gtk_box_append (data_box, gtk_button_new_with_label ("evolutions")); gtk_box_append (data_box, GTK_WIDGET (gtk_picture_new_for_filename ("/home/jean/Gem-Graph/gem-graph-client/data/image/data évolutions parallèles (n > 30) étendu.png"))); + GtkBox *scroll_bar_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); + gtk_box_append (scroll_bar_box, GTK_WIDGET(gtk_label_new ("\ + a scroll bar allowing to detail the data along the time elapsed during the simulation"))); + gtk_box_append (scroll_bar_box, GTK_WIDGET (gtk_progress_bar_new ())); + GtkAdjustment *adjust = gtk_adjustment_new (30, 0, 100, 1, 0, 0); + gtk_box_append (scroll_bar_box, + GTK_WIDGET (gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, adjust))); + gtk_box_append (data_box, GTK_WIDGET (scroll_bar_box)); return GTK_WIDGET (data_box); } diff --git a/src/widget/state/dispatch.c b/src/widget/state/dispatch.c index 7135863..35323c9 100644 --- a/src/widget/state/dispatch.c +++ b/src/widget/state/dispatch.c @@ -60,7 +60,7 @@ void *widget_get_state_page() GtkBox *page_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); gtk_box_append (page_box, GTK_WIDGET (widget_get_graph_view_control())); gtk_box_append (page_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); - gtk_box_append (page_box, GTK_WIDGET (widget_get_space_view())); + gtk_box_append (page_box, GTK_WIDGET (widget_get_space_view(PARTITION_SPACE_VS_CAMERA_IN_STATE))); gtk_box_append (page_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); GtkWidget *view_space_vs_controls = gtk_paned_new (GTK_ORIENTATION_VERTICAL); diff --git a/src/widget/state/middle.c b/src/widget/state/middle.c index 5682b9b..05e8a20 100644 --- a/src/widget/state/middle.c +++ b/src/widget/state/middle.c @@ -80,16 +80,17 @@ static void *get_XYZ_box() static void *get_ZOOM_box() { GtkBox *ZOOM_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); - GtkWidget *ZOOM_Label = GTK_WIDGET (gtk_label_new (\ - "\n TOOLS\n ---\n zoom\n ---\n space\n struct.\n\ - ---\n arrows\n struct.\n ---\n orient\n state\n in space\n")); + GtkWidget *ZOOM_Label = GTK_WIDGET (gtk_label_new ( + "\n TOOLS\n\ + ---\n zoom\n\ + ---\n space\n struct.\n\ + ---\n arrows\n struct.\n\ + ---\n orient\n state\n in\n space\n")); gtk_box_append (ZOOM_box, ZOOM_Label); return ZOOM_box; } -#define PARTITION_SPACE_VS_CAMERA 1860 - -void *widget_get_space_view() +void *widget_get_space_view(int partition_space_vs_camera) { GtkBox *E_coli = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); gtk_box_append (GTK_BOX (E_coli), GTK_WIDGET (gtk_picture_new_for_filename @@ -108,7 +109,7 @@ void *widget_get_space_view() gtk_paned_set_end_child (GTK_PANED (view_space_vs_camera), GTK_WIDGET (camera)); gtk_paned_set_shrink_start_child (GTK_PANED (view_space_vs_camera), FALSE); gtk_paned_set_shrink_end_child (GTK_PANED (view_space_vs_camera), FALSE); - gtk_paned_set_position (GTK_PANED (view_space_vs_camera), PARTITION_SPACE_VS_CAMERA); + gtk_paned_set_position (GTK_PANED (view_space_vs_camera), partition_space_vs_camera); /* GtkBox *un_essai = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6)); gtk_box_append (GTK_BOX (un_essai), GTK_WIDGET (E_coli)); diff --git a/src/widget/synth/dispatch.c b/src/widget/synth/dispatch.c index 99e15c0..a94aae3 100644 --- a/src/widget/synth/dispatch.c +++ b/src/widget/synth/dispatch.c @@ -48,13 +48,13 @@ static void *widget_get_non_time_dependent_analysis_elements() // for fun ! } #define H_PARTITION_SYNTH 1600 -#define W_PARTITION_SYNTH 600 +#define W_PARTITION_SYNTH 500 static void *widget_get_space_vs_non_time_dependent_analysis() { GtkWidget *space_vs_non_time_dependent_analysis = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_paned_set_start_child (GTK_PANED (space_vs_non_time_dependent_analysis), - GTK_WIDGET (widget_get_space_view())); + GTK_WIDGET (widget_get_space_view(PARTITION_SPACE_VS_CAMERA_IN_SYNTH))); gtk_paned_set_end_child (GTK_PANED (space_vs_non_time_dependent_analysis), GTK_WIDGET (widget_get_non_time_dependent_analysis_elements())); gtk_paned_set_position (GTK_PANED (space_vs_non_time_dependent_analysis), H_PARTITION_SYNTH); @@ -127,3 +127,4 @@ src/widget/synth/dispatch.c: gtk_paned_set_shrink_end_child (GTK_ */ +