Implementing all kinds of buttons. Rendering to fix

7 files changed, 197 insertions, 51 deletions

diff --git a/include/gui/button.h b/include/gui/button.h
index 26d7970..41008c1 100644
--- a/include/gui/button.h
+++ b/include/gui/button.h
@@ -58,6 +58,20 @@ 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);
+
+void button_click_show_hide(int x, int y, Component *parameterSelf);
+
+void button_click_exit(int x, int y, Component *parameterSelf);
+
+void button_click_none(int x, int y, Component *parameterSelf);
+
+void button_click_more_frame(int x, int y, Component *parameterSelf);
+
+void button_click_less_frame(int x, int y, Component *parameterSelf);
+
+void button_click_rendering(int x, int y, Component *parameterSelf);
+
+
 /**
  * Function: button_is_selected
  * Checks if the button is selected or not.
diff --git a/include/gui/component.h b/include/gui/component.h
index 0e8f437..0275d45 100644
--- a/include/gui/component.h
+++ b/include/gui/component.h
@@ -1,10 +1,12 @@
 #ifndef UPEM_C_COMPONENT_H
 #define UPEM_C_COMPONENT_H
 typedef enum {
-  WAITING_BUTTON, INSERT_ORIGIN, INSERT_TARGET,PRINTING
+  WAITING_BUTTON_SHOW, WAITING_BUTTON_HIDE, INSERT_ORIGIN, INSERT_TARGET, PRINTING, EXITING, PRINTING_BUTTONS, RENDERING
 } Mode;
 
 extern Mode mode;
+extern int frame;
+extern char labelFrame[20];
 /**
  * File: component.h
  * Windows and components handling.
diff --git a/include/gui/textview.h b/include/gui/textview.h
index 7a07eb3..7414336 100644
--- a/include/gui/textview.h
+++ b/include/gui/textview.h
@@ -1,6 +1,8 @@
 #ifndef UPEM_MORPHING_TEXTVIEW
 #define UPEM_MORPHING_TEXTVIEW
 
+#include "component.h"
+
 /**
  * File: textview.h
  */
diff --git a/src/gui/button.c b/src/gui/button.c
index a1fa1cf..03addf8 100644
--- a/src/gui/button.c
+++ b/src/gui/button.c
@@ -32,21 +32,88 @@ 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) && mode == WAITING_BUTTON) {
-    printf("OK\n");
+  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){
+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) {
+  if (button_is_selected(x, y, self) && (mode == WAITING_BUTTON_SHOW || mode == WAITING_BUTTON_HIDE)) {
     mode = INSERT_ORIGIN;
   }
 }
 
+void button_click_show_hide(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)) {
+    if (mode == WAITING_BUTTON_SHOW) {
+      mode = WAITING_BUTTON_HIDE;
+    } else if (mode == WAITING_BUTTON_HIDE) {
+      mode = WAITING_BUTTON_SHOW;
+    }
+  }
+}
+
+void button_click_exit(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_SHOW || mode == WAITING_BUTTON_HIDE)) {
+    mode = EXITING;
+  }
+}
+
+void button_click_less_frame(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_SHOW || mode == WAITING_BUTTON_HIDE)) {
+    if (frame > 2) {
+      frame = frame / 2;
+      sprintf(labelFrame,"%03d frames", frame);
+      mode = PRINTING_BUTTONS;
+    }
+  }
+}
+
+void button_click_more_frame(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_SHOW || mode == WAITING_BUTTON_HIDE)) {
+    if (frame < 256) {
+      frame = frame * 2;
+      sprintf(labelFrame,"%03d frames", frame);
+      mode = PRINTING_BUTTONS;
+    }
+  }
+}
+
+void button_click_rendering(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_SHOW || mode == WAITING_BUTTON_HIDE)) {
+    mode = RENDERING;
+  }
+}
+
+void button_click_none(int x, int y, Component *parameterSelf) {
+  assert(x >= 0);
+  assert(y >= 0);
+  assert(parameterSelf != NULL);
+}
+
 
 void
 button_init(Button *button, const char *text, int sizeInterligne, int x_pos, int y_pos, ClickHandler clickHandler) {
diff --git a/src/gui/component.c b/src/gui/component.c
index 07fb336..3eb31c5 100644
--- a/src/gui/component.c
+++ b/src/gui/component.c
@@ -1,3 +1,7 @@
 #include <gui/component.h>
 
-Mode mode = WAITING_BUTTON;
+Mode mode = WAITING_BUTTON_SHOW;
+
+int frame = 2;
+
+char labelFrame[20];
diff --git a/src/gui/pictureframe.c b/src/gui/pictureframe.c
index e4081a7..4126f59 100644
--- a/src/gui/pictureframe.c
+++ b/src/gui/pictureframe.c
@@ -1,7 +1,6 @@
 #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;
@@ -11,33 +10,39 @@ CartesianVector pictureframe_target_split(const CartesianMapping *cartesianMappi
   return cartesianMapping->target;
 }
 
+void pictureframe_draw_canvas(PictureFrame *pictureFrame){
+  MLV_draw_image(pictureFrame->canvas->mlv, pictureFrame->component.x_pos, pictureFrame->component.y_pos);
+}
+
 void pictureframe_print(Component *parameterSelf) {
   PictureFrame *self = (PictureFrame *) parameterSelf;
-  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]));
+  pictureframe_draw_canvas(self);
+  if (mode != WAITING_BUTTON_HIDE) {
+    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);
+      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_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;
+      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;
+    }
   }