X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=511c901b5d5b3c70aa9ef086f775ff4ca72cf302;hb=b86f4adf319881697e6ecb46aaeaffe01d7b0a0a;hp=1df759b2367ffb417b6b25b89b51f3abffd9de38;hpb=a882f35842c819e011c5fdf6104852c2b6ab3eef;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index 1df759b..511c901 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -17,6 +17,7 @@ #include #include #include "libr2c2/route.h" +#include "libr2c2/terrain.h" #include "libr2c2/tracktype.h" #include "libr2c2/zone.h" #include "3d/path.h" @@ -28,14 +29,15 @@ #include "manipulator.h" #include "measure.h" #include "movetool.h" +#include "objectproperties.h" #include "objectselecttool.h" #include "rotatetool.h" #include "routebar.h" #include "selection.h" #include "slopetool.h" #include "svgexporter.h" +#include "terraintool.h" #include "trackbar.h" -#include "trackproperties.h" #include "zonebar.h" #include "zoneproperties.h" @@ -47,25 +49,28 @@ Designer::Designer(int argc, char **argv): window(1280, 960), keyboard(window), mouse(window), - ui_res("r2c2.res"), + ui_res("data/r2c2.res"), root(ui_res, &window, &keyboard, &mouse), base_object(0), cur_route(0), cur_zone(0), mode(TOOL), sel_wrap(selection), - cur_tool(0) + cur_tool(0), + keep_status(0) { window.set_title("Railway Designer"); window.signal_close.connect(sigc::bind(sigc::mem_fun(this, &Designer::exit), 0)); // Setup catalogue and layout - DataFile::load(catalogue, "tracks.dat"); + catalogue.add_source("data/Märklin/H0"); cat_layout_3d = new Layout3D(catalogue.get_layout()); layout = new Layout(catalogue); + layout->get_clock().set_current_time(12*Time::hour); layout_3d = new Layout3D(*layout); + layout_3d->tick(); if(argc>1) { @@ -148,9 +153,9 @@ Designer::Designer(int argc, char **argv): cat_view->view_all(true); main_view->view_all(); - const set &tracks = layout->get_all(); - for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - update_track_icon(layout_3d->get(**i)); + const set &objects = layout->get_all(); + for(set::const_iterator i=objects.begin(); i!=objects.end(); ++i) + update_object_icon(**i); } Designer::~Designer() @@ -189,38 +194,38 @@ void Designer::quit() exit(0); } -void Designer::new_track() +void Designer::new_object() { use_select_tool(); mode = CATALOGUE; - lbl_status->set_text("Select new track or press Esc to cancel"); + lbl_status->set_text("Select new object or press Esc to cancel"); } -void Designer::erase_tracks() +void Designer::erase_objects() { use_select_tool(); - set tracks = selection.get_objects(); + set objects = selection.get_objects(); selection.clear(); - for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) + for(set::iterator i=objects.begin(); i!=objects.end(); ++i) { - overlay->clear(layout_3d->get(**i)); + overlay->clear(layout_3d->get_3d(**i)); delete *i; } } -void Designer::track_properties() +void Designer::object_properties() { use_select_tool(); if(selection.empty()) return; - TrackProperties *track_prop = new TrackProperties(selection); - root.add(*track_prop); - root_layout->set_gravity(*track_prop, 0, 0); + ObjectProperties *dlg = new ObjectProperties(selection); + root.add(*dlg); + root_layout->set_gravity(*dlg, 0, 0); - track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response)); + dlg->signal_response.connect(sigc::mem_fun(this, &Designer::object_properties_response)); } void Designer::extend_track() @@ -343,6 +348,7 @@ void Designer::tick() cur_tool->update_selection(selection); use_select_tool(); } + keep_status = 0; window.tick(); root.tick(); @@ -360,7 +366,7 @@ void Designer::key_press(unsigned key) if(key==Msp::Input::KEY_N && shift) use_tool_with_selected_objects(); else if(key==Msp::Input::KEY_N) - new_track(); + new_object(); else if(key==Msp::Input::KEY_G) use_tool_with_selected_objects(); else if(key==Msp::Input::KEY_R) @@ -393,7 +399,7 @@ void Designer::key_press(unsigned key) use_select_tool(); } else if(key==Msp::Input::KEY_X) - erase_tracks(); + erase_objects(); else if(key==Msp::Input::KEY_F && shift) { const set &tracks = selection.get_objects(); @@ -406,7 +412,7 @@ void Designer::key_press(unsigned key) if(*j!=*i) (*i)->snap_to(**j, true); - update_track_icon(layout_3d->get(**i)); + update_object_icon(**i); } } else if(key==Msp::Input::KEY_F) @@ -427,7 +433,13 @@ void Designer::key_press(unsigned key) else if(key==Msp::Input::KEY_V) svg_export(); else if(key==Msp::Input::KEY_P) - track_properties(); + object_properties(); + else if(key==Msp::Input::KEY_TAB) + { + Object *obj = selection.get_object(); + if(Terrain *terrain = dynamic_cast(obj)) + use_tool(new TerrainTool(*this, keyboard, mouse, *terrain)); + } } template @@ -456,8 +468,10 @@ void Designer::use_tool(Tool *tool) cur_tool = tool; cur_tool->signal_status.connect(sigc::mem_fun(this, &Designer::tool_status)); - tool_status(cur_tool->get_status()); + if(keep_status<2) + tool_status(tool->get_status()); mode = TOOL; + keep_status = 1; } void Designer::use_select_tool() @@ -472,7 +486,7 @@ void Designer::button_press(unsigned btn) if(mode==CATALOGUE) { - Object *obj; + Object *obj = 0; if(btn==1) obj = pick_object(pointer); @@ -506,41 +520,58 @@ Object *Designer::pick_object(const Vector &pointer) const GL::Vector3 &cpos = view.get_camera().get_position(); GL::Vector4 cray = view.get_camera().unproject(GL::Vector4(pointer.x, pointer.y, 0, 0)); - return view.get_layout().get_layout().pick(Ray(cpos, Vector(cray))); + return view.get_layout().get_layout().pick(Ray(cpos, cray.slice<3>(0))); } -void Designer::update_track_icon(Track3D &track) +void Designer::update_object_icon(Object &obj) { - overlay->clear(track); + Object3D &obj3d = layout_3d->get_3d(obj); + overlay->clear(obj3d); - if(track.get_track().get_flex()) - overlay->add_graphic(track, "flex"); + if(Track *track = dynamic_cast(&obj)) + { + if(track->get_flex()) + overlay->add_graphic(obj3d, "flex"); - if(unsigned sid = track.get_track().get_sensor_id()) + if(unsigned saddr = track->get_sensor_address()) + { + overlay->add_graphic(obj3d, "trackcircuit"); + overlay->set_label(obj3d, lexical_cast(saddr)); + } + else if(track->get_type().is_turnout()) + { + unsigned taddr = track->get_turnout_address(); + if(taddr<0x800) + { + overlay->add_graphic(obj3d, "turnout"); + overlay->set_label(obj3d, lexical_cast(taddr)); + } + } + } + else if(Signal *signal = dynamic_cast(&obj)) { - overlay->add_graphic(track, "sensor"); - overlay->set_label(track, lexical_cast(sid)); + overlay->add_graphic(obj3d, "signal"); + overlay->set_label(obj3d, lexical_cast(signal->get_address())); } - else if(unsigned tid = track.get_track().get_turnout_id()) + else if(BeamGate *gate = dynamic_cast(&obj)) { - if(tid<0x800) - { - overlay->add_graphic(track, "turnout"); - overlay->set_label(track, lexical_cast(tid)); - } + overlay->add_graphic(obj3d, "beamgate"); + overlay->set_label(obj3d, lexical_cast(gate->get_address())); } } void Designer::tool_status(const string &status) { lbl_status->set_text(status); + if(keep_status==1) + keep_status = 2; } -void Designer::track_properties_response(int) +void Designer::object_properties_response(int) { - const set &tracks = selection.get_objects(); - for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - update_track_icon(layout_3d->get(**i)); + const set &objects = selection.get_objects(); + for(set::const_iterator i=objects.begin(); i!=objects.end(); ++i) + update_object_icon(**i); } void Designer::route_name_accept(const string &text) @@ -561,15 +592,24 @@ string Designer::tooltip(int x, int y) if(Object *obj = pick_object(Vector(x*2.0f/rgeom.w-1.0f, y*2.0f/rgeom.h-1.0f, 0))) { const ObjectType &otype = obj->get_type(); - string info = format("%d %s", otype.get_article_number(), otype.get_description()); + string info = format("%d %s", otype.get_article_number(), otype.get_name()); if(Track *track = dynamic_cast(obj)) { if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4) info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100)); - if(track->get_turnout_id()) - info += format(" (turnout %d)", track->get_turnout_id()); - else if(track->get_sensor_id()) - info += format(" (sensor %d)", track->get_sensor_id()); + if(track->get_type().is_turnout()) + info += format(" (turnout %d)", track->get_turnout_address()); + else if(track->get_sensor_address()) + info += format(" (sensor %d)", track->get_sensor_address()); + } + if(mode==CATALOGUE) + { + const string &descr = otype.get_description(); + if(!descr.empty()) + { + info += '\n'; + info += otype.get_description(); + } } return info; } @@ -591,11 +631,12 @@ void Designer::show_route(const Route &route) const set &rtracks = route.get_tracks(); for(set::iterator i=rtracks.begin(); i!=rtracks.end(); ++i) { - Track3D &t3d = layout_3d->get(**i); + Track3D &t3d = layout_3d->get_3d(**i); Path3D *path = new Path3D(t3d); path->set_color(GL::Color(0.5, 0.8, 1.0)); - if(unsigned tid = (*i)->get_turnout_id()) - path->set_path(route.get_turnout(tid)); + if((*i)->get_type().is_turnout()) + path->set_path(route.get_turnout((*i)->get_turnout_address())); + highlight_paths.push_back(path); } } @@ -606,8 +647,9 @@ void Designer::show_zone(const Zone &zone) const Zone::TrackSet &ztracks = zone.get_tracks(); for(Zone::TrackSet::const_iterator i=ztracks.begin(); i!=ztracks.end(); ++i) { - Track3D &t3d = layout_3d->get(**i); + Track3D &t3d = layout_3d->get_3d(**i); Path3D *path = new Path3D(t3d); path->set_color(GL::Color(0.8, 1.0, 0.5)); + highlight_paths.push_back(path); } }