diff --git a/contain.o b/contain.o index d38138a..52e970c 100644 Binary files a/contain.o and b/contain.o differ diff --git a/display.c b/display.c index b76c1e9..81a8665 100644 --- a/display.c +++ b/display.c @@ -56,6 +56,18 @@ GtkWidget *get_image_DOPAMINE(){ return image; } +GtkWidget *get_image_ATP(){ + GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/ATP.png"); + gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE_LOCAL, H_IMAGE_LOCAL); + return image; +} + +GtkWidget *get_image_AMP(){ + GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/AMP.png"); + gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE_LOCAL, H_IMAGE_LOCAL); + return image; +} + //------------------------------------------------------------------------------ // TODO cliquer sur "RUN" --> affiche "STOP" (et inversement) diff --git a/display.h b/display.h index e86f9d7..d968333 100644 --- a/display.h +++ b/display.h @@ -17,6 +17,8 @@ GtkWidget *get_image_HISTIDINE(); GtkWidget *get_image_HISTAMINE(); GtkWidget *get_image_PHENYLALANINE(); GtkWidget *get_image_DOPAMINE(); +GtkWidget *get_image_ATP(); +GtkWidget *get_image_AMP(); GtkProgressBar *get_ELAPSED_TIME_ProgressBar(); GtkBox *get_RUN_STOP_box(); diff --git a/display.o b/display.o index 42f5d10..b2015ba 100644 Binary files a/display.o and b/display.o differ diff --git a/hot.c b/hot.c index 163fe20..1e32625 100644 --- a/hot.c +++ b/hot.c @@ -25,11 +25,16 @@ GtkWidget *get_selected_rules_vpaned_new(){ gtk_box_append (up_box, GTK_WIDGET (get_image_GLUTAMATE())); gtk_box_append (up_box, GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_VERTICAL))); gtk_box_append (up_box, GTK_WIDGET (get_image_GLUTAMINE())); - +/* GtkBox *bottom_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); gtk_box_append (bottom_box, GTK_WIDGET (get_image_PHENYLALANINE())); gtk_box_append (bottom_box, GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_VERTICAL))); gtk_box_append (bottom_box, GTK_WIDGET (get_image_DOPAMINE())); +*/ + GtkBox *bottom_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); + gtk_box_append (bottom_box, GTK_WIDGET (get_image_ATP())); + gtk_box_append (bottom_box, GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_VERTICAL))); + gtk_box_append (bottom_box, GTK_WIDGET (get_image_AMP())); gtk_paned_set_start_child (V_selected_1_vs_2, GTK_WIDGET (up_box)); gtk_paned_set_end_child (V_selected_1_vs_2, GTK_WIDGET (bottom_box)); diff --git a/hot.o b/hot.o index 82f383c..cb351de 100644 Binary files a/hot.o and b/hot.o differ diff --git a/image/AMP.png b/image/AMP.png new file mode 100644 index 0000000..450dfb7 Binary files /dev/null and b/image/AMP.png differ diff --git a/image/ATP.png b/image/ATP.png new file mode 100644 index 0000000..ba106d3 Binary files /dev/null and b/image/ATP.png differ diff --git a/image/hb (1).png b/image/hb (1).png new file mode 100644 index 0000000..a566cdd Binary files /dev/null and b/image/hb (1).png differ diff --git a/image/hb (2).png b/image/hb (2).png new file mode 100644 index 0000000..ac7dfbd Binary files /dev/null and b/image/hb (2).png differ diff --git a/image/hb.png b/image/hb.png new file mode 100644 index 0000000..a010e57 Binary files /dev/null and b/image/hb.png differ diff --git a/image/hemoglobine 2.png b/image/hemoglobine 2.png new file mode 100644 index 0000000..b067b48 Binary files /dev/null and b/image/hemoglobine 2.png differ diff --git a/image/hémoglobine 2.png b/image/hémoglobine 2.png deleted file mode 100644 index 2cd2b73..0000000 Binary files a/image/hémoglobine 2.png and /dev/null differ diff --git a/image/insuline Zn.png b/image/insuline Zn.png new file mode 100644 index 0000000..9f7dd18 Binary files /dev/null and b/image/insuline Zn.png differ diff --git a/image/insuline.png b/image/insuline.png new file mode 100644 index 0000000..ea1c2a7 Binary files /dev/null and b/image/insuline.png differ diff --git a/myprogram b/myprogram index 8de78d8..c41f53d 100755 Binary files a/myprogram and b/myprogram differ