X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=c82a2541574506d00427376831da949daa487bb5;hb=6ba6af3637c299ab00828c49de9151429488cc17;hp=a43906043da391e681622a11d98b26b7b9fa9240;hpb=e9653dffd0026fb3c02c91a4c0feca688a86c721;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index a439060..c82a254 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;
 
@@ -46,7 +47,7 @@ private:
 
 	Msp::Graphics::SimpleGLWindow window;
 	Msp::GLtk::Resources ui_res;
-	Msp::GLtk::Root *root;
+	Msp::GLtk::Root root;
 
 	Toolbar *toolbar;
 	Msp::GLtk::Label *lbl_status;
@@ -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;
 
@@ -82,22 +85,24 @@ public:
 	void save();
 	void quit();
 
-	Marklin::Layout *get_layout() { return layout; }
-	Marklin::Layout3D *get_layout_3d() { return layout_3d; }
-	const Msp::GL::Camera &get_camera() const { return camera; }
+	const Marklin::Catalogue &get_catalogue() const { return catalogue; }
+	Marklin::Layout &get_layout() { return *layout; }
+	Marklin::Layout3D &get_layout_3d() { return *layout_3d; }
+	const CameraController &get_camera_controller() const { return camera_ctl; }
 	const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
-	Msp::GLtk::Root &get_root() const { return *root; }
+	Msp::GLtk::Root &get_root() { return root; }
 
 	void new_track();
 	void set_turnout_id();
 	void set_sensor_id();
 	void rename_route();
+	void svg_export();
 
 	void edit_route(Marklin::Route *);
 	Marklin::Route *get_current_route() const { return cur_route; }
 	void add_selection_to_route();
 
-	Marklin::Point map_pointer_coords(int, int);
+	Marklin::Point map_pointer_to_ground(int, int);
 private:
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
@@ -105,6 +110,8 @@ private:
 	void pointer_motion(int, int);
 	void apply_camera();
 	void render();
+	void track_added(Marklin::Track &);
+	void track_removed(Marklin::Track &);
 	Marklin::Track3D *pick_track(int, int);
 	void update_track_icon(Marklin::Track3D &);
 	void selection_changed();
@@ -115,7 +122,7 @@ private:
 	void turnout_id_accept(const std::string &);
 	void sensor_id_accept(const std::string &);
 	void route_name_accept(const std::string &);
-	void view_all();
+	void svg_export_accept(const std::string &);
 	std::string tooltip(int, int);
 	void show_route(const Marklin::Route *);
 };