Implementing the add constraint feature, need to be fixed

9 files changed, 160 insertions, 35 deletions

diff --git a/include/gui/button.h b/include/gui/button.h
index 6f91e37..26d7970 100644
--- a/include/gui/button.h
+++ b/include/gui/button.h
@@ -1,6 +1,5 @@
 #ifndef UPEM_MORPHING_BUTTON
 #define UPEM_MORPHING_BUTTON
-
 /**
  * File: button.h
  * Buttons handling
@@ -58,6 +57,7 @@ void button_print(Component *parameterSelf);
  */
 void button_click_test(int x, int y, Component *parameterSelf);
 
+void button_click_add_constraint(int x, int y, Component *parameterSelf);
 /**
  * Function: button_is_selected
  * Checks if the button is selected or not.
@@ -70,6 +70,7 @@ void button_click_test(int x, int y, Component *parameterSelf);
  * Returns:
  *  A bool from stdbool
  */
+
 bool button_is_selected(int x, int y, Button *button);
 
 #endif
diff --git a/include/gui/component.h b/include/gui/component.h
index dd101dc..0e8f437 100644
--- a/include/gui/component.h
+++ b/include/gui/component.h
@@ -1,7 +1,10 @@
 #ifndef UPEM_C_COMPONENT_H
 #define UPEM_C_COMPONENT_H
+typedef enum {
+  WAITING_BUTTON, INSERT_ORIGIN, INSERT_TARGET,PRINTING
+} Mode;
 
-#include <stdbool.h>
+extern Mode mode;
 /**
  * File: component.h
  * Windows and components handling.
@@ -38,7 +41,6 @@ typedef void (*PrintMethod)(struct Component *);
 typedef struct Component {
   int width, height;
   int x_pos, y_pos;
-  bool activated;
   ClickHandler click_handler;
   PrintMethod print_method;
 } Component;
diff --git a/include/gui/pictureframe.h b/include/gui/pictureframe.h
index 1f5407c..f06a530 100644
--- a/include/gui/pictureframe.h
+++ b/include/gui/pictureframe.h
@@ -1,13 +1,14 @@
 #ifndef UPEM_MORPHING_PITUREFRAME
 #define UPEM_MORPHING_PITUREFRAME
 
-#include <blender/canvas.h>
 #include <morpher/morphing.h>
+#include <painter/canvas.h>
 #include "component.h"
-
 /**
  * File: pictureframe.h
  */
+
+CartesianVector savedPoint;
 /**
  * Type: CartesianMappingDivision
  * Type of functions needed to split CartesianMapping and keep only the CartesianVector needed, related to the type of PictureFrame involved
@@ -49,8 +50,24 @@ CartesianVector pictureframe_origin_split(const CartesianMapping *cartesianMappi
  */
 CartesianVector pictureframe_target_split(const CartesianMapping *cartesianMapping);
 
+bool pictureframe_is_selected(int x, int y, PictureFrame *pictureFrame);
+
+/**
+ * Function: pictureframe_conversion_to_origin
+ * Returns the relative coordinate on the picture corresponding to the input values
+ *
+ * Parameters:
+ *  x - value on x axis from the origin of the window to convert
+ *  y - value on y axis from the origin of the window to convert
+ *  *pictureFrame - pointer to the reference pictureframe that will give his relative coordinates
+ */
+CartesianVector pictureframe_conversion_to_origin(int x, int y, PictureFrame *pictureFrame);
+
+CartesianVector pictureframe_conversion_to_picture(int x, int y, PictureFrame *pictureFrame);
+
 void pictureframe_init(PictureFrame *pictureFrame, int width, int height, int x_pos, int y_pos,
-                       CartesianMappingDivision cartesianMappingDivision, Morphing *morphing, Canvas *canvas);
+                       CartesianMappingDivision cartesianMappingDivision, Morphing *morphing, Canvas *canvas,
+                       ClickHandler clickHandler);
 
 void pictureframe_free(PictureFrame *pictureFrame);
 
