Move the fitting part of Manipulator::connect to a separate function

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 5cb0c7849fe834186b2dad44aea14dcb66790711..7ab3d1dc3a03cd3bad7a5fb7ee49875d50ecbbde 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -30,6 +30,7 @@ Distributed under the GPL
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
+#include "trackwrap.h"
 
 class Toolbar;
 
@@ -59,6 +60,7 @@ private:
        Marklin::Overlay3D *overlay;
        Msp::GL::Object *base_object;
        Marklin::Route *cur_route;
+       std::list<Marklin::Track *> new_tracks;
        Msp::GL::Pipeline *pipeline;
        Msp::GL::Camera camera;
        Msp::GL::Lighting lighting;
@@ -68,7 +70,8 @@ private:
        Selection selection;
        Manipulator manipulator;
        Measure measure;
-       CameraController camera_ctl;
+       CameraController *camera_ctl;
+       TrackWrap track_wrap;
 
        Msp::Time::TimeStamp last_tick;
 
@@ -82,8 +85,9 @@ public:
        void save();
        void quit();
 
-       Marklin::Layout *get_layout() { return layout; }
-       Marklin::Layout3D *get_layout_3d() { return layout_3d; }
+       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 Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
        Msp::GLtk::Root &get_root() const { return *root; }
@@ -105,8 +109,11 @@ private:
        void pointer_motion(int, int);
        void apply_camera();
        void render();
+       void track_added(Marklin::Track &);
+       void track_removed(Marklin::Track &);
        Marklin::Track3D *pick_track(int, int);
        void update_track_icon(Marklin::Track3D &);
+       void selection_changed();
        void manipulation_status(const std::string &);
        void manipulation_done(bool);
        void measure_changed();
@@ -114,7 +121,6 @@ private:
        void turnout_id_accept(const std::string &);
        void sensor_id_accept(const std::string &);
        void route_name_accept(const std::string &);
-       void view_all();
        std::string tooltip(int, int);
        void show_route(const Marklin::Route *);
 };