Dessin des fleches

src/interface/render_area.cpp

@@ -72,6 +72,7 @@ Render_area::Render_area(QWidget *parent)
     _state_translate = 0;/* temporary, for states translation */
     //_container_view_size = 50;/* temporary, for container view */
 
+    /* Camera is placed on (0,0,0) and looks to (0,0,-1) */
     _z_container = -1.0f;
     _z_arrow = -2.0f;/* closer to camera than containers or states (MUST be negative)*/
     _z_state= -3.0f;
@@ -271,6 +272,9 @@ void  Render_area::paintGL(){
         glPopMatrix();
 
         //glCallList(_list_counters);
+        
+        draw_stored_arrows(_arrows);/* draw arrows without display lists */
+
         draw_stored_events(_events);/* draw events without display lists */
 
         break;
@@ -379,6 +383,8 @@ bool Render_area::unbuild(){
     glEnable(GL_BLEND);/* enable blending for the alpha color */ 
     glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
+    glColor3d(1.0, 1.0, 1.0);/* init color to white */
+
     return true;
 }
 

src/interface/render_area.hpp

@@ -26,6 +26,14 @@ struct Event_{
     Element_pos container_height;
 };
 
+struct Arrow_{
+    Element_pos start_time;
+    Element_pos end_time;
+    Element_pos start_height;
+    Element_pos end_height;
+};
+
+
 
 /*!
  * \brief This class redefined the OpenGL widget - QGLWidget - to display the trace.
@@ -43,6 +51,7 @@ class Render_area : public QGLWidget, public Render
      std::list<Element_pos> _text_pos;
      std::list<std::string> _text_value;
      std::vector<Event_> _events;
+     std::vector<Arrow_> _arrows;
 
 
      /***********************************
@@ -329,6 +338,8 @@ class Render_area : public QGLWidget, public Render
 
      void draw_arrow(const Element_pos start_time, const Element_pos end_time, const Element_pos start_height, const Element_pos end_height);
 
+     void draw_stored_arrows(std::vector<Arrow_> &arrows);
+
      void draw_event(const Element_pos time, const Element_pos height,  const Element_pos container_height);
 
      void draw_stored_events(std::vector<Event_> &events);
@@ -468,8 +479,37 @@ inline void Render_area::end_draw_states(){
 
 inline void Render_area::draw_arrow(const Element_pos start_time, const Element_pos end_time, const Element_pos start_height, const Element_pos end_height){
 
+    Arrow_ buf;
+
+    buf.start_time = start_time;
+    buf.end_time = end_time;
+    buf.start_height = start_height;
+    buf.end_height = end_height;
+
+    _arrows.push_back(buf);
+}
+
+
+
+inline void Render_area::draw_stored_arrows(std::vector<Arrow_> &arrows){
+
+    Element_pos start_time, end_time, start_height, end_height;
+
+    /* Manage the event drawing size from state size and render area dimensions */
+    Element_pos arrow_scale_x = _state_scale*(_render_width/_state_x_max);
+    Element_pos arrow_scale_y = _render_height/_state_y_max;
+
     Element_pos angle;
 
+
+    for (long i=0 ; i<(long)arrows.size() ; i++){
+        
+        
+        start_time = arrows[i].start_time*arrow_scale_x + _render_width*_x_scale_container_state-_state_translate; 
+        end_time = arrows[i].end_time*arrow_scale_x + _render_width*_x_scale_container_state-_state_translate; 
+        start_height = arrows[i].start_height*arrow_scale_y;
+        end_height = arrows[i].end_height*arrow_scale_y;
+
         /* DEBUG */
         // std::cerr << "Arrow draw: (" << start_time << ", " << start_height << ") to (" << end_time << ", " << end_height << ")" << std::endl;
 
@@ -492,13 +532,13 @@ inline void Render_area::draw_arrow(const Element_pos start_time, const Element_
    
     
 
-    // glBegin(GL_TRIANGLES);/* create an arrow */
-    /* {
+        glBegin(GL_TRIANGLES);/* create an arrow */
+        {
             glColor3d(1.0, 0.7, 0.7);glVertex2d(0.5, 0.0);
             glColor3d(0.9, 0.6, 0.6);glVertex2d(-0.5, -0.5);
             glColor3d(0.9, 0.6, 0.6);glVertex2d(-0.5, 0.5);
         }
-    glEnd();*/
+        glEnd();
     
         glPopMatrix();
 
@@ -508,18 +548,17 @@ inline void Render_area::draw_arrow(const Element_pos start_time, const Element_
         glLineWidth(2.5f);
         glBegin(GL_LINES);
         {
-        glColor3d(1.0, 0.7, 0.7);glVertex3d(start_time, start_height, _z_arrow);
-        glColor3d(0.9, 0.6, 0.6);glVertex3d(end_time, end_height, _z_arrow);
+            glColor3d(1.0, 0.7, 0.7);glVertex2d(start_time, start_height);
+            glColor3d(0.9, 0.6, 0.6);glVertex2d(end_time, end_height);
         }
         glEnd();
         glLineWidth(1.0f);/* 1 is the default value */
 
         glPopMatrix();
-
+    }
 }
 
 
-
 inline void Render_area::draw_event(const Element_pos time, const Element_pos height,  const Element_pos container_height){
 
     Event_ buf;