diff --git a/contain.h b/contain.h index cd4d05c..4c70ac0 100644 --- a/contain.h +++ b/contain.h @@ -12,8 +12,8 @@ #define W_IMAGE W - 320 #define H_IMAGE H - 126 #define H_STYLES_PANE 30 -#define W_IMAGE_LOCAL W / 3 -#define H_IMAGE_LOCAL H / 3 +#define W_IMAGE_LOCAL W / 16 +#define H_IMAGE_LOCAL H / 16 void activate (GtkApplication *app, gpointer user_data); diff --git a/contain.o b/contain.o index 3530791..d38138a 100644 Binary files a/contain.o and b/contain.o differ diff --git a/display.c b/display.c index 57f484b..b76c1e9 100644 --- a/display.c +++ b/display.c @@ -13,21 +13,45 @@ GtkWidget *get_image_ALL_SPACE(){ // forget > GTK_WIDGET(get_scrolled_gl_area()); // Use GtkImage if you want to display a fixed-size icon // and GtkPicture if you want to display a (maybe) scaled picture. - image = gtk_image_new_from_file("/home/jean/01/Gtk4/Getting_Started_with_GTK/image aXoris.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image gg sketch.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image E coli (Goodsell).png"); + image = gtk_image_new_from_file("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/aXoris.png"); + image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/gg sketch.png"); + image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/E coli (Goodsell).png"); gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE, H_IMAGE); return image; } GtkWidget *get_image_GLUTAMATE(){ - GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image glutamate.png"); + GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/glutamate.png"); gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE_LOCAL, H_IMAGE_LOCAL); return image; } GtkWidget *get_image_GLUTAMINE(){ - GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image glutamine.png"); + GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/glutamine.png"); + gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE_LOCAL, H_IMAGE_LOCAL); + return image; +} + +GtkWidget *get_image_HISTIDINE(){ + GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/histidine.png"); + gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE_LOCAL, H_IMAGE_LOCAL); + return image; +} + +GtkWidget *get_image_HISTAMINE(){ + GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/histamine.png"); + gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE_LOCAL, H_IMAGE_LOCAL); + return image; +} + +GtkWidget *get_image_PHENYLALANINE(){ + GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/phénylalanine.png"); + gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE_LOCAL, H_IMAGE_LOCAL); + return image; +} + +GtkWidget *get_image_DOPAMINE(){ + GtkWidget *image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/dopamine.png"); gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE_LOCAL, H_IMAGE_LOCAL); return image; } diff --git a/display.h b/display.h index 2dbe0f2..e86f9d7 100644 --- a/display.h +++ b/display.h @@ -12,6 +12,12 @@ GtkFrame *get_frame_with_label(); GtkWidget *get_image_ALL_SPACE(); GtkWidget *get_image_GLUTAMATE(); +GtkWidget *get_image_GLUTAMINE(); +GtkWidget *get_image_HISTIDINE(); +GtkWidget *get_image_HISTAMINE(); +GtkWidget *get_image_PHENYLALANINE(); +GtkWidget *get_image_DOPAMINE(); + GtkProgressBar *get_ELAPSED_TIME_ProgressBar(); GtkBox *get_RUN_STOP_box(); GtkBox *get_ZOOM_box(); diff --git a/display.o b/display.o index 401372e..42f5d10 100644 Binary files a/display.o and b/display.o differ diff --git a/hot.c b/hot.c index fa2688f..163fe20 100644 --- a/hot.c +++ b/hot.c @@ -18,25 +18,27 @@ GtkWidget *get_selected_rules_vpaned_new(){ GtkPaned *V_selected_1_vs_2 = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_VERTICAL)); - GtkWidget *règle_sélectionnée_n_1 = gtk_frame_new ("(1)"); - GtkWidget *règle_sélectionnée_n_2 = gtk_frame_new ("(2)"); +// GtkWidget *règle_sélectionnée_n_1 = gtk_frame_new ("(1)"); +// GtkWidget *règle_sélectionnée_n_2 = gtk_frame_new ("(2)"); GtkBox *up_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); gtk_box_append (up_box, GTK_WIDGET (get_image_GLUTAMATE())); - GtkBox *down_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); - gtk_box_append (down_box, GTK_WIDGET (get_image_GLUTAMINE())); + 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())); 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 (down_box)); -// gtk_paned_set_wide_handle (V_selected_1_vs_2, TRUE); + gtk_paned_set_end_child (V_selected_1_vs_2, GTK_WIDGET (bottom_box)); -/* GtkWidget *picture_before = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image glutamine"); - GtkWidget *picture_after = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image glutamate"); - gtk_widget_set_size_request (GTK_WIDGET (picture_before), W_IMAGE_LOCAL, H_IMAGE_LOCAL); - gtk_widget_set_size_request (GTK_WIDGET (picture_after), W_IMAGE_LOCAL, H_IMAGE_LOCAL);*/ +// gtk_paned_set_start_child (V_selected_1_vs_2, GTK_WIDGET (règle_sélectionnée_n_1)); +// gtk_paned_set_end_child (V_selected_1_vs_2, GTK_WIDGET (règle_sélectionnée_n_2)); -// gtk_window_set_child (GTK_WINDOW (règle_sélectionnée_n_1), GTK_WIDGET(up_box)); -// gtk_window_set_child (GTK_WINDOW (up_box), GTK_WIDGET(picture_before)); +// gtk_box_append ( GTK_BOX(règle_sélectionnée_n_1), GTK_WIDGET (up_box));//, GTK_WIDGET (get_image_GLUTAMATE())); +// gtk_box_append ( GTK_BOX(règle_sélectionnée_n_2), GTK_WIDGET (bottom_box));//, GTK_WIDGET (get_image_GLUTAMATE())); return GTK_WIDGET (V_selected_1_vs_2); } diff --git a/hot.o b/hot.o index 7335e13..82f383c 100644 Binary files a/hot.o and b/hot.o differ diff --git a/image E coli (Goodsell).png b/image/E coli (Goodsell).png similarity index 100% rename from image E coli (Goodsell).png rename to image/E coli (Goodsell).png diff --git a/image aXoris.png b/image/aXoris.png similarity index 100% rename from image aXoris.png rename to image/aXoris.png diff --git a/image/catécholamines.png b/image/catécholamines.png new file mode 100644 index 0000000..4878e2f Binary files /dev/null and b/image/catécholamines.png differ diff --git a/image/dopamine.png b/image/dopamine.png new file mode 100644 index 0000000..5360f44 Binary files /dev/null and b/image/dopamine.png differ diff --git a/image gg sketch.png b/image/gg sketch.png similarity index 100% rename from image gg sketch.png rename to image/gg sketch.png diff --git a/image glutamate.png b/image/glutamate.png similarity index 100% rename from image glutamate.png rename to image/glutamate.png diff --git a/image glutamine.png b/image/glutamine.png similarity index 100% rename from image glutamine.png rename to image/glutamine.png diff --git a/image/histamine.png b/image/histamine.png new file mode 100644 index 0000000..e401a79 Binary files /dev/null and b/image/histamine.png differ diff --git a/image/histidine.png b/image/histidine.png new file mode 100644 index 0000000..4df710b Binary files /dev/null and b/image/histidine.png differ diff --git a/image/hémoglobine 1.png b/image/hémoglobine 1.png new file mode 100644 index 0000000..a1a128c Binary files /dev/null and b/image/hémoglobine 1.png differ diff --git a/image/hémoglobine 2.png b/image/hémoglobine 2.png new file mode 100644 index 0000000..2cd2b73 Binary files /dev/null and b/image/hémoglobine 2.png differ diff --git a/image/phénylalanine.png b/image/phénylalanine.png new file mode 100644 index 0000000..10498bf Binary files /dev/null and b/image/phénylalanine.png differ diff --git a/myprogram b/myprogram index 25d8fa1..8de78d8 100755 Binary files a/myprogram and b/myprogram differ