Commit 3469678e authored by Olivier Lagrasse's avatar Olivier Lagrasse
Browse files

mise aux normes

parent aa018e70
......@@ -164,7 +164,7 @@ void Interface_graphic::opening_file(string const &path){
_is_rendering_trace = true;
_ui_render_area->update();
_ui_render_area->updateGL();
}
......
......@@ -316,7 +316,7 @@ class Render_area : public QGLWidget
* \param y the y position of the text.
* \param value the string value of the text.
*/
inline void draw_container_text(const Element_pos x, const Element_pos y, const string value);
inline void draw_container_text(const Element_pos x, const Element_pos y, const std::string value);
inline void end_draw_containers();
......
......@@ -9,8 +9,6 @@
using namespace std;
/*!
* \brief
......@@ -22,38 +20,38 @@ class DrawTrace
protected:
// Interface_graphic* _window;
stack<EntityList *> _stack_states;
std::stack<EntityList *> _stack_states;
/*!
* \brief The default height for containers.
*/
static const float DRAWING_CONTAINER_HEIGHT_DEFAULT = 1.2f;
static const float _DRAWING_CONTAINER_HEIGHT_DEFAULT = 1.2f;
/*!
* \brief The default width for containers.
*/
static const float DRAWING_CONTAINER_WIDTH_DEFAULT = 2.5f;
static const float _DRAWING_CONTAINER_WIDTH_DEFAULT = 2.5f;
/*!
* \brief The default horizontal space between containers.
*/
static const float DRAWING_CONTAINER_H_SPACE_DEFAULT = 0.1f;
static const float _DRAWING_CONTAINER_H_SPACE_DEFAULT = 0.1f;
/*!
* \brief The default vertical space between containers.
*/
static const float DRAWING_CONTAINER_V_SPACE_DEFAULT = 0.2f;
static const float _DRAWING_CONTAINER_V_SPACE_DEFAULT = 0.2f;
/*!
* \brief The default height for states.
*/
static const float DRAWING_STATE_HEIGHT_DEFAULT = 1.2f;
static const float _DRAWING_STATE_HEIGHT_DEFAULT = 1.2f;
/*!
* \brief The default vertical space between states.
*/
static const float DRAWING_STATE_V_SPACE_DEFAULT = 0.2f;
static const float _DRAWING_STATE_V_SPACE_DEFAULT = 0.2f;
/*!
......@@ -86,13 +84,13 @@ public:
DrawTrace(){
// _window = NULL;
_container_width = DRAWING_CONTAINER_WIDTH_DEFAULT;
_container_height = DRAWING_CONTAINER_HEIGHT_DEFAULT;
_container_h_space = DRAWING_CONTAINER_H_SPACE_DEFAULT;
_container_v_space = DRAWING_CONTAINER_V_SPACE_DEFAULT;
_container_width = _DRAWING_CONTAINER_WIDTH_DEFAULT;
_container_height = _DRAWING_CONTAINER_HEIGHT_DEFAULT;
_container_h_space = _DRAWING_CONTAINER_H_SPACE_DEFAULT;
_container_v_space = _DRAWING_CONTAINER_V_SPACE_DEFAULT;
_state_height = DRAWING_STATE_HEIGHT_DEFAULT;
_state_v_space = DRAWING_STATE_V_SPACE_DEFAULT;
_state_height = _DRAWING_STATE_HEIGHT_DEFAULT;
_state_v_space = _DRAWING_STATE_V_SPACE_DEFAULT;
}
......@@ -164,16 +162,16 @@ public:
* vertically, else horizontally.
*/
stack<Element_count> position_stack;
stack<Element_pos> height_stack;
std::stack<Element_count> position_stack;
std::stack<Element_pos> height_stack;
Element_pos x;
Element_pos y;
Element_pos y_buf;/* buffer for the y position */
Element_pos height_buf;/* buffer for the container height */
const Container* container;
const list<Container *> *trace_container = _trace->get_root_containers();
const std::list<Container *> *trace_container = _trace->get_root_containers();
list<Container *>::iterator it;
std::list<Container *>::iterator it;
bool isAnotherContainer = true;/* use to stop the loop */
......@@ -389,7 +387,7 @@ public:
}
inline Element_count return_last_visited_child(stack<Element_count> const &s){
inline Element_count return_last_visited_child(std::stack<Element_count> const &s){
if (s.empty()==true){
// _window->error("The render area position stack is empty.");
return -1;
......@@ -399,8 +397,8 @@ public:
}
inline Container* get_container(const list <Container*>* list_container, const int pos) const{
list<Container *>::const_reverse_iterator it;
inline Container* get_container(const std::list<Container*>* list_container, const int pos) const{
std::list<Container *>::const_reverse_iterator it;
int i=0;
for (it=list_container->rbegin() ; i<pos; it++, i++ ){ }
......
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