gem-graph/gem-graph-client
gem-graph
/
gem-graph-client
3
0
Fork 0
Code Issues 14 Pull Requests Projects Releases Activity

fsm_journal_publication_request (char *message) {fsm_journal_publish (gologos, message);}

This commit is contained in:
Jean Sirmai 2024-09-13 09:38:07 +02:00
parent 20adec4d78
commit 0e925fe882
Signed by: jean
GPG Key ID: FB3115C340E057E3
9 changed files with 98 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
include/fsm.h
View File

@ -46,25 +46,34 @@ typedef struct tool_list {int value; struct tool_list *suiv;} tool_list ;
typedef struct data_list {int value; struct data_list *suiv;} data_list ; typedef struct data_list {int value; struct data_list *suiv;} data_list ;
typedef struct disp_list {int value; struct disp_list *suiv;} disp_list ; typedef struct disp_list {int value; struct disp_list *suiv;} disp_list ;
// --------------------------------------------------------------- WIP ------ /******************************************************************************/
/* J O U R N A L */
/******************************************************************************/
#define PRIORITY_0 0 #define PRIORITY_0 0
#define PRIORITY_1 1 #define PRIORITY_1 1
#define PRIORITY_2 2 #define PRIORITY_2 2
#define PRIORITY_3 3 #define PRIORITY_3 3
#define JOURNAL_DATE_MAX_LENGTH 255
typedef struct unit {long yy_dd_mm; long usec; char *message; struct unit *prev; struct unit *next;} unit; typedef struct unit {long yy_dd_mm; long usec; char *message; struct unit *prev; struct unit *next;} unit;
typedef struct {unit *first; unit *last;} journal; // structure d'accès au journal typedef struct {unit *first; unit *last;} journal; // structure d'accès au journal
// journal glogos; // gg_logs, should be, but 'glogos' is funny 2024-09-11
void fsm_journal_init (journal *jj, char *message); // initialise void fsm_journal_init (journal *jj, char *message); // initialise
void fsm_journal_clear (journal *jj, char *message); // vide tout le journal void fsm_journal_clear (journal *jj, char *message); // vide tout le journal
void fsm_journal_push_front (journal *jj, char *message); // ajoute un évènement en début de journal void fsm_journal_push_front (journal *jj, char *message); // ajoute un évènement en début de journal
void fsm_journal_push_front_from_fsm (char *message); // id from fsm/dispatch
long fsm_journal_pop_back (journal *jj, char *message); // retire un évènement en fin de journal long fsm_journal_pop_back (journal *jj, char *message); // retire un évènement en fin de journal
int fsm_journal_length (journal jj); // nombre d'évènements dans le journal int fsm_journal_length (journal jj); // nombre d'évènements dans le journal
void fsm_journal_seek (journal jj, long usec, char *message); // recherche un évènement dans le journal void fsm_journal_seek (journal jj, long usec, char *message); // recherche un évènement dans le journal
void fsm_journal_view (journal jj, char *message); // affiche tout le journal void fsm_journal_publish (journal jj, char *message); // affiche tout le journal
void fsm_journal_test(char *message); void fsm_journal_test (char *message);
// --------------------------------------------------------------- WIP ------ // --------------------------------------------------------------- WIP ------
// ref: sudo cat /var/log/messages // ref: sudo cat /var/log/messages
void fsm_journal_view_request (char *message); // def: fsm/dispatch call: widget/dispatch; // journal fsm_get_journal(); // def: fsm/dispatch call: fsm/prefer/fsm_store_restore_reset()
void fsm_journal_publication_request (char *message); // def: fsm/dispatch call: widget/dispatch;
void fsm_journal_widget_event (char *message, int priority); // def: fsm/dispatch call: widget/dispatch; void fsm_journal_widget_event (char *message, int priority); // def: fsm/dispatch call: widget/dispatch;
// --------------------------------------------------------------- WIP ------ // --------------------------------------------------------------- WIP ------

35
src/fsm/dispatch.c
View File

