X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=4ad5274e1cce7754c9742890b4b26607449f9ef6;hb=4acf89b0ec739c0bef8b11d3a52a4c551efa881e;hp=a59b3a12dd127839616a13190ceb51b7ee345b4f;hpb=b6af6301c76d3664d969a72d8d889020093ac848;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index a59b3a1..4ad5274 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" @@ -35,6 +36,7 @@ #include "selection.h" #include "slopetool.h" #include "svgexporter.h" +#include "terraintool.h" #include "trackbar.h" #include "zonebar.h" #include "zoneproperties.h" @@ -54,13 +56,15 @@ Designer::Designer(int argc, char **argv): 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"); + DataFile::load(catalogue, "terrain.dat"); cat_layout_3d = new Layout3D(catalogue.get_layout()); @@ -148,9 +152,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_3d(**i)); + const set &objects = layout->get_all(); + for(set::const_iterator i=objects.begin(); i!=objects.end(); ++i) + update_object_icon(**i); } Designer::~Designer() @@ -343,6 +347,7 @@ void Designer::tick() cur_tool->update_selection(selection); use_select_tool(); } + keep_status = 0; window.tick(); root.tick(); @@ -406,7 +411,7 @@ void Designer::key_press(unsigned key) if(*j!=*i) (*i)->snap_to(**j, true); - update_track_icon(layout_3d->get_3d(**i)); + update_object_icon(**i); } } else if(key==Msp::Input::KEY_F) @@ -428,6 +433,12 @@ void Designer::key_press(unsigned key) svg_export(); else if(key==Msp::Input::KEY_P) 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 +467,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 +485,7 @@ void Designer::button_press(unsigned btn) if(mode==CATALOGUE) { - Object *obj; + Object *obj = 0; if(btn==1) obj = pick_object(pointer); @@ -509,38 +522,55 @@ Object *Designer::pick_object(const Vector &pointer) return view.get_layout().get_layout().pick(Ray(cpos, Vector(cray))); } -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 saddr = track.get_track().get_sensor_address()) + 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(saddr)); + overlay->add_graphic(obj3d, "signal"); + overlay->set_label(obj3d, lexical_cast(signal->get_address())); } - else if(unsigned taddr = track.get_track().get_turnout_address()) + else if(BeamGate *gate = dynamic_cast(&obj)) { - if(taddr<0x800) - { - overlay->add_graphic(track, "turnout"); - overlay->set_label(track, lexical_cast(taddr)); - } + 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::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_3d(**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) @@ -566,7 +596,7 @@ string Designer::tooltip(int x, int y) { if(mode!=CATALOGUE && abs(track->get_tilt()).radians()>1e-4) info += format(" (slope %.1f%%)", abs(tan(track->get_tilt())*100)); - if(track->get_turnout_address()) + 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()); @@ -594,8 +624,9 @@ void Designer::show_route(const Route &route) 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 taddr = (*i)->get_turnout_address()) - path->set_path(route.get_turnout(taddr)); + if((*i)->get_type().is_turnout()) + path->set_path(route.get_turnout((*i)->get_turnout_address())); + highlight_paths.push_back(path); } } @@ -609,5 +640,6 @@ void Designer::show_zone(const Zone &zone) 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); } }