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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index c4591ab..9fc2961 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"
@@ -30,8 +30,8 @@ Distributed under the GPL
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
+#include "trackwrap.h"
 
-class Input;
 class Toolbar;
 
 class Designer: public Msp::Application
@@ -42,26 +42,26 @@ private:
 		SELECT,
 		CATALOGUE,
 		MANIPULATE,
-		MEASURE,
-		INPUT
+		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_tooltip;
-	Msp::Time::TimeStamp tooltip_timeout;
+	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;
+	R2C2::Route *cur_route;
+	std::list<R2C2::Track *> new_tracks;
 	Msp::GL::Pipeline *pipeline;
 	Msp::GL::Camera camera;
 	Msp::GL::Lighting lighting;
@@ -71,12 +71,8 @@ private:
 	Selection selection;
 	Manipulator manipulator;
 	Measure measure;
-	Input *input;
 	CameraController camera_ctl;
-
-	bool shift;
-	int pointer_x;
-	int pointer_y;
+	TrackWrap track_wrap;
 
 	Msp::Time::TimeStamp last_tick;
 
@@ -90,37 +86,46 @@ 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 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; }
-	void edit_route(Marklin::Route &);
-	Marklin::Route *get_current_route() const { return cur_route; }
+	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(R2C2::Route *);
+	R2C2::Route *get_current_route() const { return cur_route; }
 	void add_selection_to_route();
 
-	Marklin::Point map_pointer_coords(int, int);
+	R2C2::Point map_pointer_to_ground(int, int);
 private:
 	void tick();
 	void key_press(unsigned, unsigned, wchar_t);
-	void key_release(unsigned, unsigned);
 	void button_press(int, int, unsigned, unsigned);
 	void pointer_motion(int, int);
 	void apply_camera();
 	void render();
-	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 set_tooltip(int, int, const std::string &);
-	void clear_tooltip();
-	void save_accept();
-	void turnout_id_accept();
-	void sensor_id_accept();
-	void input_dismiss();
-	void view_all();
+	void turnout_id_accept(const std::string &);
+	void sensor_id_accept(const std::string &);
+	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 *);
 };
 
 #endif