@ -55,25 +55,30 @@
/* F S M I N I T */ /* F S M I N I T */
/******************************************************************************/ /******************************************************************************/
// --------------------------------------------------------------- WIP ------ // --------------------------------------------------------------- WIP ------
journal glogos; // gg_logs, should be, but 'glogos' is funny 2024-09-11 static journal gologos; // gg_logs, should be, but 'gologos' is funny 2024-09-11
// journal fsm_get_journal() {return gologos;}
void fsm_journal_push_front_from_fsm (char *message)
{
fsm_journal_push_front (&gologos, message);
}
void fsm_init() void fsm_init()
{ {
fsm_journal_push_front (&glogos, " fsm > fsm_init() start"); fsm_journal_push_front (&gologos, " fsm > fsm_init() start");
fsm_measures_list_init(); fsm_journal_push_front (&glogos, " fsm > fsm_measures_list_init()"); fsm_measures_list_init(); fsm_journal_push_front (&gologos, " fsm > fsm_measures_list_init()");
fsm_results_list_init(); fsm_journal_push_front (&glogos, " fsm > fsm_results_list_init()"); fsm_results_list_init(); fsm_journal_push_front (&gologos, " fsm > fsm_results_list_init()");
fsm_displayable_list_init(); fsm_journal_push_front (&glogos, " fsm > fsm_displayable_list_init()"); fsm_displayable_list_init(); fsm_journal_push_front (&gologos, " fsm > fsm_displayable_list_init()");
fsm_preferences_init(); fsm_journal_push_front (&glogos, " fsm > fsm_preferences_init()"); fsm_preferences_init(); fsm_journal_push_front (&gologos, " fsm > fsm_preferences_init()");
fsm_journal_push_front (&glogos, " fsm > fsm_init() end"); fsm_journal_push_front (&gologos, " fsm > fsm_init() end");
} }
void fsm_journal_view_request (char *message) {fsm_journal_view (glogos, message);} void fsm_journal_publication_request (char *message) {fsm_journal_publish (gologos, message);}
void fsm_journal_widget_event (char *message, int priority) void fsm_journal_widget_event (char *message, int priority)
{ {
if (priority > PRIORITY_0) if (priority > PRIORITY_0) // consider: >= instead 😄️
fsm_journal_push_front (&glogos, message); fsm_journal_push_front (&gologos, message);
} }
/******************************************************************************/ /******************************************************************************/
@ -82,7 +87,15 @@ void fsm_journal_widget_event (char *message, int priority)
static int preferences_have_been_modified = FALSE; static int preferences_have_been_modified = FALSE;
void fsm_set_preferences_state (bool value) {preferences_have_been_modified = value;} void fsm_set_preferences_state (bool value)
{
preferences_have_been_modified = value;
if (value) fsm_journal_push_front (&gologos,
" fsm > fsm_set_preferences_state() <> preferences modified = TRUE");
else fsm_journal_push_front (&gologos,
" fsm > fsm_set_preferences_state() <> preferences modified = FALSE");
}
bool fsm_get_preferences_state() {return preferences_have_been_modified;} bool fsm_get_preferences_state() {return preferences_have_been_modified;}
// preferences_have_been_modified // preferences_have_been_modified
// and should be stored before closing the current session. TODO // and should be stored before closing the current session. TODO

6
src/fsm/journal.c
View File

@ -121,10 +121,10 @@ void fsm_journal_seek (journal jj, long usec, char *message)
else printf ("> date (usec) %ld not found in journal\n", usec); else printf ("> date (usec) %ld not found in journal\n", usec);
} }
void fsm_journal_view (journal jj, char *message) void fsm_journal_publish (journal jj, char *message)
{ {
unit *a_unit = jj.last; unit *a_unit = jj.last;
char buf[80]; char buf [JOURNAL_DATE_MAX_LENGTH];
int nb = 0; int nb = 0;
while (a_unit) while (a_unit)
{ {
@ -135,6 +135,6 @@ void fsm_journal_view (journal jj, char *message)
a_unit = a_unit->prev; a_unit = a_unit->prev;
nb ++; nb ++;
} }
printf ("view journal (n = %d)\n", nb); printf ("%s (n = %d)\n", message, nb);
} }

43
src/fsm/prefer.c
View File

