Implementing the add constraint feature, need to be fixed

4 files changed, 95 insertions, 16 deletions

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) {
-
+  return cartesianMapping->origin;
 }
 
 CartesianVector pictureframe_target_split(const CartesianMapping *cartesianMapping) {
-
+  return cartesianMapping->target;
 }
 
 void pictureframe_print(Component *parameterSelf) {
   PictureFrame *self = (PictureFrame *) parameterSelf;
-  /*DEBUG*/
-  MLV_draw_filled_rectangle(self->component.x_pos, self->component.y_pos, self->component.width, self->component.height,
-                            MLV_COLOR_RED);
-  /**/
+  MLV_draw_image(self->canvas->mlv, self->component.x_pos, self->component.y_pos);
+  TriangleMap *p = self->morphing->first;
+  CartesianVector p1;
+  CartesianVector p2;
+  CartesianVector p3;
+  CartesianVector pointToPrint1;
+  CartesianVector pointToPrint2;
+  CartesianVector pointToPrint3;
+  while(p != NULL){
+    p1 = self->cartesianMappingDivision(&(p->vertices[0]));
+    p2 = self->cartesianMappingDivision(&(p->vertices[1]));
+    p3 = self->cartesianMappingDivision(&(p->vertices[2]));
+
+    pointToPrint1 = pictureframe_conversion_to_picture(p1.x,p1.y,self);
+    pointToPrint2 = pictureframe_conversion_to_picture(p2.x,p2.y,self);
+    pointToPrint3 = pictureframe_conversion_to_picture(p3.x,p3.y,self);
+
+    MLV_draw_filled_circle(pointToPrint1.x,pointToPrint1.y,2,MLV_COLOR_RED);
+    MLV_draw_filled_circle(pointToPrint2.x,pointToPrint2.y,2,MLV_COLOR_RED);
+    MLV_draw_filled_circle(pointToPrint3.x,pointToPrint3.y,2,MLV_COLOR_RED);
+
+    MLV_draw_line(pointToPrint1.x,pointToPrint1.y,pointToPrint2.x,pointToPrint2.y,MLV_COLOR_RED);
+    MLV_draw_line(pointToPrint1.x,pointToPrint1.y,pointToPrint3.x,pointToPrint3.y,MLV_COLOR_RED);
+    MLV_draw_line(pointToPrint3.x,pointToPrint3.y,pointToPrint2.x,pointToPrint2.y,MLV_COLOR_RED);
+    p = p->next;
+  }
+}
+
+bool pictureframe_is_selected(int x, int y, PictureFrame *pictureFrame) {
+  assert(x >= 0);
+  assert(y >= 0);
+  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_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_conversion_to_picture(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_click_handler_origin(int x_pos, int y_pos, Component *parameterSelf) {
+  PictureFrame *self = (PictureFrame *) parameterSelf;
+  if (pictureframe_is_selected(x_pos, y_pos, self) && mode == INSERT_ORIGIN) {
+    CartesianVector vector = pictureframe_conversion_to_origin(x_pos,y_pos,self);
+    MLV_draw_filled_circle(x_pos,y_pos,2,MLV_COLOR_BLUE);
+    savedPoint = vector;
+    MLV_actualise_window();
+    mode = INSERT_TARGET;
+  }
 }
 
-void pictureframe_click_handler(int x_pos, int y_pos, Component *parameterSelf) {
-  printf("ClickHandler pictureframe activated \n");
+void pictureframe_click_handler_target(int x_pos, int y_pos, Component *parameterSelf) {
+  PictureFrame *self = (PictureFrame *) parameterSelf;
+  if (pictureframe_is_selected(x_pos, y_pos, self) && mode == INSERT_TARGET) {
+    CartesianVector vector = pictureframe_conversion_to_origin(x_pos,y_pos,self);
+    printf("(%d,%d) | (%d,%d)\n",savedPoint.x,savedPoint.y,vector.x,vector.y);
+    morphing_add_constraint(self->morphing,savedPoint,vector);
+    printf("OK\n");
+    mode = PRINTING;
+  }
 }
 
 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) {
   assert(pictureFrame != NULL);
   assert(width > 0);
   assert(height > 0);
@@ -36,9 +105,8 @@ void pictureframe_init(PictureFrame *pictureFrame, int width, int height, int x_
   pictureFrame->component.height = height;
   pictureFrame->component.x_pos = x_pos;
   pictureFrame->component.y_pos = y_pos;
-  pictureFrame->component.activated = true;
   pictureFrame->component.print_method = pictureframe_print;
-  pictureFrame->component.click_handler = pictureframe_click_handler;
+  pictureFrame->component.click_handler = clickHandler;
   pictureFrame->morphing = morphing;
   pictureFrame->canvas = canvas;
   pictureFrame->cartesianMappingDivision = cartesianMappingDivision;