diff --git a/data/image/.~lock.data as functions oftime.png# b/data/image/.~lock.data as functions oftime.png# new file mode 100644 index 0000000..14ac19c --- /dev/null +++ b/data/image/.~lock.data as functions oftime.png# @@ -0,0 +1 @@ +Jean Sirmai,jean,n-guix-port,03.08.2024 17:28,file:///home/jean/.config/libreoffice/4; \ No newline at end of file diff --git a/data/image/.~lock.data line graph extended.odg# b/data/image/.~lock.data line graph extended.odg# new file mode 100644 index 0000000..14ac19c --- /dev/null +++ b/data/image/.~lock.data line graph extended.odg# @@ -0,0 +1 @@ +Jean Sirmai,jean,n-guix-port,03.08.2024 17:28,file:///home/jean/.config/libreoffice/4; \ No newline at end of file diff --git a/data/image/a quote from Martin Fowler.png b/data/image/a quote from Martin Fowler.png deleted file mode 100644 index 09c1a05..0000000 Binary files a/data/image/a quote from Martin Fowler.png and /dev/null differ diff --git a/data/image/bar graph vertical.png b/data/image/data bar graph vertical.png similarity index 100% rename from data/image/bar graph vertical.png rename to data/image/data bar graph vertical.png diff --git a/data/image/data chart line x measures y values degressive.png b/data/image/data chart line x measures y values degressive.png new file mode 100644 index 0000000..88bee11 Binary files /dev/null and b/data/image/data chart line x measures y values degressive.png differ diff --git a/data/image/data correlation 1.png b/data/image/data correlation 1.png new file mode 100644 index 0000000..d35a0e7 Binary files /dev/null and b/data/image/data correlation 1.png differ diff --git a/data/image/data correlations (4, horizontal).png b/data/image/data correlations (4, horizontal).png new file mode 100644 index 0000000..2be19db Binary files /dev/null and b/data/image/data correlations (4, horizontal).png differ diff --git a/data/image/data correlations (6).png b/data/image/data correlations (6).png new file mode 100644 index 0000000..689f51e Binary files /dev/null and b/data/image/data correlations (6).png differ diff --git a/data/image/data evolution (trends n > 30).png b/data/image/data evolution (trends n > 30).png new file mode 100644 index 0000000..9ba3675 Binary files /dev/null and b/data/image/data evolution (trends n > 30).png differ diff --git a/data/image/data evolution (extend).png b/data/image/data evolution (extend).png new file mode 100644 index 0000000..0e45255 Binary files /dev/null and b/data/image/data evolution (extend).png differ diff --git a/data/image/data evolution (synchro pulses).png b/data/image/data evolution (synchro pulses).png new file mode 100644 index 0000000..c6e37a4 Binary files /dev/null and b/data/image/data evolution (synchro pulses).png differ diff --git a/data/image/data evolution 10 lines.png b/data/image/data evolution 10 lines.png new file mode 100644 index 0000000..4b2da01 Binary files /dev/null and b/data/image/data evolution 10 lines.png differ diff --git a/data/image/data line graph extended.odg b/data/image/data line graph extended.odg new file mode 100644 index 0000000..1d87bc7 Binary files /dev/null and b/data/image/data line graph extended.odg differ diff --git a/data/image/data line graph.png b/data/image/data line graph.png new file mode 100644 index 0000000..01951a4 Binary files /dev/null and b/data/image/data line graph.png differ diff --git a/data/image/many bars graph horizontal.png b/data/image/data many bars graph horizontal.png similarity index 100% rename from data/image/many bars graph horizontal.png rename to data/image/data many bars graph horizontal.png diff --git a/data/image/many bars graph vertical.png b/data/image/data many bars graph vertical.png similarity index 100% rename from data/image/many bars graph vertical.png rename to data/image/data many bars graph vertical.png diff --git a/data/image/data many bars vertical.png b/data/image/data many bars vertical.png new file mode 100644 index 0000000..16c7ca3 Binary files /dev/null and b/data/image/data many bars vertical.png differ diff --git a/data/image/data network interpretation (bump chart).png b/data/image/data network interpretation (bump chart).png new file mode 100644 index 0000000..aba1618 Binary files /dev/null and b/data/image/data network interpretation (bump chart).png differ diff --git a/data/image/data évolutions parallèles (n > 30) étendu.png b/data/image/data évolutions parallèles (n > 30) étendu.png new file mode 100644 index 0000000..966bf46 Binary files /dev/null and b/data/image/data évolutions parallèles (n > 30) étendu.png differ diff --git a/data/image/data évolutions parallèles (n > 30).png b/data/image/data évolutions parallèles (n > 30).png new file mode 100644 index 0000000..ffda56c Binary files /dev/null and b/data/image/data évolutions parallèles (n > 30).png differ diff --git a/data/image/many bars vertical.png b/data/image/many bars vertical.png deleted file mode 100644 index 188674e..0000000 Binary files a/data/image/many bars vertical.png and /dev/null differ diff --git a/include/widget.h b/include/widget.h index 27f06d9..a85f23b 100644 --- a/include/widget.h +++ b/include/widget.h @@ -67,7 +67,8 @@ void window_header_bar_right (GtkWidget *header_bar); void *widget_get_state_page(); // in : src/widget/state/dispatch.c void *widget_get_rules_page(); // in : src/widget/rules/dispatch.c void *widget_get_data_page(); // in : src/widget/data /dispatch.c -void *widget_get_stock_page(); // in : src/widget/data /stock.c < to delete + +void *widget_get_stock_text (gchar *text_name); #define W_IMAGE_LOCAL 1920 / 32 // 1920 x 960 ad hoc (pour mon écran) #define H_IMAGE_LOCAL 800 @@ -112,13 +113,12 @@ void *widget_get_selected_rule_images(); /******************************************************************************/ /* D A T A */ /******************************************************************************/ -// in : stock.c +// in : data.c // called by topbar.c.widget_design_text_window() -void *widget_get_stock_text (gchar *text_name); void *widget_get_measures_page(); -void *widget_get_stock_page(); -void *widget_get_analysis_page(); +void *widget_get_results_page(); +void *widget_get_operations_on_results_page(); /******************************************************************************/ diff --git a/src/signal.c b/src/signal.c index ec6c9c2..4b8ab86 100644 --- a/src/signal.c +++ b/src/signal.c @@ -289,9 +289,9 @@ void on_toggle_state_rules_data (GtkWidget *toggled_button, gpointer user_data) = gtk_check_button_get_label (GTK_CHECK_BUTTON (toggled_button)); int is_active = gtk_check_button_get_active (GTK_CHECK_BUTTON (toggled_button)); - if ( ! strcmp (toggled_button_name, "state")) fsm_set_state_rules_data (STATE); - if ( ! strcmp (toggled_button_name, "rules")) fsm_set_state_rules_data (RULES); - if ( ! strcmp (toggled_button_name, "data analysis")) fsm_set_state_rules_data (DATA); + if ( ! strcmp (toggled_button_name, "state")) fsm_set_state_rules_data (STATE); + if ( ! strcmp (toggled_button_name, "rules")) fsm_set_state_rules_data (RULES); + if ( ! strcmp (toggled_button_name, "data")) fsm_set_state_rules_data (DATA); if (is_active) switch_state_rules_data(); } diff --git a/src/widget/data/dispatch.c b/src/widget/data/dispatch.c index ebbf50a..9e82172 100644 --- a/src/widget/data/dispatch.c +++ b/src/widget/data/dispatch.c @@ -37,27 +37,27 @@ #define PARTITION_A 700 #define PARTITION_B 700 -static void *widget_get_stock_and_analysis_page() +void *widget_get_data_page() { - GtkWidget *stock_and_analyse_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - gtk_paned_set_start_child (GTK_PANED(stock_and_analyse_horizontal_pane), GTK_WIDGET (widget_get_measures_page())); - gtk_paned_set_end_child (GTK_PANED(stock_and_analyse_horizontal_pane), GTK_WIDGET (widget_get_stock_page())); - gtk_paned_set_position (GTK_PANED (stock_and_analyse_horizontal_pane), PARTITION_B); - gtk_paned_set_shrink_start_child (GTK_PANED (stock_and_analyse_horizontal_pane), FALSE); - gtk_paned_set_shrink_end_child (GTK_PANED (stock_and_analyse_horizontal_pane), FALSE); + GtkWidget *measures_and_results = gtk_paned_new (GTK_ORIENTATION_VERTICAL); + gtk_paned_set_start_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_measures_page())); + gtk_paned_set_end_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_results_page())); + gtk_paned_set_position (GTK_PANED (measures_and_results), PARTITION_B); + gtk_paned_set_shrink_start_child (GTK_PANED (measures_and_results), FALSE); + gtk_paned_set_shrink_end_child (GTK_PANED (measures_and_results), FALSE); - return stock_and_analyse_horizontal_pane; + return measures_and_results; } -void *widget_get_data_page() +/*void *widget_get_data_page() { GtkWidget *measures_and_data_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_paned_set_start_child (GTK_PANED(measures_and_data_horizontal_pane), GTK_WIDGET (widget_get_stock_and_analysis_page())); - gtk_paned_set_end_child (GTK_PANED(measures_and_data_horizontal_pane), GTK_WIDGET (widget_get_analysis_page())); + gtk_paned_set_end_child (GTK_PANED(measures_and_data_horizontal_pane), GTK_WIDGET (widget_get_operations_on_results_page())); gtk_paned_set_position (GTK_PANED (measures_and_data_horizontal_pane), PARTITION_A); gtk_paned_set_shrink_start_child (GTK_PANED (measures_and_data_horizontal_pane), FALSE); gtk_paned_set_shrink_end_child (GTK_PANED (measures_and_data_horizontal_pane), FALSE); gtk_widget_set_size_request (measures_and_data_horizontal_pane, 1920, 800); return measures_and_data_horizontal_pane; -} +}*/ diff --git a/src/widget/data/measure.c b/src/widget/data/measure.c index dec4148..789729e 100644 --- a/src/widget/data/measure.c +++ b/src/widget/data/measure.c @@ -61,7 +61,7 @@ void *widget_get_measures_page () GtkBox *measures_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 8)); gtk_frame_set_child (GTK_FRAME (frame_measures), GTK_WIDGET (data_box)); - gtk_widget_set_size_request (GTK_WIDGET (data_box), 600, 0); +// gtk_widget_set_size_request (GTK_WIDGET (data_box), 200, 0); return GTK_WIDGET (frame_measures); } diff --git a/src/widget/data/analysis.c b/src/widget/data/operations.c similarity index 95% rename from src/widget/data/analysis.c rename to src/widget/data/operations.c index 01f8561..acd0d9f 100644 --- a/src/widget/data/analysis.c +++ b/src/widget/data/operations.c @@ -31,7 +31,7 @@ #include "../../../include/signal.h" #include "../../../include/widget.h" -void *widget_get_analysis_page () { +void *widget_get_operations_on_results_page () { GtkWidget *btt_A = gtk_toggle_button_new (); gtk_button_set_icon_name (GTK_BUTTON (btt_A), "view-refresh-symbolic"); @@ -42,7 +42,7 @@ void *widget_get_analysis_page () { GtkWidget* frame_analysis = gtk_frame_new ("analysis"); GtkBox *analysis_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 8)); gtk_frame_set_child (GTK_FRAME (frame_analysis), GTK_WIDGET (btt_A)); - gtk_frame_set_child (GTK_FRAME (frame_analysis), GTK_WIDGET (data_chart)); +// gtk_frame_set_child (GTK_FRAME (frame_analysis), GTK_WIDGET (data_chart)); return GTK_WIDGET (frame_analysis); } diff --git a/src/widget/data/stock.c b/src/widget/data/results.c similarity index 80% rename from src/widget/data/stock.c rename to src/widget/data/results.c index a304d59..d5dd29d 100644 --- a/src/widget/data/stock.c +++ b/src/widget/data/results.c @@ -31,36 +31,31 @@ #include "../../../include/signal.h" #include "../../../include/widget.h" -void *widget_get_stock_page () { - GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 32)); +void *widget_get_results_page () { + GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); - GtkWidget* frame_data_type = gtk_frame_new ("data type"); - GtkBox *data_type_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 200)); + GtkWidget* frame_data_type = gtk_frame_new ("about the fsm / about the model"); + GtkBox *data_type_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); gtk_frame_set_child (GTK_FRAME (frame_data_type), GTK_WIDGET (data_type_box)); gtk_box_append (data_box, GTK_WIDGET (frame_data_type)); - gtk_box_append (data_type_box, gtk_button_new_with_label ("repartitions")); gtk_box_append (data_type_box, gtk_button_new_with_label ("evolutions")); - gtk_box_append (data_type_box, gtk_button_new_with_label ("correlations")); + gtk_box_append (data_type_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_widget_set_size_request (GTK_WIDGET (data_box), 600, 0); + gtk_box_append (data_type_box, gtk_button_new_with_label ("repartitions")); + gtk_box_append (data_type_box, GTK_WIDGET (gtk_picture_new_for_filename + ("/home/jean/Gem-Graph/gem-graph-client/data/image/data bar graph vertical.png"))); + + gtk_box_append (data_type_box, gtk_button_new_with_label ("correlations")); + gtk_box_append (data_type_box, GTK_WIDGET (gtk_picture_new_for_filename + ("/home/jean/Gem-Graph/gem-graph-client/data/image/data correlations (4, horizontal).png"))); + + gtk_widget_set_size_request (GTK_WIDGET (data_box), 1800, 700); return GTK_WIDGET (data_box); } -void *widget_get_stock_text (gchar *text_address) { - GtkWidget *view = gtk_text_view_new (); - GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); - gtk_text_buffer_set_text (buffer, read_file (text_address), -1); - gtk_text_buffer_set_modified (buffer, FALSE); - - GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new()); - gtk_scrolled_window_set_child (scrolled_window, view); - gtk_scrolled_window_set_policy (scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - - return GTK_WIDGET (scrolled_window); -} - diff --git a/src/widget/rules/selected/analyse.c b/src/widget/rules/selected/analyse.c index 297ef4b..98b3a54 100644 --- a/src/widget/rules/selected/analyse.c +++ b/src/widget/rules/selected/analyse.c @@ -35,8 +35,9 @@ void *widget_get_rule_analyse() { - return gtk_label_new ("________________\n RULE ANALYSIS\n\ - controls\n'''''''''''''''''''''''''''''"); + return gtk_label_new (" ______________________\n RULE INVESTIGATION\n\ + tools\n '''''''''''''''''''''''''''''''''''''''\n\ +(camera, transparencies)"); } diff --git a/src/widget/rules/tree_tools/usage.c b/src/widget/rules/tree_tools/freq.c similarity index 100% rename from src/widget/rules/tree_tools/usage.c rename to src/widget/rules/tree_tools/freq.c diff --git a/src/widget/rules/tree_tools/pilot_box.c b/src/widget/rules/tree_tools/pilot_box.c index fcd6fd6..259b434 100644 --- a/src/widget/rules/tree_tools/pilot_box.c +++ b/src/widget/rules/tree_tools/pilot_box.c @@ -52,7 +52,7 @@ void *widget_get_rules_tree_tools () GtkBox *rules_tree_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); gtk_box_append (rules_tree_box, GTK_WIDGET (widget_get_user_rules_tree())); gtk_box_append (rules_tree_box, GTK_WIDGET (gtk_picture_new_for_filename - ("/home/jean/Gem-Graph/gem-graph-client/data/image/many bars vertical.png"))); + ("/home/jean/Gem-Graph/gem-graph-client/data/image/data many bars vertical.png"))); gtk_box_append (rules_tree_box, GTK_WIDGET (widget_get_rules_use ())); gtk_box_append (rules_tree_box, GTK_WIDGET (widget_get_an_impression_of_what_a_rules_comparator_could_be())); gtk_widget_set_size_request (GTK_WIDGET (rules_tree_box), W_IMAGE_LOCAL * 7.4, 0);//H_IMAGE_LOCAL); diff --git a/src/widget/topbar/left.c b/src/widget/topbar/left.c index 991be98..e481f99 100644 --- a/src/widget/topbar/left.c +++ b/src/widget/topbar/left.c @@ -63,7 +63,7 @@ void window_header_bar_left (GtkWidget *header_bar) g_signal_connect (btt_RULES, "toggled", G_CALLBACK (on_toggle_state_rules_data), no_local_data); gtk_check_button_set_group (GTK_CHECK_BUTTON (btt_RULES), group_state_rules_data); - btt_DATA = GTK_BUTTON (gtk_check_button_new_with_label ("data analysis")); + btt_DATA = GTK_BUTTON (gtk_check_button_new_with_label ("data")); g_signal_connect (btt_DATA, "toggled", G_CALLBACK (on_toggle_state_rules_data), no_local_data); gtk_check_button_set_group (GTK_CHECK_BUTTON (btt_DATA), group_state_rules_data); diff --git a/src/widget/topbar/polytext.c b/src/widget/topbar/polytext.c index 94e8b5d..ee9df55 100644 --- a/src/widget/topbar/polytext.c +++ b/src/widget/topbar/polytext.c @@ -60,3 +60,17 @@ void widget_design_text_window (GtkWindow *main_window, GtkWindow *text_window) +void *widget_get_stock_text (gchar *text_address) { + GtkWidget *view = gtk_text_view_new (); + GtkTextBuffer *buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view)); + gtk_text_buffer_set_text (buffer, read_file (text_address), -1); + gtk_text_buffer_set_modified (buffer, FALSE); + + GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new()); + gtk_scrolled_window_set_child (scrolled_window, view); + gtk_scrolled_window_set_policy (scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + + return GTK_WIDGET (scrolled_window); +} + +