WIP: results I

This commit is contained in:
Jean Sirmai 2024-08-09 15:28:52 +02:00
parent 055c510142
commit d2f7ab8f44
Signed by: jean
GPG Key ID: FB3115C340E057E3
5 changed files with 42 additions and 23 deletions

View File

@ -194,8 +194,8 @@ void *widget_get_selected_rule_images();
// defined in : widget / results / organize.c // defined in : widget / results / organize.c
// display.c // display.c
void *widget_get_organize_results_page(); void *widget_get_organize_results_box();
void *widget_get_display_results_page(); void *widget_get_display_results_box();
/******************************************************************************/ /******************************************************************************/

View File

@ -40,8 +40,8 @@
void *widget_get_data_page() void *widget_get_data_page()
{ {
GtkWidget *measures_and_results = gtk_paned_new (GTK_ORIENTATION_VERTICAL); GtkWidget *measures_and_results = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_paned_set_start_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_organize_results_page())); gtk_paned_set_start_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_organize_results_box()));
gtk_paned_set_end_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_display_results_page())); gtk_paned_set_end_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_display_results_box()));
gtk_paned_set_position (GTK_PANED (measures_and_results), H_PARTITION_RESULTS); gtk_paned_set_position (GTK_PANED (measures_and_results), H_PARTITION_RESULTS);
gtk_paned_set_shrink_start_child (GTK_PANED (measures_and_results), FALSE); gtk_paned_set_shrink_start_child (GTK_PANED (measures_and_results), FALSE);
gtk_paned_set_shrink_end_child (GTK_PANED (measures_and_results), FALSE); gtk_paned_set_shrink_end_child (GTK_PANED (measures_and_results), FALSE);

View File

@ -31,13 +31,9 @@
#include "../../../include/signal.h" #include "../../../include/signal.h"
#include "../../../include/widget.h" #include "../../../include/widget.h"
void *widget_get_display_results_page () { void *widget_get_display_results_box () {
GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2));
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")));
gtk_box_append (data_box, gtk_button_new_with_label ("repartitions (1D, 2D)")); gtk_box_append (data_box, gtk_button_new_with_label ("repartitions (1D, 2D)"));
gtk_box_append (data_box, GTK_WIDGET (gtk_picture_new_for_filename gtk_box_append (data_box, GTK_WIDGET (gtk_picture_new_for_filename
("/home/jean/Gem-Graph/gem-graph-client/data/image/data bar graph vertical.png"))); ("/home/jean/Gem-Graph/gem-graph-client/data/image/data bar graph vertical.png")));
@ -46,6 +42,10 @@ void *widget_get_display_results_page () {
gtk_box_append (data_box, GTK_WIDGET (gtk_picture_new_for_filename gtk_box_append (data_box, GTK_WIDGET (gtk_picture_new_for_filename
("/home/jean/Gem-Graph/gem-graph-client/data/image/data correlations (4, horizontal).png"))); ("/home/jean/Gem-Graph/gem-graph-client/data/image/data correlations (4, horizontal).png")));
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")));
return GTK_WIDGET (data_box); return GTK_WIDGET (data_box);
} }

View File

