Commit 465ec3e7 authored by Mathieu Faverge's avatar Mathieu Faverge

Now it compiles again

parent 6fa63868
......@@ -93,6 +93,10 @@ Session::Session() {
settings = new QSettings( VITE_ORGANISATION_DOMAIN,
VITE_APPLICATION_NAME );
_palette = get_palette("palette", get_current_palette("palette"));
_link_types = get_palette("link_types", get_current_palette("link_types"));
_event_types = get_palette("event_types", get_current_palette("event_types"));
}
Session::~Session() {
......
......@@ -86,8 +86,8 @@
#include "common/Tools.hpp"
#include "common/Session.hpp"
#include "common/Message.hpp"
#include "common/Palette.hpp"
/* -- */
#include "render/Palette.hpp"
#include "render/Geometry.hpp"
#include "render/Hook_event.hpp"
#include "render/Ruler.hpp"
......@@ -1053,9 +1053,6 @@ void Core::launch_action(int state, void* arg) {
if (_render_opengl->unbuild() == false)
message << "Close file : an error occured while cleaning the render." << Message::ende;
_render_opengl->release();
Session::_palette = NULL;
Session::_link_types = NULL;
Session::_event_types = NULL;
_render_opengl->updateGL();
}
break;
......
......@@ -59,9 +59,9 @@
#include "trace/Entitys.hpp"
#include "trace/Trace.hpp"
/* -- */
#include "render/Palette.hpp"
/* -- */
#include "common/Palette.hpp"
#include "common/Session.hpp"
/* -- */
#include "interface/Interface.hpp"
#include "core/Core.hpp"
#include "interface/Settings_window.hpp"
......
......@@ -448,8 +448,9 @@ public:
if(!Session::get_use_palette("link_types")) display = true;
else{
if (link->get_type()){
if(!Session::_link_types)Session::_link_types=Session::get_palette("link_types", Session::get_current_palette("link_types"));
color= Session::_link_types->get_color(link->get_type()->get_name().to_string());
Palette *lt = Session::get_palette("link_types", Session::get_current_palette("link_types"));
color = lt->get_color(link->get_type()->get_name().to_string());
if(color) display=true;
/*for(std::list<std::string>::const_iterator it2= link_types->get_->begin();
......
This diff is collapsed.
......@@ -54,8 +54,7 @@
/* -- */
#include "common/Message.hpp"
#include "common/Session.hpp"
/* -- */
#include "render/Palette.hpp"
#include "common/Palette.hpp"
/* -- */
#include "trace/values/Values.hpp"
#include "trace/tree/Interval.hpp"
......@@ -103,27 +102,6 @@ Trace::Trace(): _max_date(0.0) {
_filter = 0;
_interval_constrained = NULL;
_depth = 0;
#ifndef WITHOUT_QT
if(Session::get_use_palette("palette"))
Session::_palette = Session::get_palette("palette", Session::get_current_palette("palette"));
else
#endif
Session::_palette = NULL;
#ifndef WITHOUT_QT
if(Session::get_use_palette("link_types"))
Session::_link_types = Session::get_palette("link_types", Session::get_current_palette("link_types"));
else
#endif
Session::_link_types = NULL;
#ifndef WITHOUT_QT
if(Session::get_use_palette("event_types"))
Session::_event_types = Session::get_palette("event_types", Session::get_current_palette("event_types"));
else
#endif
Session::_event_types = NULL;
}
template <class 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