Commit 9fb51a9d authored by Kevin Coulomb's avatar Kevin Coulomb

Correction pour les etats non affichachées si gris, et un peu de doc

supplémentaire
parent 7957fe85
......@@ -3,7 +3,7 @@
Container::Container(Name name, Date creation_time, ContainerType *type, Container *parent):
_name(name), _creation_time(creation_time), _destruction_time(0.0), _type(type), _parent(parent),
_n_variables(0), _event_tree(0), _state_tree(0), _n_events(0), _n_states(0) {
_n_states(0), _state_tree(0), _n_events(0), _event_tree(0), _n_variables(0) {
}
template <class T>
......
......@@ -25,9 +25,19 @@ class DrawTrace
protected:
// Interface_graphic* _window;
std::list<const Container *> _entity_containers; // Containers with states or events
std::list<const Container *> _link_containers; // Containers with links
std::list<const Container *> _variable_containers; // Containers with variables
/*!
* \brief Containers with states or events
*/
std::list<const Container *> _entity_containers;
/*!
* \brief Containers with links
*/
std::list<const Container *> _link_containers;
/*!
* \brief Containers with variables
*/
std::list<const Container *> _variable_containers;
std::map<const Container *, Element_pos, std::less<const Container *> > _container_positions;
/*!
......@@ -140,6 +150,10 @@ public:
*
**********************************/
/*
* \fn browse_container_tree(T* draw_object, Trace* trace)
* \brief Function that browses the containers of the trace argument and make them painted with a T object
*/
inline void browse_container_tree(T* draw_object, Trace* trace){
/*** Drawing containers ***/
int position = 0;
......@@ -156,6 +170,11 @@ public:
}/* end browse_container_tree */
/*
* \fn browse_container(T* draw_object, const Container *container, int position, int depth)
* \brief Recursive function that browse a container to draw it with a T painting object in position, knowing the current depth in the tree
*/
int browse_container(T* draw_object, const Container *container, int position, int depth) {
int size = 0;
......@@ -311,32 +330,7 @@ public:
draw_object->end_draw_counter();
}
/*!
* \brief Draw a state
* \param draw_object Object that contains the drawing methods
* \param starttime Time when the state begins
* \param endtime Time when the state ends
* \param position Line where the state is drawn
* \param r Red value of the state color
* \param g Green value of the state color
* \param b Blue value of the state color
*/
/* inline void draw_state(T *draw_object, double starttime, double endtime, int position, double r, double g, double b) {
Element_pos y = position*(_container_height+_container_v_space) + _container_v_space/2;
draw_object->draw_state(starttime, endtime, y, _state_height, r, g, b);
}*/
/*!
* \brief Draw an event
* \param draw_object Object that contains the drawing methods
* \param time Time of the event
* \param position Line where the event is drawn
*/
/*inline void draw_event(T *draw_object, double time, int position) {
Element_pos y = position*(_container_height+_container_v_space) + _container_v_space/2;
draw_object->draw_event(time, y, _state_height);
}*/
/*!
* \brief Draw a point of a variable curve
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment