X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=61a2f59e37730c53e88a87bccbfd26bda1ea6abc;hb=6ac4610e9a94f7415b8f01a653242b570057a02b;hp=5fa05871973e302872b589589df060b3c29680d3;hpb=651698847d5293cfb15b6fb23a394701388c0151;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 5fa0587..61a2f59 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -20,15 +20,19 @@ Distributed under the GPL
 #include "libmarklin/train.h"
 #include "3d/layout.h"
 #include "3d/overlay.h"
+#include "3d/path.h"
 #include "network/server.h"
 #include "options.h"
 
 class MainPanel;
 class TrainPanel;
-class TrainProperties;
+class TrainView;
 
 class Engineer: public Msp::Application
 {
+public:
+	sigc::signal<void, Marklin::Track *, int> signal_pick_done;
+
 private:
 	Options options;
 
@@ -42,7 +46,7 @@ private:
 	Marklin::Server *server;
 	Msp::IO::EventDispatcher event_disp;
 	Marklin::Overlay3D *overlay;
-	std::list<Marklin::Train *> new_trains;
+	std::map<Marklin::Train *, Msp::GL::Color> train_colors;
 
 	Msp::GL::Camera camera;
 	Msp::GL::Lighting lighting;
@@ -52,9 +56,15 @@ private:
 
 	MainPanel *main_panel;
 	std::list<TrainPanel *> train_panels;
-	Marklin::Train *placing_train;
-	Marklin::Block *placing_block;
-	unsigned placing_entry;
+	std::list<TrainView *> train_views;
+	Msp::Time::TimeStamp status_timeout;
+	bool picking;
+	Marklin::Track *picking_track;
+	int picking_entry;
+	Marklin::Path3D *picking_path;
+	int pointer_x;
+	int pointer_y;
+	bool pointer_moved;
 
 public:
 	Engineer(int argc, char **argv);
@@ -64,7 +74,13 @@ public:
 	Msp::GLtk::Root &get_root() const { return *root; }
 	const Marklin::Catalogue &get_catalogue() const { return catalogue; }
 	Marklin::Layout &get_layout() { return layout; }
-	void place_train(Marklin::Train &);
+	Marklin::Layout3D &get_layout_3d() { return layout_3d; }
+	const Msp::GL::Lighting &get_lighting() const { return lighting; }
+	void set_status(const std::string &);
+	void rearrange_panels();
+	void add_train_view(TrainView &);
+	void remove_train_view(TrainView &);
+	void pick(bool);
 	int main();
 	void quit() { exit(0); }
 private: