fusionned draw_container and draw_container_text

src/render/GanttDiagram.hpp

@@ -155,7 +155,7 @@ public:
      * \param w the width of the container
      * \param h the height of the container
      */
-    inline void draw_container(const Element_pos x, const Element_pos y, const Element_pos w, const Element_pos h){
+    inline void draw_container(const Element_pos x, const Element_pos y, const Element_pos w, const Element_pos h, const std::string &value){
 
         Container_ buf;
 
@@ -166,6 +166,13 @@ public:
 
         _containers.push_back(buf);
 
+        Container_text_ buft;
+        buft.x     = x;
+        buft.y     = y + h/2;
+        buft.value = value;
+
+        _container_texts.push_back(buft);
+
         if ((x+w)>Info::Container::x_max)
             Info::Container::x_max = x+w;
 
@@ -197,12 +204,12 @@ public:
      */
     inline void draw_container_text(const Element_pos x, const Element_pos y, const std::string value){
 
-        Container_text_ buf;
+        /*Container_text_ buf;
         buf.x     = x;
         buf.y     = y;
         buf.value = value;
 
-        _container_texts.push_back(buf);
+         _container_texts.push_back(buf);*/
     }
 
     /*!
@@ -534,13 +541,13 @@ public:
         }
 
 
-     
+
 
 
         // position += browse_container(draw_object, *i, position, 0,container);
 
 
-     
+
 
 
 

src/trace/DrawTrace.hpp

@@ -369,8 +369,8 @@ public:
         //Element_pos x      = depth   *(_container_width +_container_h_space) + _container_h_space/2;
         //Element_pos y      = position*(_container_height+_container_v_space) + _container_v_space/2;
         //Element_pos height = size    *(_container_height+_container_v_space) - _container_v_space;
-        draw_object->draw_container(x, y+_container_v_space/2, w, h);
-        draw_object->draw_container_text(x, y+h/2, text);
+        draw_object->draw_container(x, y+_container_v_space/2, w, h, text);
+        //draw_object->draw_container_text(x, y+h/2, text);
     }
 
     /*!

src/trace/values/Color.hpp

-whites/*
+/*
 ** This file is part of the ViTE project.
 **
 ** This software is governed by the CeCILL-A license under French law