From e9bd2abb7c2179f3fe5a860ca5f730cb3ed753cb Mon Sep 17 00:00:00 2001 From: Jean Sirmai Date: Mon, 6 May 2024 22:19:58 +0200 Subject: [PATCH] objects_and_situations_horizontal_pane sous l'image de l'espace --- cold.c | 13 ++++--- cold.h | 1 + cold.o | Bin 38448 -> 38440 bytes main.o | Bin 9312 -> 9312 bytes myprogram | Bin 38192 -> 38192 bytes warm.c | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 106 insertions(+), 7 deletions(-) diff --git a/cold.c b/cold.c index b237065..a1c71f4 100644 --- a/cold.c +++ b/cold.c @@ -4,7 +4,6 @@ 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()); @@ -183,13 +182,13 @@ GtkWidget *get_space_page_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_objects_and_situations_horizontal_pane(), 0, 1, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), get_a_space_test_image(), 0, 2, 1, 10); + gtk_grid_attach (GTK_GRID(space_grid), get_a_space_test_image(), 0, 1, 1, 4); + gtk_grid_attach (GTK_GRID(space_grid), get_objects_and_situations_horizontal_pane(), 0, 5, 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); + gtk_grid_attach (GTK_GRID(space_grid), get_scroll_speed(), 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_STEP_by_STEP_box()), 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_XYZ_box()), 1, 4, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ZOOM_box()), 1, 5, 1, 1); return space_grid; } diff --git a/cold.h b/cold.h index 66c4cdd..a82495f 100644 --- a/cold.h +++ b/cold.h @@ -20,6 +20,7 @@ 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(); diff --git a/cold.o b/cold.o index 6f6dcf5f59289df57bbf7723bd82ff7e60c2669b..a686977b50b8be7171656616e84045dd0c5b1171 100644 GIT binary patch delta 5432 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 M-g|9BVx}_u54iu=!vFvP delta 5451 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 P!1b7pYxZNniCq5!nNIIj diff --git a/main.o b/main.o index 43033584441e3ba828430e33c0ff5e11dee7777e..0be068b9f4cbc42fe8ccd4868761dfb2ff4cecc7 100644 GIT binary patch delta 322 zcmV-I0logEQN|p zv~9eqtKo1r%;~bPZXxlFsV2Ld(o1@DFK$cwqORT|I7?jzw;@bo6WB;LEwF U#E?Uir2};Y(qe&5vmOLOAiB4orT_o{ delta 322 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
@ov@&pR|)a8+ZA(G<7(2MskQZpYmKZMHja)Pt1y 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 nY)5+U7x|Qk8uA@A%}`1) +#include +#include "cold.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\n STOP"; + const char *format = "\%s"; + 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_CONTROL_box(){ + GtkBox *CONTROL_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_VERTICAL, 0)); + gtk_box_append (CONTROL_box, GTK_WIDGET (get_RUN_STOP_box())); + gtk_box_append (CONTROL_box, GTK_WIDGET (get_scroll_speed())); + gtk_box_append (CONTROL_box, GTK_WIDGET (get_STEP_by_STEP_box())); + return CONTROL_box; +} + +GtkWidget *get_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, 5); + gtk_grid_attach (GTK_GRID(space_grid), get_objects_and_situations_horizontal_pane(), 0, 6, 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, 2, 1, 1); +// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_STEP_by_STEP_box()), 1, 3, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_CONTROL_box()), 1, 0, 1, 2); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_XYZ_box()), 1, 2, 1, 1); + gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ZOOM_box()), 1, 3, 1, 1); + + return space_grid; +} +*/