X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=e103a749a4f41a2d4c0bd286f1975dee00c9b7bb;hb=f42183985c65e1e12f19e9246dee90b8e7e44a34;hp=8dbc9d44d03298b94a8c69384b4cb7299cf0828a;hpb=449fb5de95ddb2ac9da4bd72a1c12150505d5549;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 8dbc9d4..e103a74 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -15,6 +15,9 @@ Distributed under the GPL
 #include <msp/gbase/glcontext.h>
 #include <msp/gl/font.h>
 #include <msp/gl/mesh.h>
+#include <msp/gltk/label.h>
+#include <msp/gltk/resources.h>
+#include <msp/gltk/root.h>
 #include <msp/time/timestamp.h>
 #include "libmarklin/catalogue.h"
 #include "libmarklin/layout.h"
@@ -25,6 +28,7 @@ class Input;
 class Manipulator;
 class Measure;
 class Selection;
+class Toolbar;
 
 class Designer: public Msp::Application
 {
@@ -43,14 +47,21 @@ private:
 	Msp::Graphics::GLContext *glc;
 	unsigned screen_w;
 	unsigned screen_h;
-	Msp::GL::Font *font;
+	Msp::GLtk::Resources ui_res;
+	Msp::GLtk::Root *root;
+
+	Toolbar *toolbar;
+	Msp::GLtk::Label *lbl_tooltip;
+	Msp::Time::TimeStamp tooltip_timeout;
 
 	Marklin::Catalogue catalogue;
-	Marklin::Layout *layout;
-	Marklin::Layout3D *layout_3d;
 	Marklin::Layout *cat_layout;
 	Marklin::Layout3D *cat_layout_3d;
+	std::string filename;
+	Marklin::Layout *layout;
+	Marklin::Layout3D *layout_3d;
 	Msp::GL::Mesh *base_mesh;
+	Marklin::Route *cur_route;
 
 	Mode mode;
 	Selection *selection;
@@ -71,11 +82,6 @@ private:
 	int pointer_x;
 	int pointer_y;
 
-	int tooltip_x;
-	int tooltip_y;
-	std::string tooltip;
-	Msp::Time::TimeStamp tooltip_timeout;
-
 	Msp::Time::TimeStamp last_tick;
 
 	static Msp::Application::RegApp<Designer> reg;
@@ -84,10 +90,18 @@ public:
 	Designer(int, char **);
 	~Designer();
 
+	int main();
+	void save();
+	void quit();
+
 	Marklin::Layout *get_layout() { return layout; }
 	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
-	Msp::GL::Font &get_font() { return *font; }
-	int main();
+	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
+	Msp::GLtk::Root &get_root() const { return *root; }
+	void edit_route(Marklin::Route &);
+	Marklin::Route *get_current_route() const { return cur_route; }
+	void add_selection_to_route();
+
 	void map_pointer_coords(int, int, float &, float &);
 private:
 	void tick();
@@ -99,11 +113,13 @@ private:
 	void apply_camera();
 	void render();
 	Marklin::Track3D *pick_track(int, int);
+	void update_track_color(Marklin::Track3D &);
 	void manipulation_status(const std::string &);
 	void manipulation_done(bool);
 	void measure_changed();
 	void measure_done();
-	void move_tooltip(int, int);
+	void set_tooltip(int, int, const std::string &);
+	void clear_tooltip();
 	void save_accept();
 	void turnout_id_accept();
 	void sensor_id_accept();