Add an internal layout to Catalogue for selecting tracks

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

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index b482251294ee21f9242c68f7dbb1b708cffc25b7..2ed49fb1a754bf8a2f1caf6e336896a78aafc7be 100644 (file)
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -50,8 +50,13 @@ private:
                float height;
        };
 
-       Designer   &designer;
-       Selection  *selection;
+public:
+       sigc::signal<void, const std::string &> signal_status;
+       sigc::signal<void, bool> signal_done;
+
+private:
+       Designer &designer;
+       Selection &selection;
        std::vector<MTrack> tracks;
        Marklin::Point center;
 
@@ -60,22 +65,17 @@ private:
        float wrap_rot;
 
        Marklin::Point gpointer;
-       int            pointer_y;
-       Mode           mode;
+       int pointer_y;
+       Mode mode;
        Marklin::Point move_origin;
-       float          angle;
-       float          rot_origin;
-       int            elev_origin;
+       float angle;
+       float rot_origin;
+       int elev_origin;
        std::set<Marklin::Track *> neighbors;
-       sigc::connection selection_changed_conn;
 
 public:
-       sigc::signal<void, const std::string &> signal_status;
-       sigc::signal<void, bool> signal_done;
-
-       Manipulator(Designer &);
+       Manipulator(Designer &, Selection &);
 
-       void set_selection(Selection *);
        void start_move();
        void start_rotate();
        void start_elevate();