@@ -73,7 +90,18 @@ void pictureframe_draw_canvas(PictureFrame *pictureFrame);
 void pictureframe_print(Component *parameterSelf);
 
 /**
- * Function: pictureframe_click_handler
+ * Function: pictureframe_click_handler_origin
+ * Adds a point on the coordinate of the picture that the mouse is pointing.
+ *
+ * Parameters:
+ *  x_pos - coordinate on x axis of the mouse
+ *  y_pos - coordinate on y axis of the mouse
+ *  *parameterSelf - pointer that will be casted into a PictureFrame
+ */
+void pictureframe_click_handler_origin(int x_pos, int y_pos, Component *parameterSelf);
+
+/**
+ * Function: pictureframe_click_handler_target
  * Adds a point on the coordinate of the picture that the mouse is pointing.
  *
  * Parameters:
@@ -81,7 +109,7 @@ void pictureframe_print(Component *parameterSelf);
  *  y_pos - coordinate on y axis of the mouse
  *  *parameterSelf - pointer that will be casted into a PictureFrame
  */
-void pictureframe_click_handler(int x_pos, int y_pos, Component *parameterSelf);
+void pictureframe_click_handler_target(int x_pos, int y_pos, Component *parameterSelf);
 
 
 #endif
diff --git a/src/gui/button.c b/src/gui/button.c
index 96cbd9a..a1fa1cf 100644
--- a/src/gui/button.c
+++ b/src/gui/button.c
@@ -6,7 +6,6 @@
 #include <MLV/MLV_all.h>
 #include <gui/component.h>
 
-
 bool button_is_selected(int x, int y, Button *button) {
   assert(x >= 0);
   assert(y >= 0);
@@ -33,11 +32,22 @@ void button_click_test(int x, int y, Component *parameterSelf) {
   assert(y >= 0);
   assert(parameterSelf != NULL);
   Button *self = (Button *) parameterSelf;
-  if (button_is_selected(x, y, self) && self->component.activated) {
+  if (button_is_selected(x, y, self) && mode == WAITING_BUTTON) {
     printf("OK\n");
   }
 }
 
+void button_click_add_constraint(int x, int y, Component *parameterSelf){
+  assert(x >= 0);
+  assert(y >= 0);
+  assert(parameterSelf != NULL);
+  Button *self = (Button *) parameterSelf;
+  if (button_is_selected(x, y, self) && mode == WAITING_BUTTON) {
+    mode = INSERT_ORIGIN;
+  }
+}
+
+
 void
 button_init(Button *button, const char *text, int sizeInterligne, int x_pos, int y_pos, ClickHandler clickHandler) {
   assert(button != NULL);
@@ -51,7 +61,6 @@ button_init(Button *button, const char *text, int sizeInterligne, int x_pos, int
   MLV_get_size_of_adapted_text_box(text, sizeInterligne, &button->component.width, &button->component.height);
   button->component.x_pos = x_pos;
   button->component.y_pos = y_pos;
-  button->component.activated = true;
   button->component.print_method = button_print;
   button->component.click_handler = clickHandler;
 }
diff --git a/src/gui/component.c b/src/gui/component.c
new file mode 100644
index 0000000..07fb336
--- /dev/null
+++ b/src/gui/component.c
@@ -0,0 +1,3 @@
+#include <gui/component.h>
+
+Mode mode = WAITING_BUTTON;
diff --git a/src/gui/group.c b/src/gui/group.c
index 11a0583..af9abac 100644
--- a/src/gui/group.c
+++ b/src/gui/group.c
@@ -22,7 +22,7 @@ void group_click_handler(int x_pos, int y_pos, Component *parameterSelf) {
   assert(parameterSelf != NULL);
   Group *self = (Group *) parameterSelf;
 
-  if (self->group_head != NULL && self->component.activated) {
+  if (self->group_head != NULL) {
     GroupElement *p = self->group_head;
     while (p != NULL) {
       p->sub_component->click_handler(x_pos, y_pos, p->sub_component);
@@ -42,7 +42,6 @@ void group_init(Group *group, int width, int height, int x_pos, int y_pos, int m
   group->component.height = height;
   group->component.x_pos = x_pos;
   group->component.y_pos = y_pos;
-  group->component.activated = true;
   group->component.print_method = group_print;
   group->component.click_handler = group_click_handler;
   group->margin = margin;
diff --git a/src/gui/pictureframe.c b/src/gui/pictureframe.c
index 543ba4c..e4081a7 100644
--- a/src/gui/pictureframe.c
+++ b/src/gui/pictureframe.c
@@ -1,29 +1,98 @@
 #include <assert.h>
 #include <gui/pictureframe.h>
 #include <MLV/MLV_all.h>
+#include <common/time.h>
 
 CartesianVector pictureframe_origin_split(const CartesianMapping *cartesianMapping) {