Rename the project to R²C²

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index 5d22afb1c924c8b0a872d763820dc8567b8bff1f..9fc2961ddd01ba7ba08da0858e16584100509e5d 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -1,6 +1,6 @@
 /* $Id$
 
-This file is part of the MSP Märklin suite
+This file is part of R²C²
 Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
@@ -21,8 +21,8 @@ Distributed under the GPL
 #include <msp/gltk/resources.h>
 #include <msp/gltk/root.h>
 #include <msp/time/timestamp.h>
-#include "libmarklin/catalogue.h"
-#include "libmarklin/layout.h"
+#include "libr2c2/catalogue.h"
+#include "libr2c2/layout.h"
 #include "3d/layout.h"
 #include "3d/overlay.h"
 #include "3d/track.h"
@@ -30,6 +30,7 @@ Distributed under the GPL
 #include "manipulator.h"
 #include "measure.h"
 #include "selection.h"
+#include "trackwrap.h"
 
 class Toolbar;
 
@@ -41,24 +42,26 @@ private:
                SELECT,
                CATALOGUE,
                MANIPULATE,
+               MANIPULATE_DONE,
                MEASURE
        };
 
        Msp::Graphics::SimpleGLWindow window;
        Msp::GLtk::Resources ui_res;
-       Msp::GLtk::Root *root;
+       Msp::GLtk::Root root;
 
        Toolbar *toolbar;
        Msp::GLtk::Label *lbl_status;
 
-       Marklin::Catalogue catalogue;
-       Marklin::Layout3D *cat_layout_3d;
+       R2C2::Catalogue catalogue;
+       R2C2::Layout3D *cat_layout_3d;
        std::string filename;
-       Marklin::Layout *layout;
-       Marklin::Layout3D *layout_3d;
-       Marklin::Overlay3D *overlay;
+       R2C2::Layout *layout;
+       R2C2::Layout3D *layout_3d;
+       R2C2::Overlay3D *overlay;
        Msp::GL::Object *base_object;
-       Marklin::Route *cur_route;
+       R2C2::Route *cur_route;
+       std::list<R2C2::Track *> new_tracks;
        Msp::GL::Pipeline *pipeline;
        Msp::GL::Camera camera;
        Msp::GL::Lighting lighting;
@@ -69,6 +72,7 @@ private:
        Manipulator manipulator;
        Measure measure;
        CameraController camera_ctl;
+       TrackWrap track_wrap;
 
        Msp::Time::TimeStamp last_tick;
 
@@ -82,21 +86,24 @@ 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 R2C2::Catalogue &get_catalogue() const { return catalogue; }
+       R2C2::Layout &get_layout() { return *layout; }
+       R2C2::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; }
+       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 edit_route(R2C2::Route *);
+       R2C2::Route *get_current_route() const { return cur_route; }
        void add_selection_to_route();
 
-       Marklin::Point map_pointer_coords(int, int);
+       R2C2::Point map_pointer_to_ground(int, int);
 private:
        void tick();
        void key_press(unsigned, unsigned, wchar_t);
@@ -104,17 +111,21 @@ private:
        void pointer_motion(int, int);
        void apply_camera();
        void render();
-       Marklin::Track3D *pick_track(int, int);
-       void update_track_icon(Marklin::Track3D &);
+       void track_added(R2C2::Track &);
+       void track_removed(R2C2::Track &);
+       R2C2::Track3D *pick_track(int, int);
+       void update_track_icon(R2C2::Track3D &);
+       void selection_changed();
        void manipulation_status(const std::string &);
        void manipulation_done(bool);
        void measure_changed();
        void measure_done();
        void turnout_id_accept(const std::string &);
        void sensor_id_accept(const std::string &);
-       void view_all();
+       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 &);
+       void show_route(const R2C2::Route *);
 };
 
 #endif