Move further stuff from the ArduControl main class into Task classes

[r2c2.git] / source / engineer / engineer.h

diff --git a/source/engineer/engineer.h b/source/engineer/engineer.h
index 612fe6671854854d70cb29affd0854b831e8bdb0..418c0cdf730d9f4cfcee5e1bbd48320f69d581b1 100644 (file)
--- a/source/engineer/engineer.h
+++ b/source/engineer/engineer.h
@@ -23,9 +23,6 @@ class TrainView;
 
 class Engineer: public Msp::RegisteredApplication<Engineer>
 {
-public:
-       sigc::signal<void, R2C2::Track *, int> signal_pick_done;
-
 private:
        Options options;
 
@@ -34,6 +31,7 @@ private:
        Msp::Input::Mouse mouse;
        Msp::GLtk::Resources ui_res;
        Msp::GLtk::Root *root;
+       Msp::GLtk::Arrangement *root_arrangement;
 
        R2C2::Catalogue catalogue;
        R2C2::Layout layout;
@@ -44,18 +42,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 +62,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: