From 3bcc85637a7b8a3fdf4c783a2b065966b8caaccc Mon Sep 17 00:00:00 2001 From: Jean Sirmai Date: Tue, 1 Oct 2024 11:21:28 +0200 Subject: [PATCH] =?UTF-8?q?INDEX=20+=20JOURNAL=20=20Version=20coh=C3=A9ren?= =?UTF-8?q?te,=20utilisable=20pour=20un=20'merge'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- alphabetic_index.all | 244 ++++++++++++++++++++++++------------------- include/graphics.h | 2 +- include/util.h | 9 -- 3 files changed, 138 insertions(+), 117 deletions(-) diff --git a/alphabetic_index.all b/alphabetic_index.all index 9fe61e4..6de8682 100644 --- a/alphabetic_index.all +++ b/alphabetic_index.all @@ -22,38 +22,46 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ concat util/strings_op -create_axis_slider util/draw/gl (util.h 148) -graphics_create_shader 187 -graphics_draw 107 -graphics_draw_color 159 333 -graphics_draw_grids_on_space_faces_lines 395 -graphics_draw_grids_on_space_faces_vertex 390 -graphics_draw_line 168 342 -graphics_draw_one_arrow_line 365 -graphics_draw_one_arrow_vertex 355 -graphics_draw_plan 177 351 -graphics_draw_space_ridges_lines 381 -graphics_draw_space_ridges_vertex 375 -graphics_draw_vertex 146 -graphics_init 98 276 -graphics_init_buffers 136 320 -graphics_init_graphics_stack 127 -graphics_init_shaders 125 303 -graphics_model_setup 353 -graphics_print_stack 221 -graphics_render_stack 87 -graphics_set_arrow 401 -graphics_setup_glarea 89 -graphics_shutdown 116 294 +create_axis_slider util/draw/gl 223 +free_stack_slot graphics/init 36 +free_stack_slot_size graphics/init 37 +get_user_tree_model util/tree 66 static +get_user_tree_model_child util/tree 49 static +graphics_create_shader 187 ? +graphics_debug_callback graphics/init 53 static +graphics_draw graphics/draw 150 +graphics_draw_color graphics/draw 74 +graphics_draw_grids_on_space_faces_lines graphics/grid 129 +graphics_draw_grids_on_space_faces_vertex graphics/grid 75 +graphics_draw_line graphics/draw 100 +graphics_draw_one_arrow_line 365 ? +graphics_draw_one_arrow_vertex 355 ? +graphics_draw_plan graphics/draw 124 +graphics_draw_space_ridges_lines graphics/grid 62 +graphics_draw_space_ridges_vertex graphics/grid 30 +graphics_draw_vertex graphics/draw 40 +graphics_init graphics/init 108 +graphics_init_buffers graphics/init 326 +graphics_init_graphics_stack 127 ? +graphics_init_shaders graphics/init 370 +graphics_model_setup graphics/init 228 +graphics_print_stack 221 ? +graphics_render_stack 87 ? +graphics_set_arrow 401 ? +graphics_setup_glarea 89 ? +graphics_shutdown graphics/init 169 graphics_shutdown_graphics_stack 128 -graphics_update_axis_stack 129 +graphics_stack graphics/init 34 +graphics_stack_size graphics/init 35 +graphics_stack_t graphics.h +graphics_update_axis_stack 129 ? fsm_add_data fsm/measures/data_list fsm_add_displayable fsm/preferences/manager fsm_add_measure fsm/measures/manager fsm_add_result fsm/results/manager -fsm_disp_add_chart TODO -fsm_disp_get_chart TODO -fsm_disp_remove_chart TODO +fsm_disp_add_chart fsm/measures/disp_list +fsm_disp_get_chart fsm/measures/disp_list +fsm_disp_remove_chart fsm/measures/disp_list fsm_enum_exec_edit fsm.h fsm_enum_journal_severity fsm.h fsm_enum_journal_source fsm.h @@ -91,114 +99,136 @@ fsm_set_exec_edit fsm/dispatch fsm_set_preferences_modified fsm/dispatch fsm_set_state_rules_data fsm/dispatch fsm_set_store_restore_reset fsm/dispatch -on_setup_user_tree_factory 96 fsm_struct_journal fsm.h fsm_struct_journal_unit fsm.h fsm_struct_list_data fsm.h fsm_struct_list_disp fsm.h fsm_struct_list_tool fsm.h -on_axis_value_change 111 -on_bind_user_tree_factory 98 -on_clicked_topbar_right_home 130 < to rename -on_clicked_topbar_right_search 131 < to rename -on_discard_current_model_before_editing 86 -on_entry_name_delete_after 168 -on_entry_name_insert_after 167 -on_glarea_realize 108 -on_glarea_render 107 -on_glarea_unrealize 109 -on_measure_ ... 141 sqq. -on_resetting_XYZ_in_state_page 122 -on_select_rules_first 142 -on_save_current_model_before_editing 85 -on_situations_box_do_reset 120 -on_toggle_exec_edit 75 < to rename -on_toggle_state_rules_data 76 < to rename -on_topbar_right_measure_clicked 132 -on_updating_objects_transparencies 119 -on_windows_activation 53 -on_windows_startup 54 -on_write_current_model 87 -parse_model_get_dim 32 -parse_model_get_dim_value 33 -parse_model_get_multiplicity 34 -parse_model_get_next_arrow 36 -parse_model_get_next_state 35 -parse_model_get_state_arrows_count 40 -parse_model_init 29 -parse_model_shutdown 30 +on_auto_notification signal 37 static +on_axis_value_change signal 181 +on_bind_user_tree_factory signal 81 +on_clicked_topbar_right_home signal 373 < to rename +on_clicked_topbar_right_search signal 364 < to rename +on_discard_current_model_before_editing signal 228 +on_entry_name_delete_after signal 547 +on_entry_name_insert_after signal 542 +on_glarea_realize signal 132 +on_glarea_render signal 112 +on_glarea_unrealize signal 158 +on_measure_ ... signal 453 sqq. +on_realize_debug util/draw/gl 335 static +on_render_debug util/draw/gl 345 static +on_resetting_XYZ_in_state_page signal 404 +on_save_current_model_before_editing signal 220 +on_select_rules_first signal 446 +on_setup_user_tree_factory signal 73 +on_situations_box_do_reset signal 412 +on_start_new_measure signal 439 +on_toggle_exec_edit signal 254 < to rename +on_toggle_state_rules_data signal 286 < to rename +on_topbar_right_measure_clicked signal 426 +on_updating_objects_transparencies signal 389 +on_user_tree_expander_toggled signal 64 static +on_windows_activation widget/dispatch 67 +on_windows_startup widget/dispatch 61 +on_write_current_model signal 236 +parse_model_get_dim util/parse 231 +parse_model_get_dim_value util/parse 244 +parse_model_get_multiplicity util/parse 255 +parse_model_get_next_arrow util/parse 346 +parse_model_get_next_state util/parse 269 +parse_model_get_state_arrows_count util/parse 295 +parse_model_init 29 (not used) +parse_model_shutdown util/parse 88 +parse_parse_model_init util/parse 46 +shader frag graphics/shader +shader vert graphics/shader +stack_index stack_index 38 +stack_index_size stack_index 39 +stack_index_t util/draw/gl.c 32 +switch_state_rules_data signal 305 static TreeNode_t widget.h (rename ?) -util_gl_clean_stack_index 112 -util_gl_get_stack 83 -util_gl_init_stack 101 -util_gl_is_util_ready 92 -util_gl_render_stack 121 -util_gl_setup_glarea 158 -util_gl_shutdown_all_stacks 139 -util_gl_shutdown_stack 110 -util_gl_update_axis 130 -util_read_file 32 -widget_add_tree_child_node util/tree -widget_create_user_rules_tree_node 242 +util_gl_clean_stack_index util/draw/gl.c 150 +util_gl_get_stack util/draw/gl.c 66 +util_gl_init_stack util/draw/gl.c 102 +util_gl_is_ready util/draw/gl.c 84 +util_gl_is_util_ready 92 TODO +util_gl_render_stack util/draw/gl.c 166 +util_gl_set_arrow util/draw/gl.c 42 +util_gl_setup_glarea util/draw/gl.c 364 +util_gl_shutdown_all_stacks util/draw/gl.c 207 +util_gl_shutdown_stack util/draw/gl.c 133 +util_gl_update_axis util/draw/gl.c 187 +util_double_list_test util/tests +util_list_2x2_ ^c^v (8 fonctions) util/list_2x2 +util_pile_ ^c^v (5 fonctions) util/pile +util_pile_test util/tests +util_read_file util/io +util_sorted_list_ ^c^v (5 fonctions) util/sorted_list +util_sorted_list_test util/tests +util_trigger_test util/tests +widget_add_tree_child_node util/tree 32 +widget_create_user_rules_tree_node util/tree 41 widget_design_dialog_window widget/dispatch widget_design_main_window widget/dispatch widget_design_text_window widget/dispatch widget_measure_do_select_rules_first widget/measure/dispatch widget_measure_do_ ... 295 sqq. -widget_measure_event_occurences_dates 307 -widget_measure_event_occurences_nb 306 -widget_measure_event_occurences_situations 308 -widget_measure_other_events_between_the_two 310 -widget_measure_time_elapsed_between_two_events 309 +widget_measure_event_occurences_dates widget/measure/dispatch +widget_measure_event_occurences_nb widget/measure/dispatch +widget_measure_event_occurences_situations widget/measure/dispatch +widget_measure_other_events_between_the_two widget/measure/dispatch +widget_measure_time_elapsed_between_two_events widget/measure/dispatch widget_get_address_text_theory widget/topbar/dispatch widget_get_address_text_practice widget/topbar/dispatch -widget_get_btt_label_data widget/dispatch -widget_get_btt_label_rules widget/dispatch -widget_get_btt_label_state widget/dispatch -widget_get_btt_label_synth widget/dispatch +widget_get_btt_label_data widget/topbar/left +widget_get_btt_label_rules widget/topbar/left +widget_get_btt_label_state widget/topbar/left +widget_get_btt_label_synth widget/topbar/left widget_get_dialog_window widget/dispatch widget_get_graph_view_control widget/state/middle widget_get_main_window widget/dispatch widget_get_non_time_dependent widget/synth/dispatch -widget_get_object_transparency 159 -widget_get_page_data widget/dispatch -widget_get_page_engine widget/dispatch -widget_get_page_measure widget/dispatch -widget_get_page_state widget/dispatch +widget_get_object_transparency widget/state/top +widget_get_page_data widget/results/dispatch +widget_get_page_engine 104 TODO +widget_get_page_measure widget/measure/dispatch +widget_get_page_state widget/state/dispatch widget_get_page_synth widget/synth/dispatch -widget_get_pane_all_rules_left 184 -widget_get_pane_selected_rule_right 185 -widget_get_results_box_display 232 -widget_get_results_box_organize 231 -widget_get_results_box_time 233 +widget_get_pane_all_rules_left widget/all_rules/dispatch +widget_get_pane_selected_rule_right widget/one_rule/dispatch +widget_get_results_box_display widget/results/display +widget_get_results_box_organize widget/results/organize +widget_get_results_box_time widget/results/display widget_get_rule_edition_tools widget/one_rule/geometry/edit widget_get_rule_investigation_tools widget/one_rule/geometry/investigate -widget_get_rule_geometry_and_algebra 187 (not used)) -widget_get_rules_pilot_box 193 -widget_get_rules_tree_tools 194 -widget_get_rules_use 195 -widget_get_selected_rule 203 -widget_get_selected_rule_algebra 211 -widget_get_selected_rule_assignations_list_btt widget/one_rule/algebra/assignations -widget_get_selected_rule_before_after 220 -widget_get_selected_rule_camera 219 +widget_get_rule_geometry_and_algebra 187 TODO (not yet used) +widget_get_rules_pilot_box widget/all_rules/tree/pilot_box +widget_get_rules_tree_tools widget/all_rules/tree/pilot_box +widget_get_rules_use widget/all_rules/tree/freq +widget_get_selected_rule widget/one_rule/dispatch +widget_get_selected_rule_algebra widget/one_rule/algebra/dispatch +widget_get_selected_rule_assignations_list_btt widget/one_rule/algebra/assign +widget_get_selected_rule_before_after widget/one_rule/geometry/geometry +widget_get_selected_rule_camera widget/one_rule/geometry/camera widget_get_selected_rule_conditions_list_btt widget/one_rule/algebra/conditions -widget_get_selected_rule_geometry 212 +widget_get_selected_rule_geometry widget/one_rule/geometry/dispatch widget_get_selected_rule_identity_btt widget/one_rule/algebra/identity -widget_get_sequence_control 150 -widget_get_space_edit_control 149 +widget_get_sequence_control widget/state/bottom +widget_get_space_edit_control widget/state/bottom widget_get_space_view widget/state/middle widget_get_space_vs_non_time_dependent widget/synth/dispatch -widget_get_text_from_address 257 +widget_get_text_from_address widget/topbar/modal widget_get_text_window widget/dispatch widget_get_time_dependent widget/synth/time -widget_get_user_rules_tree 246 -widget_reset_XYZ_scrollbars_rule 166 -widget_reset_XYZ_scrollbars_state 167 -widget_reset_XYZ_scrollbars_synth 168 -widget_set_item_text 218 +widget_get_user_rules_tree util/tree 88 +widget_reset_XYZ_scrollbars_rule 166 TODO +widget_reset_XYZ_scrollbars_state 167 TODO +widget_reset_XYZ_scrollbars_synth 168 TODO +widget_set_item_text widget/one_rule/algebra/dispatch widget_set_objects_value widget/state/top widget_set_situations_value widget/state/top +widget_state_XYZ_reset_all widget/state/middle TODO (dispatch) window_design_topbar_left widget/dispatch window_design_topbar_right widget/dispatch diff --git a/include/graphics.h b/include/graphics.h index a9ff5f8..db91556 100644 --- a/include/graphics.h +++ b/include/graphics.h @@ -156,7 +156,7 @@ void graphics_draw_vertex (const int graphics_stack_id, * * @return void */ -void graphics_draw_color (const int graphics_stack_id, GLfloat r, GLfloat g, GLfloat b); +//void graphics_draw_color (const int graphics_stack_id, GLfloat r, GLfloat g, GLfloat b); /* * Writes values to describe a line from a to b into the line buffer diff --git a/include/util.h b/include/util.h index 45b995b..2a1695f 100644 --- a/include/util.h +++ b/include/util.h @@ -147,12 +147,3 @@ void util_gl_shutdown_all_stacks(void); */ GtkWidget *create_axis_slider(int axis); -/* - * Creates GLArea and indexes it - * - * @params target_mode, meaning which util_gl_stack we're on - * target_widget, meaning the box that will host the GLArea - * - * @returns bool, true if success - */ -bool util_gl_setup_glarea(int target_mode, GtkWidget *target_widget);