X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=49d4283da2bbf9f026362c875f10239b35d8dd05;hb=d18d5c1c3cf417e20840238eec4f3caa431fa2b5;hp=9fc2961ddd01ba7ba08da0858e16584100509e5d;hpb=1ff06c5bc46a677fa389ef86c6b26664368f1653;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 9fc2961..49d4283 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,7 +1,7 @@
 /* $Id$
 
 This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2011 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
@@ -50,7 +50,7 @@ private:
 	Msp::GLtk::Resources ui_res;
 	Msp::GLtk::Root root;
 
-	Toolbar *toolbar;
+	std::vector<Toolbar *> toolbars;
 	Msp::GLtk::Label *lbl_status;
 
 	R2C2::Catalogue catalogue;
@@ -61,6 +61,7 @@ private:
 	R2C2::Overlay3D *overlay;
 	Msp::GL::Object *base_object;
 	R2C2::Route *cur_route;
+	R2C2::Zone *cur_zone;
 	std::list<R2C2::Track *> new_tracks;
 	Msp::GL::Pipeline *pipeline;
 	Msp::GL::Camera camera;
@@ -94,16 +95,24 @@ public:
 	Msp::GLtk::Root &get_root() { return root; }
 
 	void new_track();
-	void set_turnout_id();
-	void set_sensor_id();
-	void rename_route();
+	void erase_tracks();
+	void track_properties();
+	void extend_track();
+	void connect_tracks();
+	void flatten_tracks();
 	void svg_export();
 
 	void edit_route(R2C2::Route *);
+	void rename_route();
 	R2C2::Route *get_current_route() const { return cur_route; }
 	void add_selection_to_route();
 
-	R2C2::Point map_pointer_to_ground(int, int);
+	void edit_zone(R2C2::Zone *);
+	void zone_properties();
+	R2C2::Zone *get_current_zone() const { return cur_zone; }
+	void add_selection_to_zone();
+
+	R2C2::Vector map_pointer_to_ground(int, int);
 private:
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
@@ -113,19 +122,21 @@ private:
 	void render();
 	void track_added(R2C2::Track &);
 	void track_removed(R2C2::Track &);
-	R2C2::Track3D *pick_track(int, int);
+	R2C2::Track *pick_track(int, int);
 	void update_track_icon(R2C2::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 arrange_toolbars();
+	void track_properties_response(int);
 	void route_name_accept(const std::string &);
 	void svg_export_accept(const std::string &);
 	std::string tooltip(int, int);
-	void show_route(const R2C2::Route *);
+	void clear_paths();
+	void show_route(const R2C2::Route &);
+	void show_zone(const R2C2::Zone &);
 };
 
 #endif