@ -73,23 +73,28 @@ void fsm_store_restore_reset (int choice, int value)
{ {
switch (choice) { switch (choice) {
case (STORE) : case (STORE) :
printf("Objects transparencies STORE (value = %3d) (see prefer.c)\n", value); fsm_journal_push_front_from_fsm (
"prefer > fsm_store_restore_reset() <> switch (STORE)");
for (int i = 0; i < n_objects; i++) { for (int i = 0; i < n_objects; i++) {
p [i] = widget_get_object_transparency (i); p [i] = widget_get_object_transparency (i);
widget_set_object_transparency_to_value (i, p [i]); widget_set_object_transparency_to_value (i, p [i]);
} }
break; break;
case (RESTORE) : case (RESTORE) :
printf("Objects transparencies RESTORE (value = %3d) (see prefer.c)\n", value); fsm_journal_push_front_from_fsm (
"prefer > fsm_store_restore_reset() <> switch (RESTORE)");
for (int i = 0; i < n_objects; i++) for (int i = 0; i < n_objects; i++)
widget_set_object_transparency_to_value (i, p [i]); widget_set_object_transparency_to_value (i, p [i]);
break; break;
case (RESET) : case (RESET) :
printf("Objects transparencies RESET (value = %3d) (see prefer.c)\n", value); fsm_journal_push_front_from_fsm (
"prefer > fsm_store_restore_reset() <> switch (RESET)");
for (int i = 0; i < n_objects; i++) for (int i = 0; i < n_objects; i++)
widget_set_object_transparency_to_value (i, value); // i * 4 // rand() % 127 widget_set_object_transparency_to_value (i, value); // i * 4 // rand() % 127
break; break;
default : printf("default in signal.switch_store_restore_reset()\n"); default :
fsm_journal_push_front_from_fsm (
"prefer > fsm_store_restore_reset() <> switch (default)");
} }
fsm_set_preferences_state (TRUE); fsm_set_preferences_state (TRUE);
@ -104,7 +109,9 @@ static int reset_situations_to_value = -1;
void fsm_reset_all_situations_transparencies_at_value (int value) void fsm_reset_all_situations_transparencies_at_value (int value)
{ {
printf("reset_all_situations_transparencies_at_value %3d (see prefer.c)\n", value); char str1[140] = "prefer > fsm_reset_all_situations_transparencies_at_value() ";
char str2[10]; sprintf(str2, "%d, ", value); strcat(str1, str2);
fsm_journal_push_front_from_fsm ("prefer > fsm_reset_all_situations_transparencies_at_value() << TODO (prefer)"); // TODO
reset_situations_to_value = value; reset_situations_to_value = value;
widget_reset_all_situations_transparencies_to_value (value); widget_reset_all_situations_transparencies_to_value (value);
} }
@ -115,23 +122,27 @@ void fsm_reset_all_situations_transparencies_at_value (int value)
/* D I S P L A Y E D R E S U L T S */ /* D I S P L A Y E D R E S U L T S */
/******************************************************************************/ /******************************************************************************/
static void *list_displayables; // static void *list_displayables;
void fsm_add_displayable (char *displayable_name) void fsm_add_displayable (char *displayable_name)
{ {
printf("fsm_add_displayable %p <<< %s (see prefer.c)\n", fsm_journal_push_front_from_fsm (
list_displayables, displayable_name); strcat("prefer > fsm_add_displayable() ", displayable_name)); // TODO
} }
/******************************************************************************/ /******************************************************************************/
/* P R E F E R E N C E S */ /* P R E F E R E N C E S */
/******************************************************************************/ /******************************************************************************/
void fsm_preferences_init () {} void fsm_preferences_init ()
void fsm_displayable_list_init () {} {
/* fsm_journal_push_front_from_fsm (
void fsm_preferences_init () {printf("fsm/prefer |\ "prefer > fsm_preferences_init()");
src/fsm/prefer.c fsm_preferences_init()\n");} }
void fsm_displayable_list_init () {printf("fsm/prefer |\
src/fsm/prefer.c fsm_displayable_list_init()\n");} void fsm_displayable_list_init ()
*/ {
fsm_journal_push_front_from_fsm (
"prefer > fsm_displayable_list_init()");
}

2
src/main.c
View File

@ -145,6 +145,8 @@ int main (int argc, char **argv)
int status = g_application_run (G_APPLICATION (app), argc, argv); int status = g_application_run (G_APPLICATION (app), argc, argv);
g_object_unref (app); g_object_unref (app);
fsm_journal_publication_request ("main > fsm_journal_view_request() That'all folks ! 👋️ 😄️");
return status; return status;
} }

3
src/signal.c
View File

@ -349,8 +349,7 @@ void on_clicked_topbar_right_search (GtkWidget *btt_menu, gpointer list_box) {
void on_clicked_topbar_right_home (GtkWidget *btt_reset, gpointer data) void on_clicked_topbar_right_home (GtkWidget *btt_reset, gpointer data)
{ {
fsm_journal_widget_event ("signal > on_clicked_topbar_right_home()", PRIORITY_1); fsm_journal_widget_event ("signal > on_clicked_topbar_right_home()", PRIORITY_1);
fsm_journal_view_request ("signal > fsm_journal_view_request()"); // gtk_window_present (GTK_WINDOW (widget_get_dialog_window())); // NB works only once. < TODO
// gtk_window_present (GTK_WINDOW (widget_get_dialog_window())); // NB it works only once. < TODO
} }

38
src/widget/state/top.c
View File

@ -182,32 +182,30 @@ static void *get_situations_box()
void *widget_get_graph_view_control() void *widget_get_graph_view_control()
{ {
GtkWidget *scroll_objects = gtk_scrolled_window_new (); GtkWidget *scroll_objects = gtk_scrolled_window_new ();
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_objects), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_objects), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
GtkWidget *frame_objects = gtk_frame_new (" Objects"); // defines each class of object transparency GtkWidget *frame_objects = gtk_frame_new (" Objects"); // defines each class of object transparency
gtk_frame_set_child (GTK_FRAME (frame_objects), GTK_WIDGET (get_objects_box())); gtk_frame_set_child (GTK_FRAME (frame_objects), GTK_WIDGET (get_objects_box()));
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scroll_objects), frame_objects); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scroll_objects), frame_objects);
GtkWidget *scroll_situations = gtk_scrolled_window_new (); GtkWidget *scroll_situations = gtk_scrolled_window_new ();
gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_situations), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scroll_situations), GTK_POLICY_AUTOMATIC, GTK_POLICY_NEVER);
GtkWidget *frame_situations = gtk_frame_new (" Situations"); // facilitates each situation identification GtkWidget *frame_situations = gtk_frame_new (" Situations"); // facilitates each situation identification
gtk_frame_set_child (GTK_FRAME (frame_situations), GTK_WIDGET (get_situations_box())); gtk_frame_set_child (GTK_FRAME (frame_situations), GTK_WIDGET (get_situations_box()));
gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scroll_situations), frame_situations); gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scroll_situations), frame_situations);
GtkWidget *objects_vs_situations_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); 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_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_end_child (GTK_PANED(objects_vs_situations_horizontal_pane), GTK_WIDGET (scroll_situations));
gtk_paned_set_position (GTK_PANED (objects_vs_situations_horizontal_pane), PARTITION_STATE_TOP); 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_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_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); // OK (required)) gtk_widget_set_size_request (objects_vs_situations_horizontal_pane, 0, H_OBJECTS_SITUATIONS); // OK (required))
return objects_vs_situations_horizontal_pane; return objects_vs_situations_horizontal_pane;
} }

10
src/widget/topbar/dispatch.c
View File

@ -49,11 +49,11 @@ void widget_design_main_window (GtkWindow *main_window, GtkApplication *app)
static GtkWidget *window_topbar (GtkWindow *window) static GtkWidget *window_topbar (GtkWindow *window)
{ {
char *title = "E coli (with permission from David S. Goodsell, 2009)"; char *title = "E coli (with permission from David S. Goodsell, 2009)";
GtkWidget *topbar = GTK_WIDGET (gtk_header_bar_new ()); GtkWidget *topbar = GTK_WIDGET (gtk_header_bar_new ());
gtk_header_bar_set_title_widget (GTK_HEADER_BAR (topbar), gtk_label_new (title)); gtk_header_bar_set_title_widget (GTK_HEADER_BAR (topbar), gtk_label_new (title));
gtk_window_set_titlebar (window, topbar); gtk_window_set_titlebar (window, topbar);
return topbar; return topbar;
} }

5
src/widget/topbar/right.c
View File

@ -43,6 +43,11 @@ static void display_widgets_at_the_right_side (GtkWidget *header_bar)
{ {
gpointer no_local_data = NULL; gpointer no_local_data = NULL;
// next line removes the "minimize,maximize,close" buttons from the topbar right
// https://docs.gtk.org/gtk4/method.HeaderBar.set_decoration_layout.html
// gtk_header_bar_set_decoration_layout (GTK_HEADER_BAR (topbar), "");
// I wanted once to trigger the journal publication on: gtk_window_close (GtkWindow* window)
GtkButton *btt_go_home = GTK_BUTTON (gtk_button_new ()); GtkButton *btt_go_home = GTK_BUTTON (gtk_button_new ());
gtk_button_set_icon_name (btt_go_home, "go-home-symbolic"); gtk_button_set_icon_name (btt_go_home, "go-home-symbolic");
gtk_widget_error_bell (GTK_WIDGET (btt_go_home)); // << TODO est-ce possible ? gtk_widget_error_bell (GTK_WIDGET (btt_go_home)); // << TODO est-ce possible ?