X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=da6cb0e4b4ba76fd33bba808d119149e498e96f5;hb=f8a7788cee0261babfc4c804a58515aad6dfbc3d;hp=3aeb08c10c792f5a990e282da2f0110c66fb85dd;hpb=61da962442ae528bba9c66fa0c09427b53a4cbe0;p=r2c2.git

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 3aeb08c..da6cb0e 100644
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -21,8 +21,8 @@ Distributed under the GPL
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
 #include <msp/time/timestamp.h>
-#include "libmarklin/catalogue.h"
-#include "libmarklin/layout.h"
+#include "libr2c2/catalogue.h"
+#include "libr2c2/layout.h"
 #include "3d/layout.h"
 #include "3d/overlay.h"
 #include "3d/track.h"
@@ -42,25 +42,27 @@ 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;
+	std::vector<Toolbar *> toolbars;
 	Msp::GLtk::Label *lbl_status;
 
-	Marklin::Catalogue catalogue;
-	Marklin::Layout3D *cat_layout_3d;
+	R2C2::Catalogue catalogue;
+	R2C2::Layout3D *cat_layout_3d;
 	std::string filename;
-	Marklin::Layout *layout;
-	Marklin::Layout3D *layout_3d;
-	Marklin::Overlay3D *overlay;
+	R2C2::Layout *layout;
+	R2C2::Layout3D *layout_3d;
+	R2C2::Overlay3D *overlay;
 	Msp::GL::Object *base_object;
-	Marklin::Route *cur_route;
-	std::list<Marklin::Track *> new_tracks;
+	R2C2::Route *cur_route;
+	R2C2::Zone *cur_zone;
+	std::list<R2C2::Track *> new_tracks;
 	Msp::GL::Pipeline *pipeline;
 	Msp::GL::Camera camera;
 	Msp::GL::Lighting lighting;
@@ -70,7 +72,7 @@ private:
 	Selection selection;
 	Manipulator manipulator;
 	Measure measure;
-	CameraController *camera_ctl;
+	CameraController camera_ctl;
 	TrackWrap track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
@@ -85,23 +87,32 @@ public:
 	void save();
 	void quit();
 
-	const Marklin::Catalogue &get_catalogue() const { return catalogue; }
-	Marklin::Layout &get_layout() { return *layout; }
-	Marklin::Layout3D &get_layout_3d() { return *layout_3d; }
-	const Msp::GL::Camera &get_camera() const { return camera; }
+	const R2C2::Catalogue &get_catalogue() const { return catalogue; }
+	R2C2::Layout &get_layout() { return *layout; }
+	R2C2::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 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();
-
-	void edit_route(Marklin::Route *);
-	Marklin::Route *get_current_route() const { return cur_route; }
+	R2C2::Route *get_current_route() const { return cur_route; }
 	void add_selection_to_route();
 
-	Marklin::Point map_pointer_coords(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);
@@ -109,19 +120,23 @@ 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 track_added(R2C2::Track &);
+	void track_removed(R2C2::Track &);
+	R2C2::Track3D *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 Marklin::Route *);
+	void clear_paths();
+	void show_route(const R2C2::Route &);
+	void show_zone(const R2C2::Zone &);
 };
 
 #endif