@ -31,29 +31,48 @@
#include "../../../include/signal.h" #include "../../../include/signal.h"
#include "../../../include/widget.h" #include "../../../include/widget.h"
void *widget_get_organize_results_page () void *widget_get_organize_results_box ()
{ {
GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 32)); GtkBox *organize_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2));
GtkWidget* frame_rule_effect = gtk_frame_new ("rule effect"); GtkWidget* frame_single_rule = gtk_frame_new ("data based on measurements of a single rule effect");
GtkBox *rule_effect_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8)); GtkBox *rule_basic_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8));
gtk_frame_set_child (GTK_FRAME (frame_rule_effect), GTK_WIDGET (rule_effect_box));
GtkWidget* frame_rule_topic = gtk_frame_new ("rule topic");
GtkBox *rule_topic_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8)); GtkBox *rule_topic_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8));
gtk_frame_set_child (GTK_FRAME (frame_rule_topic), GTK_WIDGET (rule_topic_box)); // GtkBox *rule_effect_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8));
GtkWidget* frame_two_rules = gtk_frame_new ("data based on measurements of two rules effect");
GtkBox *rule_observ_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8));
gtk_frame_set_child (GTK_FRAME (frame_two_rules), GTK_WIDGET (rule_observ_box));
GtkWidget* frame_data_analysis = gtk_frame_new ("data based on analysis of previous measurements");
GtkBox *rule_analysis_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8));
gtk_frame_set_child (GTK_FRAME (frame_data_analysis), GTK_WIDGET (rule_analysis_box));
gtk_box_append (rule_basic_box, gtk_button_new_with_label ("count rule exec. occurences"));
gtk_box_append (rule_basic_box, gtk_button_new_with_label ("mem dates rule occurences"));
gtk_box_append (rule_topic_box, gtk_button_new_with_label ("objects"));
gtk_box_append (rule_topic_box, gtk_button_new_with_label ("situations"));
/*
gtk_box_append (rule_effect_box, gtk_button_new_with_label ("movement")); gtk_box_append (rule_effect_box, gtk_button_new_with_label ("movement"));
gtk_box_append (rule_effect_box, gtk_button_new_with_label ("transport")); gtk_box_append (rule_effect_box, gtk_button_new_with_label ("transport"));
gtk_box_append (rule_effect_box, gtk_button_new_with_label ("transformation")); gtk_box_append (rule_effect_box, gtk_button_new_with_label ("transformation"));
gtk_box_append (rule_topic_box, gtk_button_new_with_label ("objects")); gtk_box_append (rule_observ_box, gtk_button_new_with_label ("elapsed time"));
gtk_box_append (rule_topic_box, gtk_button_new_with_label ("situations")); gtk_box_append (rule_observ_box, gtk_button_new_with_label ("third event occurences count"));
gtk_box_append (data_box, GTK_WIDGET (frame_rule_effect)); gtk_box_append (rule_analysis_box, gtk_button_new_with_label ("comparison"));
gtk_box_append (data_box, GTK_WIDGET (frame_rule_topic)); gtk_box_append (rule_analysis_box, gtk_button_new_with_label ("correlation"));
*/
gtk_frame_set_child (GTK_FRAME (frame_single_rule), GTK_WIDGET (rule_basic_box));
// gtk_frame_set_child (GTK_FRAME (frame_single_rule), GTK_WIDGET (rule_topic_box));
// gtk_frame_set_child (GTK_FRAME (frame_single_rule), GTK_WIDGET (rule_effect_box));
return GTK_WIDGET (data_box); gtk_box_append (organize_box, GTK_WIDGET (frame_single_rule));
gtk_box_append (organize_box, GTK_WIDGET (frame_two_rules));
gtk_box_append (organize_box, GTK_WIDGET (frame_data_analysis));
return GTK_WIDGET (organize_box);
} }

View File

@ -51,8 +51,8 @@ void widget_design_main_window (GtkWindow *main_window)
gtk_check_button_set_active (GTK_CHECK_BUTTON (widget_get_btt_rules()), TRUE); gtk_check_button_set_active (GTK_CHECK_BUTTON (widget_get_btt_rules()), TRUE);
gtk_check_button_set_active (GTK_CHECK_BUTTON (widget_get_btt_state()), TRUE); gtk_check_button_set_active (GTK_CHECK_BUTTON (widget_get_btt_state()), TRUE);
gtk_check_button_set_active (GTK_CHECK_BUTTON (widget_get_btt_data()), TRUE);
gtk_check_button_set_active (GTK_CHECK_BUTTON (widget_get_btt_synth()), TRUE); gtk_check_button_set_active (GTK_CHECK_BUTTON (widget_get_btt_synth()), TRUE);
gtk_check_button_set_active (GTK_CHECK_BUTTON (widget_get_btt_data()), TRUE);
// THE LAST ONE IS THE WINNER (AND THE WINNER TAKES IT ALL !...) // THE LAST ONE IS THE WINNER (AND THE WINNER TAKES IT ALL !...)