Add a feature to autofit straight runs of track

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

diff --git a/source/designer/manipulator.h b/source/designer/manipulator.h
index 3a8882e8f97f686405651774aa478c7b1289a237..8115ab4abd8dd7e8e3b1d6429a249737b2efbf09 100644 (file)
--- a/source/designer/manipulator.h
+++ b/source/designer/manipulator.h
@@ -1,30 +1,20 @@
+/* $Id$
+
+This file is part of the MSP Märklin suite
+Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Distributed under the GPL
+*/
+
 #ifndef MANIPULATOR_H_
 #define MANIPULATOR_H_
 
 #include <sigc++/sigc++.h>
-#include "3d/track.h"
 
 class Designer;
 class Selection;
 
 class Manipulator
 {
-public:
-       sigc::signal<void, const std::string &> signal_status;
-       sigc::signal<void, bool> signal_done;
-
-       Manipulator(Designer &);
-       void set_selection(Selection *);
-       void start_move();
-       void start_rotate();
-       void start_elevate();
-       void duplicate();
-       void flatten();
-       void even_slope(bool =false);
-       void cancel();
-       void button_press(int, int, float, float, unsigned);
-       void pointer_motion(int, int, float, float);
-       void render();
 private:
        enum Mode
        {
@@ -42,7 +32,6 @@ private:
 
                MTrack(Marklin::Track *);
        };
-       typedef std::list<MTrack> MTrackSeq;
 
        struct TrackOrder
        {
@@ -51,37 +40,42 @@ private:
 
                TrackOrder(Marklin::Track *t, bool r): track(t), rev(r) { }
        };
-       typedef std::list<TrackOrder> TrackOrderSeq;
 
-       struct TrackWrap
-       {
-               Marklin::Point pos;
-               float rot;
-               float width;
-               float height;
-       };
+public:
+       sigc::signal<void, const std::string &> signal_status;
+       sigc::signal<void, bool> signal_done;
 
-       Designer   &designer;
-       Selection  *selection;
-       MTrackSeq  tracks;
+private:
+       Designer &designer;
+       Selection &selection;
+       std::vector<MTrack> tracks;
        Marklin::Point center;
 
-       std::list<TrackWrap> wrap;
-       Marklin::Point wrap_pos;
-       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;
-       Marklin::TrackSeq neighbors;
-       sigc::connection selection_changed_conn;
+       float angle;
+       float rot_origin;
+       int elev_origin;
+       std::set<Marklin::Track *> neighbors;
+
+public:
+       Manipulator(Designer &, Selection &);
 
+       void start_move();
+       void start_rotate();
+       void start_elevate();
+       void duplicate();
+       void flatten();
+       void even_slope(bool =false);
+       void connect();
+       void cancel();
+       void button_press(int, int, float, float, unsigned);
+       void pointer_motion(int, int, float, float);
+private:
        void selection_changed();
-       void update_wrap();
+       void update_tracks();
        void update_neighbors();
        void set_slope(TrackOrder &, float, float);
 };