Commit c3fb2860 authored by Thibault Soucarre's avatar Thibault Soucarre
Browse files

Render.hpp renommé en GanttDiagram.hpp

parent 96ffbb82
...@@ -84,7 +84,7 @@ SET(VITE_HDRS ...@@ -84,7 +84,7 @@ SET(VITE_HDRS
trace/Trace.hpp trace/Trace.hpp
trace/IntervalOfContainer.hpp trace/IntervalOfContainer.hpp
# Render headers # Render headers
render/Render.hpp render/GanttDiagram.hpp
render/Geometry.hpp render/Geometry.hpp
render/Hook_event.hpp render/Hook_event.hpp
render/Minimap.hpp render/Minimap.hpp
...@@ -178,10 +178,10 @@ SET(VITE_SRCS ...@@ -178,10 +178,10 @@ SET(VITE_SRCS
trace/Variable.cpp trace/Variable.cpp
trace/VariableType.cpp trace/VariableType.cpp
# Render code files # Render code files
render/GanttDiagram.hpp
render/Geometry.cpp render/Geometry.cpp
render/Hook_event.cpp render/Hook_event.cpp
render/Minimap.cpp render/Minimap.cpp
render/Render.hpp
render/Render_opengl.cpp render/Render_opengl.cpp
render/Render_svg.cpp render/Render_svg.cpp
render/Ruler.cpp render/Ruler.cpp
......
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
#include "render/Geometry.hpp" #include "render/Geometry.hpp"
#include "render/Hook_event.hpp" #include "render/Hook_event.hpp"
#include "render/Ruler.hpp" #include "render/Ruler.hpp"
#include "render/Render.hpp" #include "render/GanttDiagram.hpp"
#include "render/Render_template.hpp" #include "render/Render_template.hpp"
#include "render/Render_svg.hpp" #include "render/Render_svg.hpp"
/* -- */ /* -- */
...@@ -751,7 +751,8 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -751,7 +751,8 @@ bool Core::draw_trace(const string & filename, const int format) {
if (_DRAW_OPENGL == format) { if (_DRAW_OPENGL == format) {
drawing_ogl.build(&_render_opengl, _trace); GanttDiagram<Render_opengl> render(_render_opengl);
drawing_ogl.build(&render, _trace);
_render_opengl->build(); _render_opengl->build();
// _render_opengl->updateGL(); // _render_opengl->updateGL();
_render_opengl->refresh_scroll_bars(); _render_opengl->refresh_scroll_bars();
...@@ -783,7 +784,7 @@ bool Core::draw_trace(const string & filename, const int format) { ...@@ -783,7 +784,7 @@ bool Core::draw_trace(const string & filename, const int format) {
Info::Entity::x_max = _time_end; Info::Entity::x_max = _time_end;
} }
cout << "Exporting trace to " << _path_to_export<<" ... Please Wait " << endl ; cout << "Exporting trace to " << _path_to_export<<" ... Please Wait " << endl ;
Render<Render_svg> render(_render_svg); GanttDiagram<Render_svg> render(_render_svg);
drawing_ogl.build(&render, _trace); drawing_ogl.build(&render, _trace);
delete _render_svg;/* Release the svg render */ delete _render_svg;/* Release the svg render */
......
...@@ -74,7 +74,7 @@ class QWaitCondition ; ...@@ -74,7 +74,7 @@ class QWaitCondition ;
#include <boost/mpi/environment.hpp> #include <boost/mpi/environment.hpp>
#include <boost/mpi/communicator.hpp> #include <boost/mpi/communicator.hpp>
#endif #endif
//#include "render/Render.hpp" //#include "render/GanttDiagram.hpp"
//#include "interface/Interface.hpp" //#include "interface/Interface.hpp"
/*! /*!
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
#include "common/common.hpp" #include "common/common.hpp"
#include "common/Info.hpp" #include "common/Info.hpp"
/* -- */ /* -- */
//#include "render/render.hpp" //#include "render/GanttDiagram.hpp"
#include <GL/glew.h> #include <GL/glew.h>
#include "render/Hook_event.hpp" #include "render/Hook_event.hpp"
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
#include "interface/resource.hpp" #include "interface/resource.hpp"
//#include "interface/interface.hpp" //#include "interface/interface.hpp"
#include "render/Render.hpp" #include "render/GanttDiagram.hpp"
#include "core/Core.hpp" #include "core/Core.hpp"
/* -- */ /* -- */
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
/* -- */ /* -- */
#include "render/Ruler.hpp" #include "render/Ruler.hpp"
#include "render/Render_opengl.hpp" #include "render/Render_opengl.hpp"
#include "render/Render.hpp" #include "render/GanttDiagram.hpp"
/* -- */ /* -- */
#include "core/Core.hpp" #include "core/Core.hpp"
......
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
#include "render/Render_template.hpp" #include "render/Render_template.hpp"
#include "render/Minimap.hpp" #include "render/Minimap.hpp"
#include "render/Ruler.hpp" #include "render/Ruler.hpp"
#include "render/Render.hpp" #include "render/GanttDiagram.hpp"
struct Container_text_; struct Container_text_;
/*template<typename T> /*template<typename T>
......
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