X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=d229324fb8ccc23a7d65a85d2b2a3937268984f1;hb=bd649cbc44e04f5e456ca19b7a32ebe479c130e1;hp=d2cc5d212def4b2c520969b0e32ae0d0aef4c8ed;hpb=17c219cff8f859978ec1274786319478cc99450c;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index d2cc5d2..d229324 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -30,6 +30,7 @@ Distributed under the GPL
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
+#include "trackwrap.h"
 
 class Toolbar;
 
@@ -59,6 +60,7 @@ private:
 	Marklin::Overlay3D *overlay;
 	Msp::GL::Object *base_object;
 	Marklin::Route *cur_route;
+	std::list<Marklin::Track *> new_tracks;
 	Msp::GL::Pipeline *pipeline;
 	Msp::GL::Camera camera;
 	Msp::GL::Lighting lighting;
@@ -69,6 +71,7 @@ private:
 	Manipulator manipulator;
 	Measure measure;
 	CameraController camera_ctl;
+	TrackWrap track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
 
@@ -91,8 +94,9 @@ public:
 	void new_track();
 	void set_turnout_id();
 	void set_sensor_id();
+	void rename_route();
 
-	void edit_route(Marklin::Route &);
+	void edit_route(Marklin::Route *);
 	Marklin::Route *get_current_route() const { return cur_route; }
 	void add_selection_to_route();
 
@@ -104,16 +108,20 @@ private:
 	void pointer_motion(int, int);
 	void apply_camera();
 	void render();
+	void track_added(Marklin::Track &);
 	Marklin::Track3D *pick_track(int, int);
 	void update_track_icon(Marklin::Track3D &);
+	void selection_changed();
 	void manipulation_status(const std::string &);
 	void manipulation_done(bool);
 	void measure_changed();
 	void measure_done();
 	void turnout_id_accept(const std::string &);
 	void sensor_id_accept(const std::string &);
+	void route_name_accept(const std::string &);
 	void view_all();
 	std::string tooltip(int, int);
+	void show_route(const Marklin::Route *);
 };
 
 #endif