Skip to content

GitLab

vite
vite
Commit c54063c7 authored by Thibault Soucarre's avatar Thibault Soucarre
Browse files
Options

supression du template dans la classe GanttDiagram, supression du fichier Render_template

parent c5e0e40f
Hide whitespace changes
Inline Side-by-side
Showing with 59 additions and 183 deletions
src/core/Core.cpp
View file @ c54063c7
......@@ -751,7 +751,7 @@ bool Core::draw_trace(const string & filename, const int format) {
if (_DRAW_OPENGL == format) {
GanttDiagram<Render_opengl> render(_render_opengl);
GanttDiagram render(_render_opengl);
drawing_ogl.build(&render, _trace);
_render_opengl->build();
// _render_opengl->updateGL();
......@@ -784,7 +784,7 @@ bool Core::draw_trace(const string & filename, const int format) {
Info::Entity::x_max = _time_end;
}
cout << "Exporting trace to " << _path_to_export<<" ... Please Wait " << endl ;
GanttDiagram<Render_svg> render(_render_svg);
GanttDiagram render(_render_svg);
drawing_ogl.build(&render, _trace);
delete _render_svg;/* Release the svg render */
......
src/render/Render.hpp
View file @ c54063c7
......@@ -150,8 +150,8 @@ public:
* \param size the edge size.
* \param r the rotation of triangle. (clockwise and in degree)
*/
void draw_triangle(Element_pos x, Element_pos y,
Element_pos size, Element_pos r);
virtual void draw_triangle(Element_pos x, Element_pos y,
Element_pos size, Element_pos r) = 0;
/*!
* \brief Draw a line.
......@@ -172,8 +172,63 @@ public:
*/
virtual void draw_circle(Element_pos x, Element_pos y, Element_pos z, Element_pos r) = 0;
/*!
* \brief Draw an arrow.
* \param start_time the beginning time of the arrow.
* \param end_time the ending time of the arrow.
* \param start_height vertical position of the begining time of the arrow.
* \param end_height vertical position of the ending time of the arrow.
*
* This function stores all the information of the arrow to display it each time the render area need to be updated.
*/
virtual void draw_arrow(const Element_pos start_time,
const Element_pos end_time,
const Element_pos start_height,
const Element_pos end_height,
const Element_col red,
const Element_col green,
const Element_col blue) = 0;
/*!
\brief initialization for events draws
*/
virtual void start_draw_events() = 0;
/*!
* \brief Draw an event.
* \param time time when the event occurs.
* \param height vertical position of the event.
* \param container_height information to draw event. It corresponds to the container height when they are drawn horizontally.
*
*
* \brief Creates and opens the display list for container draws.
*
* This function stores all the information of the event to display it each time the render area need to be updated.
*/
virtual void draw_event(const Element_pos time,
const Element_pos height,
const Element_pos container_height) = 0;
/*!
\brief ending operations for events draws
*/
virtual void end_draw_events() = 0;
/*!
* \brief Draw a text with the value of a variable
* \param text text to draw.
* \param y y position of the point.
*/
virtual void draw_text_value(long int id,double text, double y) = 0;
};
#endif
src/render/Render_template.hpp deleted 100644 → 0
View file @ c5e0e40f
/*
** This file is part of the ViTE project.
**
** This software is governed by the CeCILL-A license under French law
** and abiding by the rules of distribution of free software. You can
** use, modify and/or redistribute the software under the terms of the
** CeCILL-A license as circulated by CEA, CNRS and INRIA at the following
** URL: "http://www.cecill.info".
**
** As a counterpart to the access to the source code and rights to copy,
** modify and redistribute granted by the license, users are provided
** only with a limited warranty and the software's author, the holder of
** the economic rights, and the successive licensors have only limited
** liability.
**
** In this respect, the user's attention is drawn to the risks associated
** with loading, using, modifying and/or developing or reproducing the
** software by the user in light of its specific status of free software,
** that may mean that it is complicated to manipulate, and that also
** therefore means that it is reserved for developers and experienced
** professionals having in-depth computer knowledge. Users are therefore
** encouraged to load and test the software's suitability as regards
** their requirements in conditions enabling the security of their
** systems and/or data to be ensured and, more generally, to use and
** operate it in the same conditions as regards security.
**
** The fact that you are presently reading this means that you have had
** knowledge of the CeCILL-A license and that you accept its terms.
**
**
** ViTE developers are (for version 0.* to 1.0):
**
** - COULOMB Kevin
** - FAVERGE Mathieu
** - JAZEIX Johnny
** - LAGRASSE Olivier
** - MARCOUEILLE Jule
** - NOISETTE Pascal
** - REDONDY Arthur
** - VUCHENER Clément
**
*/
/*!
*\file Render_template.hpp
*/
#ifndef RENDER_TEMPLATE_HPP
#define RENDER_TEMPLATE_HPP
/*!
* \brief This class provides an interface for render classes like OpenGL or SVG.
*/
class Render_template
{
public:
/*!
* \brief Proceeds with the initialization of draw functions.
*/
virtual void start_draw() = 0;
/*!
* \brief Proceeds with the initialization of container draw functions.
*/
virtual void start_draw_containers() = 0;
/*!
* \brief Called when all container draws are finished.
*/
virtual void end_draw_containers() = 0;
/*!
* \brief Proceeds with the initialization of state draw functions.
*/
virtual void start_draw_states() = 0;
/*!
* \brief Called when all state draws are finished.
*/
virtual void end_draw_states() = 0;
/*!
* \brief Proceeds with the initialization of arrow draw functions.
*/
virtual void start_draw_arrows() = 0;
/*!
* \brief Called when all arrow draws are finished.
*/
virtual void end_draw_arrows() = 0;
/*!
* \brief Proceeds with the initialization of counter draw functions.
*/
virtual void start_draw_counter() = 0;
/*!
* \brief Called when all counter draws are finished.
*/
virtual void end_draw_counter() = 0;
/*!
* \brief Called before ruler drawing.
*/
virtual void start_ruler() = 0;
/*!
* \brief Called after ruler drawing.
*/
virtual void end_ruler() = 0;
/*!
* \brief Called when all draws are finished.
*/
virtual void end_draw() = 0;
/*!
* \brief Set the color for the further drawings.
* \param r the red value. Within [0 ; 1].
* \param g the green value. Within [0 ; 1].
* \param b the blue value. Within [0 ; 1].
*/
virtual void set_color(float r, float g, float b) = 0;
/*!
* \brief Draw a text.
* \param x the horizontal position of the left bottom corner of the text.
* \param y the vertical position of the left bottom corner of the text.
* \param z the deep position of the text.
* \param s the text.
*/
virtual void draw_text(const Element_pos x, const Element_pos y, const Element_pos z, const std::string s) = 0;
/*!
* \brief Draw a quad.
* \param x the horizontal position of the left bottom corner of the quad.
* \param y the vertical position of the left bottom corner of the quad.
* \param z the deep position of the quad.
* \param w the width of the quad.
* \param h the height of the quad.
*/
virtual void draw_quad(Element_pos x, Element_pos y, Element_pos z, Element_pos w, Element_pos h) = 0;
/*!
* \brief Draw a triangle.
* \param x the horizontal position of the triangle center.
* \param y the vertical position of the triangle center.
* \param size the edge size.
* \param r the rotation of triangle. (clockwise and in degree)
*/
void draw_triangle(Element_pos x, Element_pos y,
Element_pos size, Element_pos r);
/*!
* \brief Draw a line.
* \param x1 the horizontal position of the first point.
* \param y1 the vertical position of the firt point.
* \param x2 the horizontal position of the second point.
* \param y2 the vertical position of the second point.
* \param z the deep position of the triangle.
*/
virtual void draw_line(Element_pos x1, Element_pos y1, Element_pos x2, Element_pos y2, Element_pos z) = 0;
/*!
* \brief Draw a circle.
* \param x the horizontal position of the circle center.
* \param y the vertical position of the circle center.
* \param z the deep position of the circle.
* \param r the circle radius.
*/
virtual void draw_circle(Element_pos x, Element_pos y, Element_pos z, Element_pos r) = 0;
};
#endif
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