X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=c173668408a36d1300f8c725a75a9dec18a06a91;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=e9ba62ae06ffbd4e25a598ca385a38a5d1a31dd2;hpb=897f9bae5f647bae43e9786796eb9ea18325ec17;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index e9ba62a..c173668 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -42,12 +42,13 @@ private:
 		SELECT,
 		CATALOGUE,
 		MANIPULATE,
+		MANIPULATE_DONE,
 		MEASURE
 	};
 
 	Msp::Graphics::SimpleGLWindow window;
 	Msp::GLtk::Resources ui_res;
-	Msp::GLtk::Root *root;
+	Msp::GLtk::Root root;
 
 	Toolbar *toolbar;
 	Msp::GLtk::Label *lbl_status;
@@ -60,6 +61,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;
@@ -84,22 +86,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);
@@ -107,6 +111,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();
@@ -117,7 +123,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 *);
 };