Add an SVG exporter to Designer

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index c4591abf5f1260991044d2b1839dd11448f161dd..c82a2541574506d00427376831da949daa487bb5 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -30,8 +30,8 @@ Distributed under the GPL
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
+#include "trackwrap.h"
 
-class Input;
 class Toolbar;
 
 class Designer: public Msp::Application
@@ -42,17 +42,15 @@ private:
                SELECT,
                CATALOGUE,
                MANIPULATE,
-               MEASURE,
-               INPUT
+               MEASURE
        };
 
        Msp::Graphics::SimpleGLWindow window;
        Msp::GLtk::Resources ui_res;
-       Msp::GLtk::Root *root;
+       Msp::GLtk::Root root;
 
        Toolbar *toolbar;
-       Msp::GLtk::Label *lbl_tooltip;
-       Msp::Time::TimeStamp tooltip_timeout;
+       Msp::GLtk::Label *lbl_status;
 
        Marklin::Catalogue catalogue;
        Marklin::Layout3D *cat_layout_3d;
@@ -62,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;
@@ -71,12 +70,8 @@ private:
        Selection selection;
        Manipulator manipulator;
        Measure measure;
-       Input *input;
        CameraController camera_ctl;
-
-       bool shift;
-       int pointer_x;
-       int pointer_y;
+       TrackWrap track_wrap;
 
        Msp::Time::TimeStamp last_tick;
 
@@ -90,37 +85,46 @@ public:
        void save();
        void quit();
 
-       Marklin::Layout *get_layout() { return layout; }
-       Marklin::Layout3D *get_layout_3d() { return layout_3d; }
-       const Msp::GL::Camera &get_camera() const { return camera; }
+       const Marklin::Catalogue &get_catalogue() const { return catalogue; }
+       Marklin::Layout &get_layout() { return *layout; }
+       Marklin::Layout3D &get_layout_3d() { return *layout_3d; }
+       const CameraController &get_camera_controller() const { return camera_ctl; }
        const Msp::GLtk::Resources &get_ui_resources() const { return ui_res; }
-       Msp::GLtk::Root &get_root() const { return *root; }
-       void edit_route(Marklin::Route &);
+       Msp::GLtk::Root &get_root() { return root; }
+
+       void new_track();
+       void set_turnout_id();
+       void set_sensor_id();
+       void rename_route();
+       void svg_export();
+
+       void edit_route(Marklin::Route *);
        Marklin::Route *get_current_route() const { return cur_route; }
        void add_selection_to_route();
 
-       Marklin::Point map_pointer_coords(int, int);
+       Marklin::Point map_pointer_to_ground(int, int);
 private:
        void tick();
        void key_press(unsigned, unsigned, wchar_t);
-       void key_release(unsigned, unsigned);
        void button_press(int, int, unsigned, unsigned);
        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();
        void measure_done();
-       void set_tooltip(int, int, const std::string &);
-       void clear_tooltip();
-       void save_accept();
-       void turnout_id_accept();
-       void sensor_id_accept();
-       void input_dismiss();
-       void view_all();
+       void turnout_id_accept(const std::string &);
+       void sensor_id_accept(const std::string &);
+       void route_name_accept(const std::string &);
+       void svg_export_accept(const std::string &);
+       std::string tooltip(int, int);
+       void show_route(const Marklin::Route *);
 };
 
 #endif