Updating documentation, cleaning includes, updating report

5 files changed, 126 insertions, 134 deletions

diff --git a/src/gui/button.c b/src/gui/button.c
index a55796d..35ac2ed 100644
--- a/src/gui/button.c
+++ b/src/gui/button.c
@@ -1,37 +1,28 @@
-#include <gui/button.h>
 #include <stdlib.h>
+#include <stdbool.h>
 #include <assert.h>
-#include <common/mem.h>
 #include <string.h>
-#include <MLV/MLV_all.h>
-#include <gui/component.h>
+#include "gui/button.h"
+#include "MLV/MLV_all.h"
+#include "common/mem.h"
 
-bool button_is_selected(int x, int y, Button *button) {
+
+static bool button_is_selected(int x, int y, Button *button) {
   assert(button != NULL);
   int x1 = button->component.x_pos;
   int y1 = button->component.y_pos;
   int x2 = button->component.x_pos + button->component.width;
   int y2 = button->component.y_pos + button->component.height;
-  if (x >= x1 && x <= x2 && y >= y1 && y <= y2) {
-    return true;
-  }
-  return false;
+  return x >= x1 && x <= x2 && y >= y1 && y <= y2;
 }
 
-void button_print(Component *parameterSelf) {
+static void button_print(Component *parameterSelf) {
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   MLV_draw_adapted_text_box(self->component.x_pos, self->component.y_pos, self->label, self->sizeInterligne,
                             MLV_COLOR_BLACK, MLV_COLOR_WHITE, MLV_COLOR_DARK_GREY, MLV_TEXT_CENTER);
 }
 
-void button_click_test(int x, int y, Component *parameterSelf) {
-  assert(parameterSelf != NULL);
-  Button *self = (Button *) parameterSelf;
-  if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
-  }
-}
-
 void button_click_add_constraint(int x, int y, Component *parameterSelf) {
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
@@ -66,7 +57,7 @@ void button_click_less_frame(int x, int y, Component *parameterSelf) {
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
     if (frame > 2) {
       frame = frame / 2;
-      sprintf(labelFrame,"%03d frames", frame);
+      sprintf(labelFrame, "%03d frames", frame);
       mode = PRINTING_BUTTONS;
     }
   }
@@ -78,13 +69,13 @@ void button_click_more_frame(int x, int y, Component *parameterSelf) {
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
     if (frame < 256) {
       frame = frame * 2;
-      sprintf(labelFrame,"%03d frames", frame);
+      sprintf(labelFrame, "%03d frames", frame);
       mode = PRINTING_BUTTONS;
     }
   }
 }
 
-void button_click_rendering(int x,int y, Component *parameterSelf) {
+void button_click_rendering(int x, int y, Component *parameterSelf) {
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
   if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
@@ -96,14 +87,12 @@ void button_click_none(int x, int y, Component *parameterSelf) {
   assert(parameterSelf != NULL);
 }
 
-
-void
-button_init(Button *button, const char *text, int sizeInterligne, int x_pos, int y_pos, ClickHandler clickHandler) {
-  assert(button != NULL);
+Button *button_create(const char *text, int sizeInterligne, int x_pos, int y_pos, ClickHandler clickHandler) {
   assert(text != NULL);
   assert(sizeInterligne >= 0);
   assert(x_pos >= 0);
   assert(y_pos >= 0);
+  Button *button = malloc_or_die(sizeof(Button));
   button->label = malloc_or_die(sizeof(char) * (strlen(text) + 1));
   strcpy(button->label, text);
   button->sizeInterligne = sizeInterligne;
@@ -112,4 +101,11 @@ button_init(Button *button, const char *text, int sizeInterligne, int x_pos, int
   button->component.y_pos = y_pos;
   button->component.print_method = button_print;
   button->component.click_handler = clickHandler;
+  return button;
 }
+
+void button_destroy(Button *button){
+  assert(button != NULL);
+  free(button->label);
+  free(button);
+}
\ No newline at end of file
diff --git a/src/gui/gui.c b/src/gui/gui.c
index 3982f68..ced2661 100644
--- a/src/gui/gui.c
+++ b/src/gui/gui.c
@@ -1,22 +1,18 @@
-#include <gui/window.h>
-#include <gui/gui.h>
-#include <common/mem.h>
-#include <MLV/MLV_all.h>
-#include <gui/button.h>
+#include "gui/window.h"
+#include "gui/gui.h"
+#include "common/mem.h"
+#include "MLV/MLV_all.h"
 
 
-GUI *gui_init(const char *fpath1, const char *fpath2) {
+GUI *gui_create(const char *fpath1, const char *fpath2) {
   GUI *gui = malloc_or_die(sizeof(GUI));
-
-  gui->window = malloc_or_die(sizeof(Window));
-  window_init(gui->window, 500, 500, "Morphing");
-  window_create(gui->window);
+  gui->window = window_create(500, 500, "Morphing");
   gui->canvasSrc = canvas_create_from_image(fpath1);
   gui->canvasTrg = canvas_create_from_image(fpath2);
   if (gui->canvasSrc->mlv == NULL || gui->canvasTrg->mlv == NULL) {
     canvas_destroy(gui->canvasSrc);
     canvas_destroy(gui->canvasTrg);
-    /*window_free(gui->window);*/
+    window_destroy(gui->window);
     fprintf(stderr, "Impossible to create an image from the path given. Verify the two paths.\n");
     exit(-4);
   }
@@ -31,7 +27,7 @@ GUI *gui_init(const char *fpath1, const char *fpath2) {
   if (canvasSrcWidth != canvasTrgWidth || canvasSrcHeight != canvasTrgHeight) {
     canvas_destroy(gui->canvasSrc);
     canvas_destroy(gui->canvasTrg);
-    window_free(gui->window);
+    window_destroy(gui->window);
     fprintf(stderr, "The two pictures do not have the same size\n");
     exit(-5);
   }
@@ -41,14 +37,6 @@ GUI *gui_init(const char *fpath1, const char *fpath2) {
 
   MLV_change_window_size((unsigned int) gui->window->width, (unsigned int) gui->window->height);
 
-  gui->button1 = malloc_or_die(sizeof(Button));
-  gui->button2 = malloc_or_die(sizeof(Button));
-  gui->button3 = malloc_or_die(sizeof(Button));
-  gui->button4 = malloc_or_die(sizeof(Button));
-  gui->button5 = malloc_or_die(sizeof(Button));
-  gui->button6 = malloc_or_die(sizeof(Button));
-  gui->button7 = malloc_or_die(sizeof(Button));
-
   gui->pictureFrame1 = malloc_or_die(sizeof(PictureFrame));
   gui->pictureFrame2 = malloc_or_die(sizeof(PictureFrame));
 
@@ -56,20 +44,22 @@ GUI *gui_init(const char *fpath1, const char *fpath2) {
 
 
   sprintf(labelFrame, "%03d frames", frame);
-  button_init(gui->button1, "Add constraint point", 10, 0, 0, button_click_add_constraint);
-  button_init(gui->button2, "Show/Hide", 10, 0, 0, button_click_show_hide);
-  button_init(gui->button3, "Start rendering", 10, 0, 0, button_click_rendering);
-  button_init(gui->button4, "<<<", 10, 0, 0, button_click_less_frame);
-  button_init(gui->button5, labelFrame, 10, 0, 0, button_click_none);
-  button_init(gui->button6, ">>>", 10, 0, 0, button_click_more_frame);
-  button_init(gui->button7, "Exit", 10, 0, 0, button_click_exit);
-
-  pictureframe_init(gui->pictureFrame1, canvasSrcWidth, canvasSrcHeight, 0, 0, pictureframe_origin_split, gui->morphing,
-                    gui->canvasSrc,
-                    pictureframe_click_handler_origin);
-  pictureframe_init(gui->pictureFrame2, canvasSrcWidth, canvasSrcHeight, 0, 0, pictureframe_target_split, gui->morphing,
-                    gui->canvasTrg,
-                    pictureframe_click_handler_target);
+  gui->button1 = button_create("Add constraint point", 10, 0, 0, button_click_add_constraint);
+  gui->button2 = button_create("Show/Hide", 10, 0, 0, button_click_show_hide);
+  gui->button3 = button_create("Start rendering", 10, 0, 0, button_click_rendering);
+  gui->button4 = button_create("<<<", 10, 0, 0, button_click_less_frame);
+  gui->button5 = button_create(labelFrame, 10, 0, 0, button_click_none);
+  gui->button6 = button_create(">>>", 10, 0, 0, button_click_more_frame);
+  gui->button7 = button_create("Exit", 10, 0, 0, button_click_exit);
+
+  gui->pictureFrame1 = pictureframe_create(canvasSrcWidth, canvasSrcHeight, 0, 0, pictureframe_origin_split,
+                                           gui->morphing,
+                                           gui->canvasSrc,
+                                           pictureframe_click_handler_origin);
+  gui->pictureFrame2 = pictureframe_create(canvasSrcWidth, canvasSrcHeight, 0, 0, pictureframe_target_split,
+                                           gui->morphing,
+                                           gui->canvasTrg,
+                                           pictureframe_click_handler_target);
 
   window_add_pictureframe(gui->window, gui->pictureFrame1);
   window_add_pictureframe(gui->window, gui->pictureFrame2);
@@ -89,8 +79,13 @@ GUI *gui_init(const char *fpath1, const char *fpath2) {
 }
 
 void gui_handle_event(GUI *gui) {
-  window_click_keyboard_handler(gui->window, &gui->keyboardButton, &gui->keyboardModifier, &gui->unicode, &gui->mouse_x,
-                                &gui->mouse_y);
+  MLV_Keyboard_button keyboardButton;
+  MLV_Keyboard_modifier keyboardModifier;
+  int unicode;
+  int mouse_x;
+  int mouse_y;
+  window_click_keyboard_handler(gui->window, &keyboardButton, &keyboardModifier, &unicode, &mouse_x,
+                                &mouse_y);
   switch (mode) {
     case PRINTING:
       window_print_pictureframes(gui->window);
@@ -103,8 +98,9 @@ void gui_handle_event(GUI *gui) {
       window_print_pictureframes(gui->window);