X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fengineer%2Fengineer.h;h=d821e0581127ad28c315b4d6e61f8c47b02c653d;hb=7ff47d1f59711542f4943aef02655d1bee51a8f6;hp=612fe6671854854d70cb29affd0854b831e8bdb0;hpb=5fa009f4af8d0a2e4f52929e1ee29f5c93986ab6;p=r2c2.git

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 612fe66..d821e05 100644
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -10,6 +10,7 @@
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
 #include "libr2c2/catalogue.h"
+#include "libr2c2/driver.h"
 #include "libr2c2/train.h"
 #include "3d/layout.h"
 #include "3d/overlay.h"
@@ -23,9 +24,6 @@ class TrainView;
 
 class Engineer: public Msp::RegisteredApplication<Engineer>
 {
-public:
-	sigc::signal<void, R2C2::Track *, int> signal_pick_done;
-
 private:
 	Options options;
 
@@ -34,6 +32,8 @@ private:
 	Msp::Input::Mouse mouse;
 	Msp::GLtk::Resources ui_res;
 	Msp::GLtk::Root *root;
+	Msp::GLtk::Arrangement *root_arrangement;
+	bool import_active;
 
 	R2C2::Catalogue catalogue;
 	R2C2::Layout layout;
@@ -44,18 +44,12 @@ private:
 	std::map<R2C2::Train *, Msp::GL::Color> train_colors;
 
 	R2C2::View3D main_view;
-	Msp::GL::Mesh arrow_mesh;
 
 	MainWindow *main_wnd;
 	std::list<R2C2::Train *> new_trains;
 	std::list<TrainView *> train_views;
 	Msp::Time::TimeStamp status_timeout;
-	bool picking;
-	R2C2::Track *picking_track;
-	int picking_entry;
-	R2C2::Path3D *picking_path;
 	R2C2::Vector pointer;
-	bool pointer_moved;
 
 public:
 	Engineer(int argc, char **argv);
@@ -70,7 +64,6 @@ public:
 	void set_status(const std::string &);
 	void add_train_view(TrainView &);
 	void remove_train_view(TrainView &);
-	void pick(bool);
 	int main();
 	void quit() { exit(0); }
 private:
@@ -81,6 +74,8 @@ private:
 	void sensor_event(unsigned, bool);
 	void block_reserved(const R2C2::Block &, const R2C2::Train *);
 	R2C2::Object *pick_object(const R2C2::Vector &);
+	void locomotive_detected(const R2C2::Driver::DetectedLocomotive &);
+	void import_finished(int);
 	void train_added(R2C2::Train &);
 	void process_new_train(R2C2::Train &);
 	virtual void sighandler(int);