diff --git a/cold.c b/cold.c index b7f1b78..3a8e919 100644 --- a/cold.c +++ b/cold.c @@ -1,366 +1,7 @@ #include #include #include "cold.h" +#include "widgets.h" +#include "pages.h" void print_text(GtkWidget *widget, gpointer data) {g_print (data);} - -GtkWidget *get_a_space_test_image(){ - GtkWidget *image; - image = GTK_WIDGET(get_scrolled_gl_area()); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/aXoris.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/gg sketch.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/E coli.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/E coli resized.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/E coli by David S. Goodsell (2009).png"); - return image; -} - -GtkWidget *get_scroll_speed(){ - GtkAdjustment *speed_adjust = gtk_adjustment_new (0, 0, 100, 1, 0, 0); - GtkWidget *scroll_speed = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, speed_adjust); - return scroll_speed; -} - -// TODO cliquer sur "RUN" --> affiche "STOP" (et inversement) -GtkBox *get_RUN_STOP_box(){ - GtkBox *RUN_STOP_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); // spacing = 2 - - GtkWidget *RUN_Label = GTK_WIDGET (gtk_label_new (NULL)); // "RUN")); - const char *str = " RUN-STOP"; - const char *format = "\%s"; // ^c^v no more... - char *markup; - - markup = g_markup_printf_escaped (format, str); - gtk_label_set_markup (GTK_LABEL (RUN_Label), markup); // Sets the labels text and attributes from markup. - g_free (markup); - - gtk_label_set_max_width_chars (GTK_LABEL(RUN_Label), 12); - gtk_label_set_wrap (GTK_LABEL(RUN_Label), TRUE); - gtk_label_set_xalign (GTK_LABEL(RUN_Label), 0.5); // xalign value, between 0 and 1 - gtk_label_set_yalign (GTK_LABEL(RUN_Label), 0.5); - gtk_label_set_selectable (GTK_LABEL(RUN_Label), FALSE); // default = FALSE - gtk_label_set_single_line_mode (GTK_LABEL(RUN_Label), TRUE); // default = TRUE - // - gtk_box_append (RUN_STOP_box, RUN_Label); - return RUN_STOP_box; -} - -GtkBox *get_STEP_by_STEP_box(){ - GtkBox *STEP_by_STEP_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); - GtkWidget *STEP_by_STEP_Label = GTK_WIDGET (gtk_label_new ("ONE\nSTEP")); - gtk_box_append (STEP_by_STEP_box, STEP_by_STEP_Label); - return STEP_by_STEP_box; -} - -GtkBox *get_ZOOM_box(){ - GtkBox *ZOOM_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); - GtkWidget *ZOOM_Label = GTK_WIDGET (gtk_label_new ("ZOOM\n ---\n(space\nstruct.)")); - gtk_box_append (ZOOM_box, ZOOM_Label); - return ZOOM_box; -} - -GtkBox *get_XYZ_box(){ - GtkBox *XYZ_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); // spacing = 2 - // GtkWidget *scale_X = gtk_scale_button_new (0, 360, 10, NULL); < à étudier - // (double min, double max, double step, const char** icons) - GtkAdjustment *X_adjust = gtk_adjustment_new (0, 0, 380, 1, 0, 0); - GtkAdjustment *Y_adjust = gtk_adjustment_new (0, 0, 380, 1, 0, 0); - GtkAdjustment *Z_adjust = gtk_adjustment_new (0, 0, 380, 1, 0, 0); - 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_box_append (XYZ_box, scroll_X); - gtk_box_append (XYZ_box, scroll_Y); - gtk_box_append (XYZ_box, scroll_Z); - -// gtk_box_set_baseline_position (XYZ_box, GTK_BASELINE_POSITION_BOTTOM); - - return XYZ_box; -} - -GtkBox *get_ELAPSED_TIME_box(){ - GtkBox *ELAPSED_TIME_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); - -// GtkProgressBar *get_simulation_time_extent_buffer(){ - GtkProgressBar *buffer = GTK_PROGRESS_BAR (gtk_progress_bar_new ()); - gtk_progress_bar_set_text (buffer, "<--- [buffer] (simulation extent time) --->"); - gtk_progress_bar_set_show_text (buffer, TRUE); - - gtk_box_append (ELAPSED_TIME_box, GTK_WIDGET(buffer)); - return ELAPSED_TIME_box; -} - -GtkProgressBar *get_simulation_time_extent_buffer(){ - - GtkProgressBar *buffer = GTK_PROGRESS_BAR (gtk_progress_bar_new ()); - gtk_progress_bar_set_text (buffer, "<--- [buffer] (simulation extent time) --->"); - gtk_progress_bar_set_show_text (buffer, TRUE); - - return buffer; -} - -GtkBox *get_objects_box(){ - GtkBox *objects_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); - gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" membrane "))); - gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" co-enzyme A "))); - gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" ribosome "))); - gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" cytochrome C "))); - gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" ATP synthase "))); - gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" chromosome "))); - return objects_box; -} - -GtkBox *get_situations_box(){ - GtkBox *situations_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); - gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" transcription "))); - gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" épissage "))); - gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" translation "))); - gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" transport Na/K "))); - gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" ubiquitination "))); - gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" rotation du moteur flagellaire "))); - return situations_box; -} - -static GtkWidget *get_frame_objects(){ - GtkWidget *frame_objects = gtk_frame_new (" Objects"); // defines each class of object transparence - gtk_widget_set_size_request (frame_objects, 0, H_STYLES_PANE); // < utile seulement pour la largeur min/max - gtk_frame_set_child (GTK_FRAME (frame_objects), GTK_WIDGET (get_objects_box())); - return frame_objects; -} - -static GtkWidget *get_frame_situations(){ - GtkWidget *frame_situations = gtk_frame_new (" Situations"); // facilitates each situation identification - gtk_widget_set_size_request (GTK_WIDGET (frame_situations), 0, H_STYLES_PANE); // < utile seulement pour la largeur min/max - gtk_frame_set_child (GTK_FRAME (frame_situations), GTK_WIDGET (get_situations_box())); - return frame_situations; -} - -GtkWidget *get_objects_and_situations_horizontal_pane(){ - GtkWidget *objects_and_situations_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - gtk_paned_set_start_child (GTK_PANED(objects_and_situations_horizontal_pane), GTK_WIDGET (get_frame_objects())); - gtk_paned_set_end_child (GTK_PANED(objects_and_situations_horizontal_pane), GTK_WIDGET (get_frame_situations())); - return objects_and_situations_horizontal_pane; -}GtkScrolledWindow *get_scrolled_gl_area(){ - GtkScrolledWindow *scrolled = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new()); - gtk_scrolled_window_set_min_content_width (scrolled, W_IMAGE); - gtk_scrolled_window_set_min_content_height (scrolled, H_IMAGE); -// GtkAdjustment *width = gtk_adjustment_new (600, 300, 1000, 1, 1, 1000); -// GtkAdjustment *height = gtk_adjustment_new (600, 300, 1000, 1, 1, 1000); - // (value, lower, upper, step_increment, page_increment, page_size) -// GtkWidget *GLarea = gtk_gl_area_new(); -// gtk_scrolled_window_set_child (scrolled, GLarea); -// https://docs.gtk.org/gtk4/class.GLArea.html - return scrolled; -} - - - - - -/*---------------------------------------------------------------------------*/ - - - -GtkWidget *get_edit_rules_page_new(){ - GtkWidget *xxx_grid = gtk_grid_new(); - return xxx_grid; -} - -GtkWidget *get_edit_measures_page_new(){ - GtkWidget *measures_grid = gtk_grid_new(); - return measures_grid; -} - -GtkWidget *get_edit_results_page_new(){ - GtkWidget *xxx_grid = gtk_grid_new(); - return xxx_grid; -} - -GtkWidget *get_edit_discuss_page_new(){ - GtkWidget *xxx_grid = gtk_grid_new(); - return xxx_grid; -} - -GtkWidget *get_edit_help_page_new(){ - GtkWidget *xxx_grid = gtk_grid_new(); - return xxx_grid; -} - -GtkWidget *get_run_measures_page_new(){ - GtkWidget *measures_grid = gtk_grid_new(); - gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("movements"), 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("transports"), 1, 0, 1, 1); - gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("transformations"), 2, 0, 1, 1); - gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("objects"), 0, 1, 1, 1); - gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("situations"), 1, 1, 1, 1); - return measures_grid; -} - -GtkWidget *get_run_results_page_new(){ - GtkWidget *results_grid = gtk_grid_new(); - gtk_grid_attach (GTK_GRID(results_grid), gtk_button_new_with_label ("Repartitions"), 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID(results_grid), gtk_button_new_with_label ("Correlations"), 0, 1, 1, 1); - gtk_grid_attach (GTK_GRID(results_grid), gtk_button_new_with_label ("Evolutions"), 0, 2, 1, 1); - return results_grid; -} - -GtkWidget *get_run_discuss_page_new(){ - GtkWidget *discuss_grid = gtk_grid_new(); - gtk_grid_attach (GTK_GRID (discuss_grid), gtk_button_new_with_label ("Interpretations"), 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (discuss_grid), gtk_button_new_with_label ("Discussions"), 0, 1, 1, 1); - return discuss_grid; -} - -GtkWidget *get_run_help_page_new(){ - GtkWidget *help_grid = gtk_grid_new(); - gtk_grid_attach (GTK_GRID (help_grid), gtk_button_new_with_label ("Can I help you ?"), 0, 0, 1, 1); - return help_grid; -} - - -GtkWidget *get_run_rules_page_new(){ - GtkWidget *rules_grid = gtk_grid_new(); - GtkWidget *hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - gtk_grid_attach (GTK_GRID (rules_grid), hpaned, 0, 0, 1, 1); - - GtkWidget *frame1 = gtk_frame_new ("hello ?"); - GtkWidget *frame2 = gtk_frame_new ("it's me !"); - - GtkWidget *grid_3 = gtk_grid_new(); - gtk_frame_set_child ( GTK_FRAME(frame2), grid_3); - - gtk_paned_set_start_child (GTK_PANED(hpaned), GTK_WIDGET (frame1)); - gtk_paned_set_end_child (GTK_PANED(hpaned), GTK_WIDGET (frame2)); - gtk_widget_set_size_request (hpaned, W, H); -// gtk_widget_set_size_request (frame1, 0, H); // < utile seulement pour la largeur min/max -// gtk_widget_set_size_request (frame2, 50, 100); - -// gtk_grid_attach (GTK_GRID (rules_grid), hpaned, 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID (grid_3), gtk_button_new_with_label ("in the right pane"), 0, 0, 1, 1); - return rules_grid; -} - - -GtkWidget *get_run_space_page_new(){ - - GtkWidget *space_grid = gtk_grid_new(); -// attach either : get_ELAPSED_TIME_box() or get_simulation_time_extent_buffer() -// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ELAPSED_TIME_box()), 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_simulation_time_extent_buffer()), 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), get_a_space_test_image(), 0, 1, 1, 3); - gtk_grid_attach (GTK_GRID(space_grid), get_objects_and_situations_horizontal_pane(), 0, 4, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_RUN_STOP_box()), 1, 0, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), get_scroll_speed(), 1, 1, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_STEP_by_STEP_box()), 1, 2, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_XYZ_box()), 1, 3, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ZOOM_box()), 1, 4, 1, 1); -// How to use gtk_separators ? -// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)), 1, 1, 1, 1); - - return space_grid; -} - -void window_bar(GtkWindow *window, char *title){ - GtkWidget *titlebar = gtk_header_bar_new(); - gtk_window_set_title (window, title); - gtk_window_set_titlebar (window, titlebar); // header_bar -// GtkWidget my_window_controls = *gtk_window_controls_new (GTK_PACK_END); // _START -// gtk_window_controls_set_decoration_layout (GTK_WINDOW_CONTROLS(my_window_controls), NULL); // const char* layout); -} - -void activate (GtkApplication *app, gpointer user_data) { - GtkWindow *window = GTK_WINDOW (gtk_application_window_new (app)); - window_bar (window, "E coli (with permission from David S. Goodsell, 2009)"); - - GtkNotebook *run_notebook = GTK_NOTEBOOK(gtk_notebook_new()); - gtk_notebook_set_tab_pos (GTK_NOTEBOOK(run_notebook), GTK_POS_TOP); // GTK_POS_LEFT - - gtk_notebook_append_page (run_notebook, get_run_space_page_new(), gtk_label_new ("space")); - gtk_notebook_append_page (run_notebook, get_run_rules_page_new(), gtk_label_new ("rules")); - gtk_notebook_append_page (run_notebook, get_run_measures_page_new(),gtk_label_new ("measures")); - gtk_notebook_append_page (run_notebook, get_run_results_page_new(), gtk_label_new ("results")); - gtk_notebook_append_page (run_notebook, get_run_discuss_page_new(), gtk_label_new ("interpret")); - gtk_notebook_append_page (run_notebook, get_run_help_page_new(), gtk_label_new ("help")); - - GtkNotebook *edit_notebook = GTK_NOTEBOOK(gtk_notebook_new()); - gtk_notebook_set_tab_pos (GTK_NOTEBOOK(edit_notebook), GTK_POS_TOP); // GTK_POS_LEFT - - gtk_notebook_append_page (edit_notebook, get_edit_space_page_new(), gtk_label_new ("space")); - gtk_notebook_append_page (edit_notebook, get_edit_rules_page_new(), gtk_label_new ("rules")); - gtk_notebook_append_page (edit_notebook, get_edit_measures_page_new(),gtk_label_new ("measures")); - gtk_notebook_append_page (edit_notebook, get_edit_results_page_new(), gtk_label_new ("results")); - gtk_notebook_append_page (edit_notebook, get_edit_discuss_page_new(), gtk_label_new ("interpret")); - gtk_notebook_append_page (edit_notebook, get_edit_help_page_new(), gtk_label_new ("help")); - - GtkWidget *run_xor_edit_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); - GtkWidget *frame_edits = gtk_frame_new ("Situations"); // facilitate each situation identification - gtk_widget_set_size_request (run_xor_edit_horizontal_pane, W_IMAGE, H_STYLES_PANE); - gtk_widget_set_size_request (GTK_WIDGET (frame_edits), 0, H_STYLES_PANE); // < utile pour la largeur min/max - gtk_paned_set_start_child (GTK_PANED(run_xor_edit_horizontal_pane), GTK_WIDGET (run_notebook)); - gtk_paned_set_end_child (GTK_PANED(run_xor_edit_horizontal_pane), GTK_WIDGET (edit_notebook)); - gtk_paned_set_position (GTK_PANED (run_xor_edit_horizontal_pane), W_IMAGE + 90); // ! WARNING ! '90' is AD HOC - gtk_window_set_child (window, GTK_WIDGET(run_xor_edit_horizontal_pane)); - gtk_window_present (GTK_WINDOW (window)); -} - -void click_print_do (GtkWindow *window, GtkWidget *grid, - char *label, char *text, int x, int y, int w, int h){ - GtkWidget *button = gtk_button_new_with_label (label); - gtk_grid_attach (GTK_GRID (grid), button, x, y, w, h); - g_signal_connect (button, "clicked", G_CALLBACK (print_text), text); - if (window) - g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window); -} - -/*----------------------------------------------------------------------------*/ - -/* GtkBox GtkGrid GtkRevealer GtkStack - * GtkOverlay GtkPaned GtkExpander GtkFixed */ - -/* GtkBox - * int spacing = 8; - * box = gtk_box_new (0, spacing); - * 0 = GTK_ORIENTATION_HORIZONTAL, 1 = GTK_ORIENTATION_VERTICAL - * gtk_widget_set_halign (box, GTK_ALIGN_FILL); - * gtk_widget_set_valign (box, GTK_ALIGN_CENTER); * START CENTER END FILL * - * gtk_window_set_child (GTK_WINDOW (window), box); - * gtk_box_append (GTK_BOX (box), button); */ - -/* grid = gtk_grid_new (); - gtk_window_set_child (GTK_WINDOW (window), grid); - button = gtk_button_new_with_label (" I "); n fois - gtk_grid_attach (GTK_GRID (grid), button, 0, 0, 1, 1); n fois */ - -/* - * gtk_paned_new (GTK_ORIENTATION_VERTICAL or GTK_ORIENTATION_VERTICAL) - * GtkPaned has two panes, arranged either horizontally or vertically. - * The division between the two panes is adjustable by the user by dragging a handle. - * Child widgets are added to the panes of the widget - * with gtk_paned_pack1() and gtk_paned_pack2(). - */ - -/* - * GtkWidget* gtk_box_new (GtkOrientation orientation, gint spacing) - */ - - - - - -/* TODO or NOT TODO - * - * GtkRevealer *revealer = gtk_revealer_new(); - * gtk_revealer_set_child (GTK_ ? (revealer), box); - * gtk_revealer_set_transition_type (revealer, GTK_REVEALER_TRANSITION_TYPE_SLIDE_DOWN); - * - */ - -// GtkWidget *overlay = gtk_overlay_new(); -// gtk_overlay_set_buildable_id (GTK_BUILDABLE(overlay), "overlay id"); -// printf("overlay %s\n", gtk_buildable_get_buildable_id (GTK_BUILDABLE(overlay))); - -// how do I attach a widget to a page ? - -// https://stackoverflow.com/questions/20122232/gtklistc-code-how-to-get-the-selection-of-a-gtklist < TO CHECK - diff --git a/cold.d b/cold.d index 49544c2..f5f72b2 100644 --- a/cold.d +++ b/cold.d @@ -1 +1 @@ -cold.o: cold.c cold.h +cold.o: cold.c cold.h widgets.h pages.h diff --git a/cold.h b/cold.h index 3c80721..67e9bfe 100644 --- a/cold.h +++ b/cold.h @@ -7,63 +7,4 @@ /* */ /******************************************************************************/ -#include -#include -#define W 1920 -#define H 960 -#define W_IMAGE 1920 - 64 -#define H_IMAGE 960 - 46 -#define H_STYLES_PANE 60 - void print_text(GtkWidget *widget, gpointer data); -GtkWidget *get_a_space_test_image(); -GtkScrolledWindow *get_scrolled_gl_area(); -GtkBox *get_RUN_STOP_box(); -GtkBox *get_STEP_by_STEP_box(); -GtkBox *get_CONTROL_box(); -GtkBox *get_ZOOM_box(); -GtkBox *get_XYZ_box(); -GtkWidget *get_scroll_speed(); -void window_bar(GtkWindow *window, char *title); -GtkWidget *get_objects_and_situations_horizontal_pane(); -GtkBox *get_ELAPSED_TIME_box(); -GtkProgressBar *get_simulation_time_extent_buffer(); -void activate (GtkApplication *app, gpointer user_data); - -GtkWidget *get_run_space_page_new(); -GtkWidget *get_run_rules_page_new(); -GtkWidget *get_run_measures_page_new(); -GtkWidget *get_run_results_page_new(); -GtkWidget *get_run_discuss_page_new(); -GtkWidget *get_run_help_page_new(); - -GtkWidget *get_edit_space_page_new(); -GtkWidget *get_edit_rules_page_new(); -GtkWidget *get_edit_measures_page_new(); -GtkWidget *get_edit_results_page_new(); -GtkWidget *get_edit_discuss_page_new(); -GtkWidget *get_edit_help_page_new(); - -void click_print_do (GtkWindow *window, GtkWidget *grid, - char *label, char *text, int x, int y, int w, int h); - -// https://docs.gtk.org/gtk4/visual_index.html < widgets gallery - - - -/* -Dans : space_page_new() doivent être déclarées -et organisées de façon aussi ergonomique que possible : - -- les commandes de mouvement (run/stop, slow down/speed up, step by step, do/undo/redo) - et le buffer qui montre où on en est dans le temps de simulation - (un seul bouton pour toutes ces commandes ?) - -- les commandes qui modifient l'orientation (X,Y,Z) de l'espace, le zoom, la perspective - -- les commandes qui modifient les apparences des grilles et des flèches - -- les commandes qui modifient les apparences des objets et des situations d'intérêt - (+/- transparents, colorés, etc.) -*/ - diff --git a/cold.o b/cold.o index 1496661..bc31a1b 100644 Binary files a/cold.o and b/cold.o differ diff --git a/hot.c b/hot.c index 07a415e..e8249e8 100644 --- a/hot.c +++ b/hot.c @@ -2,20 +2,10 @@ #include #include "warm.h" #include "cold.h" +#include "widgets.h" +#include "pages.h" // https://forge.a-lec.org/gem-graph/gem-graph-client/src/branch/devel/Makefile // https://docs.gtk.org/gtk4/visual_index.html < widgets gallery // GTK_ORIENTATION_VERTICAL GTK_ORIENTATION_HORIZONTAL -GtkWidget *get_edit_space_page_new(){ - - GtkWidget *space_grid = gtk_grid_new(); - gtk_grid_attach (GTK_GRID(space_grid), get_a_space_test_image(), 0, 0, 1, 3); - gtk_grid_attach (GTK_GRID(space_grid), get_objects_and_situations_horizontal_pane(), 0, 4, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_XYZ_box()), 1, 0, 1, 2); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ZOOM_box()), 1, 2, 1, 2); -// How to use gtk_separators ? -// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)), 1, 1, 1, 1); - - return space_grid; -} diff --git a/hot.d b/hot.d index 0108b09..880e718 100644 --- a/hot.d +++ b/hot.d @@ -1,3 +1,3 @@ hot.o: hot.c warm.h \ /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \ - cold.h + cold.h widgets.h pages.h diff --git a/hot.h b/hot.h index e648700..f89b6d0 100644 --- a/hot.h +++ b/hot.h @@ -1,5 +1,16 @@ +/******************************************************************************/ +/* */ +/* E coli by David S. Goodsell (2009) */ +/* --- */ +/* Let this freeze frame guide us towards the model */ +/* that alone can account for the phenomenon ! */ +/* */ +/******************************************************************************/ + #include #include #include "warm.h" #include "cold.h" +#include "widgets.h" +#include "pages.h" diff --git a/hot.o b/hot.o index 5cdd778..a1a8098 100644 Binary files a/hot.o and b/hot.o differ diff --git a/main.c b/main.c index f88d883..03eb2cd 100644 --- a/main.c +++ b/main.c @@ -1,6 +1,17 @@ +/******************************************************************************/ +/* */ +/* E coli by David S. Goodsell (2009) */ +/* --- */ +/* Let this freeze frame guide us towards the model */ +/* that alone can account for the phenomenon ! */ +/* */ +/******************************************************************************/ + #include "hot.h" #include "warm.h" #include "cold.h" +#include "widgets.h" +#include "pages.h" int main (int argc, char **argv) { diff --git a/main.d b/main.d index cb66cb3..46f908e 100644 --- a/main.d +++ b/main.d @@ -1,3 +1,3 @@ main.o: main.c hot.h warm.h \ /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \ - cold.h + cold.h widgets.h pages.h diff --git a/main.o b/main.o index 0be068b..c0d6b89 100644 Binary files a/main.o and b/main.o differ diff --git a/myprogram b/myprogram index 82f3af4..747f707 100755 Binary files a/myprogram and b/myprogram differ diff --git a/pages.c b/pages.c new file mode 100644 index 0000000..d1b02ae --- /dev/null +++ b/pages.c @@ -0,0 +1,167 @@ +#include +#include +#include "cold.h" +#include "widgets.h" +#include "pages.h" + + +GtkWidget *get_edit_rules_page_new(){ + GtkWidget *xxx_grid = gtk_grid_new(); + return xxx_grid; +} + +GtkWidget *get_edit_measures_page_new(){ + GtkWidget *measures_grid = gtk_grid_new(); + return measures_grid; +} + +GtkWidget *get_edit_results_page_new(){ + GtkWidget *xxx_grid = gtk_grid_new(); + return xxx_grid; +} + +GtkWidget *get_edit_discuss_page_new(){ + GtkWidget *xxx_grid = gtk_grid_new(); + return xxx_grid; +} + +GtkWidget *get_edit_help_page_new(){ + GtkWidget *xxx_grid = gtk_grid_new(); + return xxx_grid; +} + +GtkWidget *get_run_measures_page_new(){ + GtkWidget *measures_grid = gtk_grid_new(); + gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("movements"), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("transports"), 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("transformations"), 2, 0, 1, 1); + gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("objects"), 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID (measures_grid), gtk_button_new_with_label ("situations"), 1, 1, 1, 1); + return measures_grid; +} + +GtkWidget *get_run_results_page_new(){ + GtkWidget *results_grid = gtk_grid_new(); + gtk_grid_attach (GTK_GRID(results_grid), gtk_button_new_with_label ("Repartitions"), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID(results_grid), gtk_button_new_with_label ("Correlations"), 0, 1, 1, 1); + gtk_grid_attach (GTK_GRID(results_grid), gtk_button_new_with_label ("Evolutions"), 0, 2, 1, 1); + return results_grid; +} + +GtkWidget *get_run_discuss_page_new(){ + GtkWidget *discuss_grid = gtk_grid_new(); + gtk_grid_attach (GTK_GRID (discuss_grid), gtk_button_new_with_label ("Interpretations"), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID (discuss_grid), gtk_button_new_with_label ("Discussions"), 0, 1, 1, 1); + return discuss_grid; +} + +GtkWidget *get_run_help_page_new(){ + GtkWidget *help_grid = gtk_grid_new(); + gtk_grid_attach (GTK_GRID (help_grid), gtk_button_new_with_label ("Can I help you ?"), 0, 0, 1, 1); + return help_grid; +} + + +GtkWidget *get_run_rules_page_new(){ + GtkWidget *rules_grid = gtk_grid_new(); + GtkWidget *hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); + gtk_grid_attach (GTK_GRID (rules_grid), hpaned, 0, 0, 1, 1); + + GtkWidget *frame1 = gtk_frame_new ("hello ?"); + GtkWidget *frame2 = gtk_frame_new ("it's me !"); + + GtkWidget *grid_3 = gtk_grid_new(); + gtk_frame_set_child ( GTK_FRAME(frame2), grid_3); + + gtk_paned_set_start_child (GTK_PANED(hpaned), GTK_WIDGET (frame1)); + gtk_paned_set_end_child (GTK_PANED(hpaned), GTK_WIDGET (frame2)); + gtk_widget_set_size_request (hpaned, W, H); + + gtk_grid_attach (GTK_GRID (grid_3), gtk_button_new_with_label ("in the right pane"), 0, 0, 1, 1); + return rules_grid; +} + + +GtkWidget *get_edit_space_page_new(){ + + GtkWidget *space_grid = gtk_grid_new(); + gtk_grid_attach (GTK_GRID(space_grid), get_a_space_test_image(), 0, 0, 1, 3); + gtk_grid_attach (GTK_GRID(space_grid), get_objects_and_situations_horizontal_pane(), 0, 4, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_XYZ_box()), 1, 0, 1, 2); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ZOOM_box()), 1, 2, 1, 2); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_edit_TOOL_box()), 1, 3, 1, 2); + gtk_widget_set_size_request (space_grid, W, H); +// How to use gtk_separators ? +// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)), 1, 1, 1, 1); + + return space_grid; +} + +GtkWidget *get_run_space_page_new(){ + + GtkWidget *space_grid = gtk_grid_new(); +// attach either : get_ELAPSED_TIME_box() or get_simulation_time_extent_buffer() + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ELAPSED_TIME_box()), 0, 0, 1, 1); +// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_simulation_time_extent_buffer()), 0, 0, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), get_a_space_test_image(), 0, 1, 1, 3); + gtk_grid_attach (GTK_GRID(space_grid), get_objects_and_situations_horizontal_pane(), 0, 4, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_RUN_STOP_box()), 1, 0, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), get_scroll_speed(), 1, 1, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_STEP_by_STEP_box()), 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_XYZ_box()), 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ZOOM_box()), 1, 4, 1, 1); +// How to use gtk_separators ? +// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)), 1, 1, 1, 1); + + return space_grid; +} + +void window_bar(GtkWindow *window, char *title){ + GtkWidget *titlebar = gtk_header_bar_new(); + gtk_window_set_title (window, title); + gtk_window_set_titlebar (window, titlebar); // header_bar +// GtkWidget my_window_controls = *gtk_window_controls_new (GTK_PACK_END); // _START +// gtk_window_controls_set_decoration_layout (GTK_WINDOW_CONTROLS(my_window_controls), NULL); // const char* layout); +} + +void activate (GtkApplication *app, gpointer user_data) { + GtkWindow *window = GTK_WINDOW (gtk_application_window_new (app)); + window_bar (window, "E coli (with permission from David S. Goodsell, 2009)"); + + GtkNotebook *run_notebook = GTK_NOTEBOOK(gtk_notebook_new()); + gtk_notebook_set_tab_pos (GTK_NOTEBOOK(run_notebook), GTK_POS_TOP); // GTK_POS_LEFT + + gtk_notebook_append_page (run_notebook, get_run_space_page_new(), gtk_label_new ("space")); + gtk_notebook_append_page (run_notebook, get_run_rules_page_new(), gtk_label_new ("rules")); + gtk_notebook_append_page (run_notebook, get_run_measures_page_new(),gtk_label_new ("measures")); + gtk_notebook_append_page (run_notebook, get_run_results_page_new(), gtk_label_new ("results")); + gtk_notebook_append_page (run_notebook, get_run_discuss_page_new(), gtk_label_new ("interpret")); + gtk_notebook_append_page (run_notebook, get_run_help_page_new(), gtk_label_new ("help")); + + GtkNotebook *edit_notebook = GTK_NOTEBOOK(gtk_notebook_new()); + gtk_notebook_set_tab_pos (GTK_NOTEBOOK(edit_notebook), GTK_POS_TOP); // GTK_POS_RIGHT + + gtk_notebook_append_page (edit_notebook, get_edit_space_page_new(), gtk_label_new ("space")); + gtk_notebook_append_page (edit_notebook, get_edit_rules_page_new(), gtk_label_new ("rules")); + gtk_notebook_append_page (edit_notebook, get_edit_measures_page_new(),gtk_label_new ("measures")); + gtk_notebook_append_page (edit_notebook, get_edit_results_page_new(), gtk_label_new ("results")); + gtk_notebook_append_page (edit_notebook, get_edit_discuss_page_new(), gtk_label_new ("interpret")); + gtk_notebook_append_page (edit_notebook, get_edit_help_page_new(), gtk_label_new ("help")); + + GtkWidget *run_xor_edit_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); + gtk_widget_set_size_request (run_xor_edit_horizontal_pane, W_IMAGE, H_STYLES_PANE); + gtk_paned_set_start_child (GTK_PANED(run_xor_edit_horizontal_pane), GTK_WIDGET (run_notebook)); + gtk_paned_set_end_child (GTK_PANED(run_xor_edit_horizontal_pane), GTK_WIDGET (edit_notebook)); + gtk_paned_set_position (GTK_PANED (run_xor_edit_horizontal_pane), W_IMAGE + 90); // ! WARNING ! '90' is AD HOC + gtk_window_set_child (window, GTK_WIDGET(run_xor_edit_horizontal_pane)); + gtk_window_present (GTK_WINDOW (window)); +} + +void click_print_do (GtkWindow *window, GtkWidget *grid, + char *label, char *text, int x, int y, int w, int h){ + GtkWidget *button = gtk_button_new_with_label (label); + gtk_grid_attach (GTK_GRID (grid), button, x, y, w, h); + g_signal_connect (button, "clicked", G_CALLBACK (print_text), text); + if (window) + g_signal_connect_swapped (button, "clicked", G_CALLBACK (gtk_window_destroy), window); +} diff --git a/pages.d b/pages.d new file mode 100644 index 0000000..1acb863 --- /dev/null +++ b/pages.d @@ -0,0 +1 @@ +pages.o: pages.c cold.h widgets.h pages.h diff --git a/pages.h b/pages.h new file mode 100644 index 0000000..cfe8c30 --- /dev/null +++ b/pages.h @@ -0,0 +1,56 @@ +/******************************************************************************/ +/* */ +/* E coli by David S. Goodsell (2009) */ +/* --- */ +/* Let this freeze frame guide us towards the model */ +/* that alone can account for the phenomenon ! */ +/* */ +/******************************************************************************/ + +#include +#include +#define W 1920 +#define H 960 +#define W_IMAGE 1920 - 64 +#define H_IMAGE 960 - 46 +#define H_STYLES_PANE 60 + +void activate (GtkApplication *app, gpointer user_data); + +GtkWidget *get_run_space_page_new(); +GtkWidget *get_run_rules_page_new(); +GtkWidget *get_run_measures_page_new(); +GtkWidget *get_run_results_page_new(); +GtkWidget *get_run_discuss_page_new(); +GtkWidget *get_run_help_page_new(); + +GtkWidget *get_edit_space_page_new(); +GtkWidget *get_edit_rules_page_new(); +GtkWidget *get_edit_measures_page_new(); +GtkWidget *get_edit_results_page_new(); +GtkWidget *get_edit_discuss_page_new(); +GtkWidget *get_edit_help_page_new(); + +void click_print_do (GtkWindow *window, GtkWidget *grid, + char *label, char *text, int x, int y, int w, int h); + +// https://docs.gtk.org/gtk4/visual_index.html < widgets gallery + + + +/* +Dans : space_page_new() doivent être déclarées +et organisées de façon aussi ergonomique que possible : + +- les commandes de mouvement (run/stop, slow down/speed up, step by step, do/undo/redo) + et le buffer qui montre où on en est dans le temps de simulation + (un seul bouton pour toutes ces commandes ?) + +- les commandes qui modifient l'orientation (X,Y,Z) de l'espace, le zoom, la perspective + +- les commandes qui modifient les apparences des grilles et des flèches + +- les commandes qui modifient les apparences des objets et des situations d'intérêt + (+/- transparents, colorés, etc.) +*/ + diff --git a/pages.o b/pages.o new file mode 100644 index 0000000..335eb78 Binary files /dev/null and b/pages.o differ diff --git a/warm.c b/warm.c index 386a8af..f124d76 100644 --- a/warm.c +++ b/warm.c @@ -2,6 +2,8 @@ #include #include "warm.h" #include "cold.h" +#include "widgets.h" +#include "pages.h" // https://docs.gtk.org/gtk4/visual_index.html < widgets gallery diff --git a/warm.d b/warm.d index 85cf6d4..52125ce 100644 --- a/warm.d +++ b/warm.d @@ -1,3 +1,3 @@ warm.o: warm.c warm.h \ /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \ - cold.h + cold.h widgets.h pages.h diff --git a/warm.h b/warm.h index e40b345..9e336be 100644 --- a/warm.h +++ b/warm.h @@ -1,4 +1,14 @@ +/******************************************************************************/ +/* */ +/* E coli by David S. Goodsell (2009) */ +/* --- */ +/* Let this freeze frame guide us towards the model */ +/* that alone can account for the phenomenon ! */ +/* */ +/******************************************************************************/ + #pragma once + #include #include #include @@ -10,11 +20,14 @@ #include #include #include + #include #include + #include "cold.h" +#include "widgets.h" +#include "pages.h" // https://blog.gtk.org/2020/09/08/on-list-models/ < TODO -// https://stackoverflow.com/questions/20122232/gtklistc-code-how-to-get-the-selection-of-a-gtklist diff --git a/widgets.c b/widgets.c new file mode 100644 index 0000000..ac0497e --- /dev/null +++ b/widgets.c @@ -0,0 +1,165 @@ +#include +#include +#include "cold.h" +#include "widgets.h" +#include "pages.h" + +GtkWidget *get_a_space_test_image(){ + GtkWidget *image; + image = GTK_WIDGET(get_scrolled_gl_area()); + image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/aXoris.png"); + image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/gg sketch.png"); + image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/E coli.png"); + image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/E coli resized.png"); + image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/E coli by David S. Goodsell (2009).png"); + return image; +} + +GtkWidget *get_scroll_speed(){ + GtkAdjustment *speed_adjust = gtk_adjustment_new (0, 0, 100, 1, 0, 0); + GtkWidget *scroll_speed = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, speed_adjust); + return scroll_speed; +} + +// TODO cliquer sur "RUN" --> affiche "STOP" (et inversement) +GtkBox *get_RUN_STOP_box(){ + GtkBox *RUN_STOP_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); // spacing = 2 + + GtkWidget *RUN_Label = GTK_WIDGET (gtk_label_new (NULL)); // "RUN")); + const char *str = " RUN-STOP"; + const char *format = "\%s"; // ^c^v no more... + char *markup; + + markup = g_markup_printf_escaped (format, str); + gtk_label_set_markup (GTK_LABEL (RUN_Label), markup); // Sets the labels text and attributes from markup. + g_free (markup); + + gtk_label_set_max_width_chars (GTK_LABEL(RUN_Label), 12); + gtk_label_set_wrap (GTK_LABEL(RUN_Label), TRUE); + gtk_label_set_xalign (GTK_LABEL(RUN_Label), 0.5); // xalign value, between 0 and 1 + gtk_label_set_yalign (GTK_LABEL(RUN_Label), 0.5); + gtk_label_set_selectable (GTK_LABEL(RUN_Label), FALSE); // default = FALSE + gtk_label_set_single_line_mode (GTK_LABEL(RUN_Label), TRUE); // default = TRUE + // + gtk_box_append (RUN_STOP_box, RUN_Label); + return RUN_STOP_box; +} + +GtkBox *get_STEP_by_STEP_box(){ + GtkBox *STEP_by_STEP_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + GtkWidget *STEP_by_STEP_Label = GTK_WIDGET (gtk_label_new ("ONE\nSTEP")); + gtk_box_append (STEP_by_STEP_box, STEP_by_STEP_Label); + return STEP_by_STEP_box; +} + +GtkBox *get_ZOOM_box(){ + GtkBox *ZOOM_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + GtkWidget *ZOOM_Label = GTK_WIDGET (gtk_label_new ("ZOOM\n ---\n(space\nstruct.)")); + gtk_box_append (ZOOM_box, ZOOM_Label); + return ZOOM_box; +} + +GtkBox *get_edit_TOOL_box(){ + GtkBox *TOOL_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + GtkWidget *ZOOM_Label = GTK_WIDGET (gtk_label_new ("TOOLS\n ---\n(space\nstruct.)")); + gtk_box_append (TOOL_box, ZOOM_Label); + return TOOL_box; +} + +GtkBox *get_XYZ_box(){ + GtkBox *XYZ_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); // spacing = 2 + // GtkWidget *scale_X = gtk_scale_button_new (0, 360, 10, NULL); < à étudier + // (double min, double max, double step, const char** icons) + GtkAdjustment *X_adjust = gtk_adjustment_new (0, 0, 380, 1, 0, 0); + GtkAdjustment *Y_adjust = gtk_adjustment_new (0, 0, 380, 1, 0, 0); + GtkAdjustment *Z_adjust = gtk_adjustment_new (0, 0, 380, 1, 0, 0); + 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_box_append (XYZ_box, scroll_X); + gtk_box_append (XYZ_box, scroll_Y); + gtk_box_append (XYZ_box, scroll_Z); + +// gtk_box_set_baseline_position (XYZ_box, GTK_BASELINE_POSITION_BOTTOM); + + return XYZ_box; +} + +GtkBox *get_ELAPSED_TIME_box(){ + GtkBox *ELAPSED_TIME_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); + +// GtkProgressBar *get_simulation_time_extent_buffer(){ + GtkProgressBar *buffer = GTK_PROGRESS_BAR (gtk_progress_bar_new ()); + gtk_progress_bar_set_text (buffer, "<--- [buffer] (simulation extensive time) --->"); + gtk_progress_bar_set_show_text (buffer, TRUE); + gtk_widget_set_size_request (GTK_WIDGET (buffer), W_IMAGE, 40); + + gtk_box_append (ELAPSED_TIME_box, GTK_WIDGET(buffer)); + return ELAPSED_TIME_box; +} + +GtkProgressBar *get_simulation_time_extent_buffer(){ + + GtkProgressBar *buffer = GTK_PROGRESS_BAR (gtk_progress_bar_new ()); + gtk_progress_bar_set_text (buffer, "<--- [buffer] (simulation extensive time) --->"); + gtk_progress_bar_set_show_text (buffer, TRUE); + gtk_widget_set_size_request (GTK_WIDGET (buffer), W_IMAGE, 40); + + return buffer; +} + +GtkBox *get_objects_box(){ + GtkBox *objects_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" membrane "))); + gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" co-enzyme A "))); + gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" ribosome "))); + gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" cytochrome C "))); + gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" ATP synthase "))); + gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" chromosome "))); + return objects_box; +} + +GtkBox *get_situations_box(){ + GtkBox *situations_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" transcription "))); + gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" épissage "))); + gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" translation "))); + gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" transport Na/K "))); + gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" ubiquitination "))); + gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" rotation du moteur flagellaire "))); + return situations_box; +} + +static GtkWidget *get_frame_objects(){ + GtkWidget *frame_objects = gtk_frame_new (" Objects"); // defines each class of object transparence + gtk_widget_set_size_request (frame_objects, 0, H_STYLES_PANE); // < utile seulement pour la largeur min/max + gtk_frame_set_child (GTK_FRAME (frame_objects), GTK_WIDGET (get_objects_box())); + return frame_objects; +} + +static GtkWidget *get_frame_situations(){ + GtkWidget *frame_situations = gtk_frame_new (" Situations"); // facilitates each situation identification + gtk_widget_set_size_request (GTK_WIDGET (frame_situations), 0, H_STYLES_PANE); // < utile seulement pour la largeur min/max + gtk_frame_set_child (GTK_FRAME (frame_situations), GTK_WIDGET (get_situations_box())); + return frame_situations; +} + +GtkWidget *get_objects_and_situations_horizontal_pane(){ + GtkWidget *objects_and_situations_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL); + gtk_paned_set_start_child (GTK_PANED(objects_and_situations_horizontal_pane), GTK_WIDGET (get_frame_objects())); + gtk_paned_set_end_child (GTK_PANED(objects_and_situations_horizontal_pane), GTK_WIDGET (get_frame_situations())); + return objects_and_situations_horizontal_pane; +}GtkScrolledWindow *get_scrolled_gl_area(){ + GtkScrolledWindow *scrolled = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new()); + gtk_scrolled_window_set_min_content_width (scrolled, W_IMAGE); + gtk_scrolled_window_set_min_content_height (scrolled, H_IMAGE); +// GtkAdjustment *width = gtk_adjustment_new (600, 300, 1000, 1, 1, 1000); +// GtkAdjustment *height = gtk_adjustment_new (600, 300, 1000, 1, 1, 1000); + // (value, lower, upper, step_increment, page_increment, page_size) +// GtkWidget *GLarea = gtk_gl_area_new(); +// gtk_scrolled_window_set_child (scrolled, GLarea); +// https://docs.gtk.org/gtk4/class.GLArea.html + return scrolled; +} + diff --git a/widgets.d b/widgets.d new file mode 100644 index 0000000..7c6a468 --- /dev/null +++ b/widgets.d @@ -0,0 +1 @@ +widgets.o: widgets.c cold.h widgets.h pages.h diff --git a/widgets.h b/widgets.h new file mode 100644 index 0000000..1bbf36b --- /dev/null +++ b/widgets.h @@ -0,0 +1,39 @@ +/******************************************************************************/ +/* */ +/* E coli by David S. Goodsell (2009) */ +/* --- */ +/* Let this freeze frame guide us towards the model */ +/* that alone can account for the phenomenon ! */ +/* */ +/******************************************************************************/ + +GtkWidget *get_a_space_test_image(); +GtkScrolledWindow *get_scrolled_gl_area(); +GtkBox *get_RUN_STOP_box(); +GtkBox *get_STEP_by_STEP_box(); +GtkBox *get_CONTROL_box(); +GtkBox *get_ZOOM_box(); +GtkBox *get_edit_TOOL_box(); +GtkBox *get_XYZ_box(); +GtkWidget *get_scroll_speed(); +void window_bar(GtkWindow *window, char *title); +GtkWidget *get_objects_and_situations_horizontal_pane(); +GtkBox *get_ELAPSED_TIME_box(); +GtkProgressBar *get_simulation_time_extent_buffer(); + +/* +Dans : space_page_new() doivent être déclarées +et organisées de façon aussi ergonomique que possible : + +- les commandes de mouvement (run/stop, slow down/speed up, step by step, do/undo/redo) + et le buffer qui montre où on en est dans le temps de simulation + (un seul bouton pour toutes ces commandes ?) + +- les commandes qui modifient l'orientation (X,Y,Z) de l'espace, le zoom, la perspective + +- les commandes qui modifient les apparences des grilles et des flèches + +- les commandes qui modifient les apparences des objets et des situations d'intérêt + (+/- transparents, colorés, etc.) +*/ + diff --git a/widgets.o b/widgets.o new file mode 100644 index 0000000..73b65d9 Binary files /dev/null and b/widgets.o differ