Commit 11dd25e9 authored by Kevin Coulomb's avatar Kevin Coulomb
Browse files

Modifications for the otf, 2 methods to draw messages added

parent ff3bcccf
......@@ -225,6 +225,10 @@ public:
Interval * interval = trace->get_interval_constrained();
std::vector<Container *> *container = trace->get_selected_container();
for(int i = 0 ; (*container)[i]!=NULL ; i++)
std::cout << " Conteur : " << i << std::endl;
draw_object->start_draw();
draw_object->start_draw_containers();
......@@ -279,7 +283,7 @@ public:
i++)
// Use the fact a container is selected implies all his ancestors are
if(is_in_set(*i,container))
position += browse_container(draw_object, *i, position, 0);
position += browse_container_partial(draw_object, *i, position, 0,container);
}/* end browse_container_tree_partial */
/*
......@@ -342,8 +346,8 @@ public:
for (list<Container *>::const_iterator i = children->begin();
i != children->end();
i++) {
if(is_in_set(i,set_container))
size += browse_container(draw_object, (*i), position+size, depth+1);
if(is_in_set(*i,set_container))
size += browse_container_partial(draw_object, (*i), position+size, depth+1,set_container);
}
// Store the position to draw links
......@@ -539,8 +543,6 @@ public:
.draw_tree(event_tree, *interval);
}
}
}/* end for (!_stack_states.empty()) */
draw_object->end_draw_states();
......@@ -567,11 +569,9 @@ public:
}
}/* end for */
}//end for
}/* end while (!_stack_states.empty()) */
draw_object->end_draw_arrows();
draw_object->start_draw_counter();
for (list<const Container *>::const_iterator c = _entity_containers.begin();
......@@ -606,7 +606,6 @@ public:
}
}//end for
draw_object->end_draw_counter();
}
......@@ -920,19 +919,24 @@ public:
////////TODO
bool link_is_in_set(Link * link, std::vector<Container *> *set_container ){
link++;
set_container ++;
return true;
const Container * src = link->get_source();
const Container * dest = link->get_destination();
for(int i = 0 ; (*set_container)[i]!=NULL ; i++){
if(src == (*set_container)[i]){
for(int j = 0 ; (*set_container)[j]!=NULL ; j++)
if(dest == (*set_container)[j])
return true;
}
}
return false;
}
/////TODO
bool is_in_set(const Container * c,std::vector<Container *>*set_container){
c++;
set_container ++;
return true;
for(int i = 0 ; (*set_container)[i]!=NULL ; i++ )
if(c==(*set_container)[i])
return true;
return false;
}
};
......
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