From 2f3d8ebc9b5e10e56bed5da316f5ef098dda0997 Mon Sep 17 00:00:00 2001 From: Adam NAILI Date: Wed, 3 Jan 2018 19:40:51 +0100 Subject: Updating documentation, cleaning includes, updating report --- src/gui/button.c | 44 +++++++++++------------ src/gui/gui.c | 97 ++++++++++++++++++++++++-------------------------- src/gui/pictureframe.c | 76 +++++++++++++++++++++------------------ src/gui/window.c | 35 ++++++++---------- 4 files changed, 122 insertions(+), 130 deletions(-) (limited to 'src/gui') 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 #include +#include #include -#include #include -#include -#include +#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 -#include -#include -#include -#include +#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); break; case PRINTING_BUTTONS: - button_init(gui->button5, labelFrame, 10, gui->button5->component.x_pos, gui->button5->component.y_pos, - button_click_none); + free(gui->button5->label); + gui->button5->label = malloc_or_die(sizeof(char) * (strlen(labelFrame) + 1)); + strcpy(gui->button5->label, labelFrame); window_print_buttons(gui->window); mode = WAITING_BUTTON_SHOW; break; @@ -112,7 +108,7 @@ void gui_handle_event(GUI *gui) { window_rendering(gui->window, gui->pictureFrame1, gui->canvasSrc, gui->canvasTrg, gui->morphing); break; case INSERT_TARGET: - if (gui->keyboardButton == MLV_KEYBOARD_ESCAPE) { + if (keyboardButton == MLV_KEYBOARD_ESCAPE) { window_print_pictureframes(gui->window); mode = WAITING_BUTTON_SHOW; } @@ -122,19 +118,20 @@ void gui_handle_event(GUI *gui) { } } -void gui_free(GUI *gui) { - window_free(gui->window); +void gui_destroy(GUI *gui) { + window_destroy(gui->window); canvas_destroy(gui->canvasSrc); canvas_destroy(gui->canvasTrg); morphing_destroy(gui->morphing); - free(gui->button1); - free(gui->button2); - free(gui->button3); - free(gui->button4); - free(gui->button5); - free(gui->button6); - free(gui->button7); - free(gui->pictureFrame1); - free(gui->pictureFrame2); + button_destroy(gui->button1); + button_destroy(gui->button2); + button_destroy(gui->button3); + button_destroy(gui->button4); + button_destroy(gui->button5); + button_destroy(gui->button6); + button_destroy(gui->button7); + + pictureframe_destroy(gui->pictureFrame1); + pictureframe_destroy(gui->pictureFrame2); } \ No newline at end of file diff --git a/src/gui/pictureframe.c b/src/gui/pictureframe.c index a6a94bf..53a0ed3 100644 --- a/src/gui/pictureframe.c +++ b/src/gui/pictureframe.c @@ -1,20 +1,35 @@ #include -#include -#include +#include "common/mem.h" +#include "gui/pictureframe.h" +#include "MLV/MLV_all.h" -CartesianVector pictureframe_origin_split(const CartesianMapping *cartesianMapping) { - return cartesianMapping->origin; +static bool pictureframe_is_selected(int x, int y, PictureFrame *pictureFrame) { + assert(pictureFrame != NULL); + int x1 = pictureFrame->component.x_pos; + int y1 = pictureFrame->component.y_pos; + int x2 = pictureFrame->component.x_pos + pictureFrame->component.width; + int y2 = pictureFrame->component.y_pos + pictureFrame->component.height; + if (x >= x1 && x <= x2 && y >= y1 && y <= y2) { + return true; + } + return false; } -CartesianVector pictureframe_target_split(const CartesianMapping *cartesianMapping) { - return cartesianMapping->target; +static CartesianVector pictureframe_conversion_to_pic(int x, int y, PictureFrame *pictureFrame) { + CartesianVector vector; + vector.x = x - pictureFrame->component.x_pos; + vector.y = y - pictureFrame->component.y_pos; + return vector; } -void pictureframe_draw_canvas(PictureFrame *pictureFrame){ - MLV_draw_image(pictureFrame->canvas->mlv, pictureFrame->component.x_pos, pictureFrame->component.y_pos); +static CartesianVector pictureframe_conversion_to_origin(int x, int y, PictureFrame *pictureFrame) { + CartesianVector vector; + vector.x = x + pictureFrame->component.x_pos; + vector.y = y + pictureFrame->component.y_pos; + return vector; } -void pictureframe_print(Component *parameterSelf) { +static void pictureframe_print(Component *parameterSelf) { PictureFrame *self = (PictureFrame *) parameterSelf; pictureframe_draw_canvas(self); if (mode != WAITING_BUTTON_HIDE && mode != RENDERING) { @@ -46,30 +61,12 @@ void pictureframe_print(Component *parameterSelf) { } } -bool pictureframe_is_selected(int x, int y, PictureFrame *pictureFrame) { - assert(pictureFrame != NULL); - int x1 = pictureFrame->component.x_pos; - int y1 = pictureFrame->component.y_pos; - int x2 = pictureFrame->component.x_pos + pictureFrame->component.width; - int y2 = pictureFrame->component.y_pos + pictureFrame->component.height; - if (x >= x1 && x <= x2 && y >= y1 && y <= y2) { - return true; - } - return false; -} - -CartesianVector pictureframe_conversion_to_pic(int x, int y, PictureFrame *pictureFrame) { - CartesianVector vector; - vector.x = x - pictureFrame->component.x_pos; - vector.y = y - pictureFrame->component.y_pos; - return vector; +CartesianVector pictureframe_origin_split(const CartesianMapping *cartesianMapping) { + return cartesianMapping->origin; } -CartesianVector pictureframe_conversion_to_origin(int x, int y, PictureFrame *pictureFrame) { - CartesianVector vector; - vector.x = x + pictureFrame->component.x_pos; - vector.y = y + pictureFrame->component.y_pos; - return vector; +CartesianVector pictureframe_target_split(const CartesianMapping *cartesianMapping) { + return cartesianMapping->target; } void pictureframe_click_handler_origin(int x_pos, int y_pos, Component *parameterSelf) { @@ -92,10 +89,13 @@ void pictureframe_click_handler_target(int x_pos, int y_pos, Component *paramete } } -void pictureframe_init(PictureFrame *pictureFrame, int width, int height, int x_pos, int y_pos, - CartesianMappingDivision cartesianMappingDivision, Morphing *morphing, Canvas *canvas, - ClickHandler clickHandler) { - assert(pictureFrame != NULL); +void pictureframe_draw_canvas(PictureFrame *pictureFrame) { + MLV_draw_image(pictureFrame->canvas->mlv, pictureFrame->component.x_pos, pictureFrame->component.y_pos); +} + +PictureFrame *pictureframe_create(int width, int height, int x_pos, int y_pos, + CartesianMappingDivision cartesianMappingDivision, Morphing *morphing, Canvas *canvas, + ClickHandler clickHandler) { assert(width > 0); assert(height > 0); assert(x_pos >= 0); @@ -103,6 +103,7 @@ void pictureframe_init(PictureFrame *pictureFrame, int width, int height, int x_ assert(cartesianMappingDivision != NULL); assert(morphing != NULL); assert(canvas != NULL); + PictureFrame *pictureFrame = malloc_or_die(sizeof(PictureFrame)); pictureFrame->component.width = width; pictureFrame->component.height = height; pictureFrame->component.x_pos = x_pos; @@ -112,4 +113,9 @@ void pictureframe_init(PictureFrame *pictureFrame, int width, int height, int x_ pictureFrame->morphing = morphing; pictureFrame->canvas = canvas; pictureFrame->cartesianMappingDivision = cartesianMappingDivision; + return pictureFrame; +} + +void pictureframe_destroy(PictureFrame *pictureFrame){ + free(pictureFrame); } \ No newline at end of file diff --git a/src/gui/window.c b/src/gui/window.c index 32aeb26..1859f58 100644 --- a/src/gui/window.c +++ b/src/gui/window.c @@ -1,22 +1,16 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include "gui/window.h" +#include "MLV/MLV_all.h" +#include "painter/rasterizer.h" #include "common/mem.h" -#include "string.h" -#include "assert.h" -#include "MLV/MLV_window.h" -void window_init(Window *window, int width, int height, char *title) { - assert(window != NULL); + +Window *window_create(int width, int height, char *title) { assert(width > 0); assert(height > 0); assert(title != NULL); + Window *window = malloc_or_die(sizeof(Window)); window->width = width; window->height = height; window->title = malloc_or_die(sizeof(char) * (strlen(title) + 1)); @@ -25,13 +19,16 @@ void window_init(Window *window, int width, int height, char *title) { group_init(window->group_buttons, window->width, 100, 0, window->height - 100, 5); window->group_pictureframe = malloc_or_die(sizeof(Group)); group_init(window->group_pictureframe, window->width, window->height - 100, 0, 0, 5); + MLV_create_window(window->title, window->title, (unsigned int) window->width, (unsigned int) window->height); + return window; } -void window_free(Window *window) { +void window_destroy(Window *window) { assert(window != NULL); free(window->title); group_free(window->group_buttons); group_free(window->group_pictureframe); + free(window); } void window_add_button(Window *window, Button *button) { @@ -46,11 +43,6 @@ void window_add_pictureframe(Window *window, PictureFrame *pictureFrame) { group_add_component(window->group_pictureframe, &(pictureFrame->component)); } -void window_create(Window *window) { - assert(window != NULL); - MLV_create_window(window->title, window->title, (unsigned int) window->width, (unsigned int) window->height); -} - void window_print_buttons(Window *window) { assert(window != NULL); window->group_buttons->component.print_method(&(window->group_buttons->component)); @@ -74,12 +66,13 @@ void window_wait_keyboard_or_mouse(MLV_Keyboard_button *keyboardButton, MLV_Keyb void window_click_keyboard_handler(Window *window, MLV_Keyboard_button *keyboardButton, MLV_Keyboard_modifier *keyboardModifier, int *unicode, int *mouse_x, int *mouse_y) { - window_wait_keyboard_or_mouse(keyboardButton,keyboardModifier,unicode,mouse_x,mouse_y); + window_wait_keyboard_or_mouse(keyboardButton, keyboardModifier, unicode, mouse_x, mouse_y); group_click_handler(*mouse_x, *mouse_y, &(window->group_buttons->component)); group_click_handler(*mouse_x, *mouse_y, &(window->group_pictureframe->component)); } -void window_rendering(Window *window,PictureFrame *pictureFrame1,Canvas *canvasSrc, Canvas *canvasTarget, Morphing *morphing){ +void window_rendering(Window *window, PictureFrame *pictureFrame1, Canvas *canvasSrc, Canvas *canvasTarget, + Morphing *morphing) { int i; window_print_pictureframes(window); for (i = 1; i <= frame; ++i) { -- cgit v1.2.3