WIP: Qu'y avait-il sur mon écran lorsque je travaillais ?

This commit is contained in:
Jean Sirmai 2024-08-03 22:37:45 +02:00
parent 6132ea34f2
commit 29dd9a4529
Signed by: jean
GPG Key ID: FB3115C340E057E3
32 changed files with 58 additions and 46 deletions

View File

@ -0,0 +1 @@
Jean Sirmai,jean,n-guix-port,03.08.2024 17:28,file:///home/jean/.config/libreoffice/4;

View File

@ -0,0 +1 @@
Jean Sirmai,jean,n-guix-port,03.08.2024 17:28,file:///home/jean/.config/libreoffice/4;

Binary file not shown.

Before

Width:  |  Height:  |  Size: 38 KiB

View File

Before

Width:  |  Height:  |  Size: 6.8 KiB

After

Width:  |  Height:  |  Size: 6.8 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 131 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 137 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 147 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 132 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 185 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 28 KiB

View File

@ -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_state_page(); // in : src/widget/state/dispatch.c
void *widget_get_rules_page(); // in : src/widget/rules/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_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 W_IMAGE_LOCAL 1920 / 32 // 1920 x 960 ad hoc (pour mon écran)
#define H_IMAGE_LOCAL 800 #define H_IMAGE_LOCAL 800
@ -112,13 +113,12 @@ void *widget_get_selected_rule_images();
/******************************************************************************/ /******************************************************************************/
/* D A T A */ /* D A T A */
/******************************************************************************/ /******************************************************************************/
// in : stock.c // in : data.c
// called by topbar.c.widget_design_text_window() // called by topbar.c.widget_design_text_window()
void *widget_get_stock_text (gchar *text_name);
void *widget_get_measures_page(); void *widget_get_measures_page();
void *widget_get_stock_page(); void *widget_get_results_page();
void *widget_get_analysis_page(); void *widget_get_operations_on_results_page();
/******************************************************************************/ /******************************************************************************/

View File

@ -291,7 +291,7 @@ void on_toggle_state_rules_data (GtkWidget *toggled_button, gpointer user_data)
if ( ! strcmp (toggled_button_name, "state")) fsm_set_state_rules_data (STATE); 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, "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, "data")) fsm_set_state_rules_data (DATA);
if (is_active) switch_state_rules_data(); if (is_active) switch_state_rules_data();
} }

View File

@ -37,27 +37,27 @@
#define PARTITION_A 700 #define PARTITION_A 700
#define PARTITION_B 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); GtkWidget *measures_and_results = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
gtk_paned_set_start_child (GTK_PANED(stock_and_analyse_horizontal_pane), GTK_WIDGET (widget_get_measures_page())); gtk_paned_set_start_child (GTK_PANED(measures_and_results), 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_end_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_results_page()));
gtk_paned_set_position (GTK_PANED (stock_and_analyse_horizontal_pane), PARTITION_B); gtk_paned_set_position (GTK_PANED (measures_and_results), PARTITION_B);
gtk_paned_set_shrink_start_child (GTK_PANED (stock_and_analyse_horizontal_pane), FALSE); gtk_paned_set_shrink_start_child (GTK_PANED (measures_and_results), FALSE);
gtk_paned_set_shrink_end_child (GTK_PANED (stock_and_analyse_horizontal_pane), 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); 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_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_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_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_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); gtk_widget_set_size_request (measures_and_data_horizontal_pane, 1920, 800);
return measures_and_data_horizontal_pane; return measures_and_data_horizontal_pane;
} }*/

View File

@ -61,7 +61,7 @@ void *widget_get_measures_page ()
GtkBox *measures_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 8)); 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_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); return GTK_WIDGET (frame_measures);
} }

View File

@ -31,7 +31,7 @@
#include "../../../include/signal.h" #include "../../../include/signal.h"
#include "../../../include/widget.h" #include "../../../include/widget.h"
void *widget_get_analysis_page () { void *widget_get_operations_on_results_page () {
GtkWidget *btt_A = gtk_toggle_button_new (); GtkWidget *btt_A = gtk_toggle_button_new ();
gtk_button_set_icon_name (GTK_BUTTON (btt_A), "view-refresh-symbolic"); 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"); GtkWidget* frame_analysis = gtk_frame_new ("analysis");
GtkBox *analysis_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 8)); 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 (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); return GTK_WIDGET (frame_analysis);
} }

View File

@ -31,36 +31,31 @@
#include "../../../include/signal.h" #include "../../../include/signal.h"
#include "../../../include/widget.h" #include "../../../include/widget.h"
void *widget_get_stock_page () { void *widget_get_results_page () {
GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 32)); GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2));
GtkWidget* frame_data_type = gtk_frame_new ("data type"); 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, 200)); 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_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_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 ("evolutions"));
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_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_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), 600, 0); gtk_widget_set_size_request (GTK_WIDGET (data_box), 1800, 700);
return GTK_WIDGET (data_box); 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);
}

View File

@ -35,8 +35,9 @@
void *widget_get_rule_analyse() void *widget_get_rule_analyse()
{ {
return gtk_label_new ("________________\n RULE ANALYSIS\n\ return gtk_label_new (" ______________________\n RULE INVESTIGATION\n\
controls\n'''''''''''''''''''''''''''''"); tools\n '''''''''''''''''''''''''''''''''''''''\n\
(camera, transparencies)");
} }

View File

@ -52,7 +52,7 @@ void *widget_get_rules_tree_tools ()
GtkBox *rules_tree_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); 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 (widget_get_user_rules_tree()));
gtk_box_append (rules_tree_box, GTK_WIDGET (gtk_picture_new_for_filename 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_rules_use ()));
gtk_box_append (rules_tree_box, GTK_WIDGET (widget_get_an_impression_of_what_a_rules_comparator_could_be())); 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); gtk_widget_set_size_request (GTK_WIDGET (rules_tree_box), W_IMAGE_LOCAL * 7.4, 0);//H_IMAGE_LOCAL);

View File

@ -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); 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); 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); 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); gtk_check_button_set_group (GTK_CHECK_BUTTON (btt_DATA), group_state_rules_data);

View File

@ -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);
}