diff --git a/include/widget.h b/include/widget.h index 7a6d9b6..a21fdda 100644 --- a/include/widget.h +++ b/include/widget.h @@ -34,75 +34,97 @@ /******************************************************************************/ /* W I N D O W S */ /******************************************************************************/ -// called in dispatch.c -// functions are in topbar.c - #define W_MY_SCREEN 1920 // 1920 x 960 = ad hoc (pour mon écran)) #define H_MY_SCREEN 1000 // Full HD (1920 x 1080 pixels) #define W_TEXT_WINDOW 550 // ad hoc (mais sans conséquences ici) -#define H_TEXT_WINDOW 1000 +#define H_TEXT_WINDOW H_MY_SCREEN + + +// called in widget / dispatch.c / on_windows_activation() +// defined in widget / topbar / dispatch.c +// - widget / topbar / dialog.c +// - widget / topbar / polytext.c +// after gtk_application_window_new (app) x 3 void widget_design_main_window (GtkWindow *main_window); void widget_design_dialog_window (GtkWindow *main_window, GtkWindow *dialog_window); void widget_design_text_window (GtkWindow *main_window, GtkWindow *text_window); -// called in topbar -// functions are in topbar / dispatch.c +// called in signal.c / switch_state_rules_data() / gtk_window_set_child() +// defined in widget / dispatch.c void *widget_get_main_window(); void *widget_get_dialog_window(); void *widget_get_text_window(); -// functions are in topbar / left.c + +/******************************************************************************/ +/* W I D G E T S */ +/******************************************************************************/ +#define W_TREE 160 +#define W_DO_UNDO_REDO_BOX 1300 +#define H_XYZ_BOX 200 +#define H_E_COLI 790 +#define H_OBJECTS_SITUATIONS 130 +#define W_COMPARATOR 64 +#define W_RULES_USE 90 + +#define W_IMAGE_800 800 +#define W_IMAGE_100 100 + + +/******************************************************************************/ +/* T O P B A R */ +/******************************************************************************/ +// called in widget / topbar / dispatch.c / widget_design_main_window() +// defined in topbar / left.c void *widget_get_btt_synth(); // {return btt_SYNTH;} void *widget_get_btt_state(); // {return btt_STATE;} void *widget_get_btt_rules(); // {return btt_RULES;} void *widget_get_btt_data(); // {return btt_DATA;} -void window_header_bar_left (GtkWidget *header_bar); -void window_header_bar_right (GtkWidget *header_bar); +// called in widget / topbar / dispatch.c / widget_design_main_window() +// defined in widget / topbar / left.c +// - widget / topbar / right.c + +void window_design_header_bar_left (GtkWidget *header_bar); +void window_design_header_bar_right (GtkWidget *header_bar); -/******************************************************************************/ -/* W I D G E T S */ -/******************************************************************************/ -// called in signal.c +// called in signal.c / fsm_get_state_rules_data() +// defined in widget / synth / dispatch.c +// - widget / state / dispatch.c +// - widget / rules / dispatch.c +// - widget / data / dispatch.c -void *widget_get_synth_page(); // in : src/widget/synth/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_data_page(); // in : src/widget/data /dispatch.c - -#define W_TREE_160 160 -#define W_DO_UNDO_REDO_BOX_1300 1300 -#define H_XYZ_BOX_200 200 -#define H_OBJECTS_SITUATIONS_130 130 -#define W_COMPARATOR_64 64 -#define W_RULES_USE_90 90 - -#define W_IMAGE_800 800 -#define W_IMAGE_100 100 - -#define ARBITRARY_PARTITION_1600 1600 -#define ARBITRARY_PARTITION_750 750 -#define ARBITRARY_PARTITION_600 600 +void *widget_get_synth_page(); // in : widget / synth / dispatch.c +void *widget_get_state_page(); // in : widget / state / dispatch.c +void *widget_get_rules_page(); // in : widget / rules / dispatch.c +void *widget_get_data_page(); // in : widget / data / dispatch.c /******************************************************************************/ /* S Y N T H */ /******************************************************************************/ -// called in : src/widget/synth/dispatch.c -// defined in : src/widget/synth/time.c +// called by : widget / synth / dispatch.c / widget_get_synth_page() +// defined in : widget / synth / time.c +// repartitions.c WIP +// correlations.c WIP void *widget_get_time_dependent_results_and_time_controls(); +// *widget_get_space_vs_non_time_dependent_analysis(); WIP +// *widget_get_non_time_dependent_analysis_elements(); WIP + /******************************************************************************/ /* S T A T E */ /******************************************************************************/ -// called in : src/widget/state/distribvoid *widget_get_rule_edit_control().c +// called by : widget / state / dispatch.c / widget_get_state_page() +// defined in : widget / state / middle +// defined in : widget / state / bottom void *widget_get_space_view(); // middle void *widget_get_graph_view_control(); // middle @@ -110,28 +132,50 @@ void *widget_get_graph_view_control(); // middle void *widget_get_space_edit_control(); // bottom void *widget_get_sequence_control(); // bottom -// called in : src/widget/state/top.c + +// called by : widget / state / top.c / get_situations_box() +// called by : prefer.c +// defined in : widget / state / top.c void widget_reset_all_situations_transparencies_to_value (int value); // top void widget_set_object_transparency_to_value (int rank, int value); // top -int widget_get_object_transparency (int i); // top +int widget_get_object_transparency (int i); // top /******************************************************************************/ /* R U L E S */ /******************************************************************************/ -// called in : src/widget/rules/distrib.c +// called by : widget / rules / dispatch.c / widget_get_rules_page() +// defined in : widget / rules / tree_tools / dispatch.c (= left) +// defined in : widget / rules / selected / dispatch.c (= right) + +void *widget_get_rules_tree_tools_pane(); +void *widget_get_rules_selected_pane(); + + +// called by : widget / rules / tree_tools / dispatch.c / widget_get_rules_tree_tools_pane() +// defined in : widget / rules / tree_tools / pilot_box.c +// defined in : widget / rules / tree_tools / freq.c + +void *widget_get_rules_pilot_box(); // pilot_box.c +void *widget_get_rules_tree_tools(); // pilot_box.c +void *widget_get_rules_use(); // freq.c + + +// called by : widget / rules / selected / dispatch.c / widget_get_rules_selected_pane() +// defined in : widget / rules / selected / dispatch.c +// defined in : widget / rules / selected / edit.c +// defined in : widget / rules / selected / analyse.c + +void *widget_get_selected_rule(); // dispatch.c +void *widget_get_rule_edit(); // edit.c +void *widget_get_rule_analyse(); // analyse.c + +// called by : widget / rules / selected / dispatch.c / widget_get_selected_rule() +// defined in : widget / rules / selected / text.c +// defined in : widget / rules / selected / image.c -void *widget_get_selected_rule(); -void *widget_get_rules_left_pane(); -void *widget_get_rules_page(); -void *widget_get_rule_edit(); -void *widget_get_rule_analyse(); -void *widget_get_rules_right_pane(); -void *widget_get_rules_pilot_box(); -void *widget_get_rules_tree_tools(); -void *widget_get_rules_use(); void *widget_get_selected_rule_texts(); void *widget_get_selected_rule_images(); @@ -139,8 +183,10 @@ void *widget_get_selected_rule_images(); /******************************************************************************/ /* D A T A */ /******************************************************************************/ -// in : data / ..._page -// called by topbar / .widget_design_text_window() +// called by : widget / data / dispatch / widget_get_data_page() +// defined in : widget / data / measures.c +// operations.c +// results.c void *widget_get_measures_page(); void *widget_get_results_page(); @@ -162,9 +208,8 @@ void *widget_get_user_rules_tree (); // see "labo.c" for specification of the tr /******************************************************************************/ /* T E X T S */ /******************************************************************************/ -// texts in : data / text / -// functions in : widget / stock.c -// used by text_window (see topbar/dispatch.c)) +// called by : widget / topbar / polytext.c +// texts in : data / text void *widget_get_text_from_address (gchar *text_name); @@ -183,7 +228,7 @@ void *widget_get_an_impression_of_what_a_rules_comparator_could_be(); /******************************************************************************/ /* L A B O */ /******************************************************************************/ -// now in : src/widget/rules/tree_tools/ +// now in : widget / rules / tree_tools // called by tree.c widget_get_user_rules_tree() void widget_let_us_create_a_complex_useless_and_expensive_tree (struct TreeNode_t *tree_root); diff --git a/src/widget/rules/dispatch.c b/src/widget/rules/dispatch.c index c52396a..675fea5 100644 --- a/src/widget/rules/dispatch.c +++ b/src/widget/rules/dispatch.c @@ -35,8 +35,8 @@ void *widget_get_rules_page() { GtkPaned *tree_vs_selected = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL)); - gtk_paned_set_start_child (tree_vs_selected, GTK_WIDGET (widget_get_rules_left_pane())); - gtk_paned_set_end_child (tree_vs_selected, GTK_WIDGET (widget_get_rules_right_pane())); + gtk_paned_set_start_child (tree_vs_selected, GTK_WIDGET (widget_get_rules_tree_tools_pane())); + gtk_paned_set_end_child (tree_vs_selected, GTK_WIDGET (widget_get_rules_selected_pane())); gtk_paned_set_position (tree_vs_selected, 340); // WARNING : c'est une position "absolue" gtk_paned_set_wide_handle (tree_vs_selected, TRUE); gtk_paned_set_shrink_start_child (tree_vs_selected, FALSE); diff --git a/src/widget/rules/selected/dispatch.c b/src/widget/rules/selected/dispatch.c index a9c8c73..6881fa6 100644 --- a/src/widget/rules/selected/dispatch.c +++ b/src/widget/rules/selected/dispatch.c @@ -42,7 +42,7 @@ void *widget_get_selected_rule() { return GTK_WIDGET (images_and_texts); } -void *widget_get_rules_right_pane() +void *widget_get_rules_selected_pane() { GtkPaned *rule_itself_vs_explore_edit_pane = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_VERTICAL)); gtk_paned_set_start_child (rule_itself_vs_explore_edit_pane, GTK_WIDGET (widget_get_selected_rule())); diff --git a/src/widget/rules/selected/image.c b/src/widget/rules/selected/image.c index c2b2af8..3f9a469 100644 --- a/src/widget/rules/selected/image.c +++ b/src/widget/rules/selected/image.c @@ -61,7 +61,7 @@ static GtkBox *rec_XYZ_box() GtkWidget *scroll_X = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, X_adjust); GtkWidget *scroll_Y = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, Y_adjust); GtkWidget *scroll_Z = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, Z_adjust); - gtk_widget_set_size_request (GTK_WIDGET (scroll_X), 0, H_XYZ_BOX_200); // OK (required) + gtk_widget_set_size_request (GTK_WIDGET (scroll_X), 0, H_XYZ_BOX); // OK (required) gtk_box_append (XYZ_scrollbar_box, GTK_WIDGET (gtk_label_new (" "))); // AD HOC (pour "centrer") gtk_box_append (XYZ_scrollbar_box, scroll_X); diff --git a/src/widget/rules/tree_tools/compare.c b/src/widget/rules/tree_tools/compare.c index 8ad813c..b5f11b7 100644 --- a/src/widget/rules/tree_tools/compare.c +++ b/src/widget/rules/tree_tools/compare.c @@ -148,10 +148,10 @@ static GtkWidget *do_rtfd (Stack stack_b); void *widget_get_an_impression_of_what_a_rules_comparator_could_be(){ GtkBox *compare_left = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); - gtk_widget_set_size_request (GTK_WIDGET (compare_left), W_COMPARATOR_64, 0); + gtk_widget_set_size_request (GTK_WIDGET (compare_left), W_COMPARATOR, 0); GtkBox *compare_right = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); - gtk_widget_set_size_request (GTK_WIDGET (compare_right), W_COMPARATOR_64, 0); + gtk_widget_set_size_request (GTK_WIDGET (compare_right), W_COMPARATOR, 0); initialize(&stack_b); diff --git a/src/widget/rules/tree_tools/dispatch.c b/src/widget/rules/tree_tools/dispatch.c index 1cff50a..5b705af 100644 --- a/src/widget/rules/tree_tools/dispatch.c +++ b/src/widget/rules/tree_tools/dispatch.c @@ -32,7 +32,7 @@ #include "../../../../include/signal.h" -void *widget_get_rules_left_pane () +void *widget_get_rules_tree_tools_pane () { GtkBox *rules_tree_and_pilot_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); gtk_box_append (rules_tree_and_pilot_box, GTK_WIDGET (widget_get_rules_pilot_box ())); diff --git a/src/widget/rules/tree_tools/freq.c b/src/widget/rules/tree_tools/freq.c index e3c9690..d8134e6 100644 --- a/src/widget/rules/tree_tools/freq.c +++ b/src/widget/rules/tree_tools/freq.c @@ -43,7 +43,7 @@ void *widget_get_rules_use () // GtkWidget *frame_rules_use = gtk_frame_new (" Rules use"); // gtk_frame_set_child (GTK_FRAME (frame_rules_use), GTK_WIDGET (scroll_rules_use)); - gtk_widget_set_size_request (GTK_WIDGET (scroll_rules_use), W_RULES_USE_90, 0); // OK (required) + gtk_widget_set_size_request (GTK_WIDGET (scroll_rules_use), W_RULES_USE, 0); // OK (required) gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scroll_rules_use), GTK_WIDGET (rules_use_box)); diff --git a/src/widget/state/bottom.c b/src/widget/state/bottom.c index 57201b4..e5c9570 100644 --- a/src/widget/state/bottom.c +++ b/src/widget/state/bottom.c @@ -64,7 +64,7 @@ void *widget_get_sequence_control() GTK_WIDGET (gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, adjust))); gtk_box_append (DO_UNDO_REDO_box, GTK_WIDGET(gtk_label_new ("\ DO - UNDO - REDO"))); - gtk_widget_set_size_request (GTK_WIDGET (DO_UNDO_REDO_box), W_DO_UNDO_REDO_BOX_1300, 0); // OK (required) + gtk_widget_set_size_request (GTK_WIDGET (DO_UNDO_REDO_box), W_DO_UNDO_REDO_BOX, 0); // OK (required) gtk_box_append (SEQUENCE_CONTROL_box, GTK_WIDGET (DO_UNDO_REDO_box)); gtk_box_append (SEQUENCE_CONTROL_box, GTK_WIDGET (gtk_button_new_with_label ("R U N / S T O P"))); diff --git a/src/widget/state/middle.c b/src/widget/state/middle.c index 00b7578..77672e7 100644 --- a/src/widget/state/middle.c +++ b/src/widget/state/middle.c @@ -44,7 +44,7 @@ static GtkBox *rec_XYZ_box() GtkWidget *scroll_X = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, X_adjust); GtkWidget *scroll_Y = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, Y_adjust); GtkWidget *scroll_Z = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, Z_adjust); - gtk_widget_set_size_request (GTK_WIDGET (scroll_X), 1, H_XYZ_BOX_200); // (provisoire) TODO + gtk_widget_set_size_request (GTK_WIDGET (scroll_X), 1, H_XYZ_BOX); // (provisoire) TODO gtk_box_append (XYZ_scrollbar_box, GTK_WIDGET (gtk_label_new (" "))); // AD HOC (pour "centrer") gtk_box_append (XYZ_scrollbar_box, scroll_X); diff --git a/src/widget/state/top.c b/src/widget/state/top.c index 06270c3..7183f8c 100644 --- a/src/widget/state/top.c +++ b/src/widget/state/top.c @@ -182,6 +182,8 @@ static void *get_situations_box() /* S T A T E p a g e > t o p l e v e l b o x */ /******************************************************************************/ +#define PARTITION_STATE_TOP 600 + void *widget_get_graph_view_control() { GtkWidget *scroll_objects = gtk_scrolled_window_new (); @@ -203,10 +205,10 @@ void *widget_get_graph_view_control() GtkWidget *objects_vs_situations_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); gtk_paned_set_start_child (GTK_PANED(objects_vs_situations_horizontal_pane), GTK_WIDGET (scroll_objects)); gtk_paned_set_end_child (GTK_PANED(objects_vs_situations_horizontal_pane), GTK_WIDGET (scroll_situations)); - gtk_paned_set_position (GTK_PANED (objects_vs_situations_horizontal_pane), ARBITRARY_PARTITION_600); + gtk_paned_set_position (GTK_PANED (objects_vs_situations_horizontal_pane), PARTITION_STATE_TOP); gtk_paned_set_shrink_start_child (GTK_PANED (objects_vs_situations_horizontal_pane), FALSE); gtk_paned_set_shrink_end_child (GTK_PANED (objects_vs_situations_horizontal_pane), FALSE); - gtk_widget_set_size_request (objects_vs_situations_horizontal_pane, 0, H_OBJECTS_SITUATIONS_130); // OK (required)) + gtk_widget_set_size_request (objects_vs_situations_horizontal_pane, 0, H_OBJECTS_SITUATIONS); // OK (required)) return objects_vs_situations_horizontal_pane; } diff --git a/src/widget/synth/dispatch.c b/src/widget/synth/dispatch.c index 8351a3e..8fc5b87 100644 --- a/src/widget/synth/dispatch.c +++ b/src/widget/synth/dispatch.c @@ -47,6 +47,8 @@ static void *widget_get_non_time_dependent_analysis_elements() // for fun ! return results_box; } +#define PARTITION_SYNTH 1540 + static void *widget_get_space_vs_non_time_dependent_analysis() { GtkWidget *space_vs_non_time_dependent_analysis = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); @@ -54,7 +56,7 @@ static void *widget_get_space_vs_non_time_dependent_analysis() GTK_WIDGET (widget_get_space_view())); 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), ARBITRARY_PARTITION_1600); + gtk_paned_set_position (GTK_PANED (space_vs_non_time_dependent_analysis), PARTITION_SYNTH); gtk_paned_set_shrink_start_child (GTK_PANED (space_vs_non_time_dependent_analysis), TRUE); gtk_paned_set_shrink_end_child (GTK_PANED (space_vs_non_time_dependent_analysis), TRUE); @@ -68,7 +70,7 @@ void *widget_get_synth_page() GTK_WIDGET (widget_get_space_vs_non_time_dependent_analysis())); gtk_paned_set_end_child (GTK_PANED (space_and_analysis_vs_history), GTK_WIDGET (widget_get_time_dependent_results_and_time_controls())); - gtk_paned_set_position (GTK_PANED (space_and_analysis_vs_history), ARBITRARY_PARTITION_750); + gtk_paned_set_position (GTK_PANED (space_and_analysis_vs_history), PARTITION_SYNTH); gtk_paned_set_shrink_start_child (GTK_PANED (space_and_analysis_vs_history), FALSE); gtk_paned_set_shrink_end_child (GTK_PANED (space_and_analysis_vs_history), FALSE); gtk_widget_set_size_request (space_and_analysis_vs_history, 0, H_MY_SCREEN); // OK (required)) diff --git a/src/widget/topbar/dispatch.c b/src/widget/topbar/dispatch.c index 68a173f..1e251d1 100644 --- a/src/widget/topbar/dispatch.c +++ b/src/widget/topbar/dispatch.c @@ -39,15 +39,12 @@ /******************************************************************************/ static GtkWidget *window_header_bar (GtkWindow *window); -void window_header_bar_left (GtkWidget *header_bar); -void window_header_bar_right (GtkWidget *header_bar); - void widget_design_main_window (GtkWindow *main_window) { GtkWidget *header_bar = window_header_bar (main_window); - window_header_bar_left (header_bar); - window_header_bar_right (header_bar); + window_design_header_bar_left (header_bar); + window_design_header_bar_right (header_bar); // use the next lineS to select the page that will be presented first // it triggers <=> signal.on_toggle_state_rule_data (a btt_NAME) @@ -99,3 +96,4 @@ char *widget_get_text_address_practice () { return "/home/jean/Gem-Graph/gem-graph-client/data/text/pratique.txt"; } + diff --git a/src/widget/topbar/left.c b/src/widget/topbar/left.c index 5da3633..6c627d9 100644 --- a/src/widget/topbar/left.c +++ b/src/widget/topbar/left.c @@ -44,7 +44,7 @@ void *widget_get_btt_state () {return btt_STATE;} void *widget_get_btt_rules () {return btt_RULES;} void *widget_get_btt_data () {return btt_DATA;} -void window_header_bar_left (GtkWidget *header_bar) +void window_design_header_bar_left (GtkWidget *header_bar) { gpointer no_local_data = NULL; diff --git a/src/widget/topbar/right.c b/src/widget/topbar/right.c index 9ae0b28..d460934 100644 --- a/src/widget/topbar/right.c +++ b/src/widget/topbar/right.c @@ -39,7 +39,7 @@ static void connect(GApplication *app, gpointer *data) { puts("Connect menu item clicked.\n"); } -void window_header_bar_right (GtkWidget *header_bar) +void window_design_header_bar_right (GtkWidget *header_bar) { gpointer no_local_data = NULL; diff --git a/src/widget/tree.c b/src/widget/tree.c index b0842c1..f699cc9 100644 --- a/src/widget/tree.c +++ b/src/widget/tree.c @@ -115,7 +115,7 @@ void *widget_get_user_rules_tree () gtk_widget_set_visible (GTK_WIDGET (scrolled_window), TRUE); gtk_widget_set_visible (GTK_WIDGET (list_view), TRUE); - gtk_widget_set_size_request (GTK_WIDGET (scrolled_window), W_TREE_160, 0); // OK (required) + gtk_widget_set_size_request (GTK_WIDGET (scrolled_window), W_TREE, 0); // OK (required) return scrolled_window; }