X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.h;h=c173668408a36d1300f8c725a75a9dec18a06a91;hb=9b05c573a38639827697fe393d55b7c76f5bde45;hp=dbbd1923ca1b47a9fb6c42a0cac464253c574618;hpb=cd6686b4821de95505ac94115e0966e4ff7cdc57;p=r2c2.git diff --git a/source/designer/designer.h b/source/designer/designer.h index dbbd192..c173668 100644 --- a/source/designer/designer.h +++ b/source/designer/designer.h @@ -42,6 +42,7 @@ private: SELECT, CATALOGUE, MANIPULATE, + MANIPULATE_DONE, MEASURE }; @@ -88,7 +89,7 @@ public: const Marklin::Catalogue &get_catalogue() const { return catalogue; } Marklin::Layout &get_layout() { return *layout; } Marklin::Layout3D &get_layout_3d() { return *layout_3d; } - const Msp::GL::Camera &get_camera() const { return camera; } + 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() { return root; } @@ -96,12 +97,13 @@ public: 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); @@ -121,6 +123,7 @@ private: 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 *); };