Don't crash if a train has no router

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

diff --git a/source/designer/designer.h b/source/designer/designer.h
index f89355cf95e3f882ed53f6d0f843d35e88ea08fa..a132b4791b4bcfdcca33e945430d8763a30d7b48 100644 (file)
--- a/source/designer/designer.h
+++ b/source/designer/designer.h
@@ -34,7 +34,6 @@ class Designer: public Msp::RegisteredApplication<Designer>
 private:
        enum Mode
        {
-               SELECT,
                CATALOGUE,
                TOOL
        };
@@ -67,6 +66,7 @@ private:
        Selection selection;
        SelectionWrap sel_wrap;
        Tool *cur_tool;
+       unsigned keep_status;
        CameraController *camera_ctl;
 
        Msp::Time::TimeStamp last_tick;
@@ -82,11 +82,12 @@ public:
        const R2C2::Catalogue &get_catalogue() const { return catalogue; }
        R2C2::Layout &get_layout() { return *layout; }
        R2C2::Layout3D &get_layout_3d() { return *layout_3d; }
+       const R2C2::View3D &get_view() const { return *main_view; }
        const CameraController &get_camera_controller() const { return *camera_ctl; }
 
-       void new_track();
-       void erase_tracks();
-       void track_properties();
+       void new_object();
+       void erase_objects();
+       void object_properties();
        void extend_track();
        void connect_tracks();
        void flatten_tracks();
@@ -111,14 +112,14 @@ private:
        template<typename T>
        T *use_tool();
        void use_tool(Tool *);
+       void use_select_tool();
        void button_press(unsigned);
        void apply_camera();
        void render();
        R2C2::Object *pick_object(const R2C2::Vector &);
-       void update_track_icon(R2C2::Track3D &);
-       void selection_changed();
+       void update_object_icon(R2C2::Object &);
        void tool_status(const std::string &);
-       void track_properties_response(int);
+       void object_properties_response(int);
        void route_name_accept(const std::string &);
        void svg_export_accept(const std::string &);
        std::string tooltip(int, int);