X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=2002bd987910a7d28893ba32b1efd15db0671e39;hb=cb222b6df855da4196a331c5b9859750c4321fa0;hp=34398f3177dfd3700ecf9cd8547722341412602c;hpb=c6b9a38300cc2ecfc0df66af162620b9ea5a1e3e;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index 34398f3..2002bd9 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -28,6 +28,7 @@ Distributed under the GPL #include #include "libr2c2/route.h" #include "libr2c2/tracktype.h" +#include "libr2c2/zone.h" #include "3d/path.h" #include "designer.h" #include "input.h" @@ -39,6 +40,8 @@ Distributed under the GPL #include "svgexporter.h" #include "trackbar.h" #include "trackproperties.h" +#include "zonebar.h" +#include "zoneproperties.h" using namespace std; using namespace R2C2; @@ -52,6 +55,7 @@ Designer::Designer(int argc, char **argv): root(ui_res, window), base_object(0), cur_route(0), + cur_zone(0), mode(SELECT), manipulator(*this, root, selection), measure(*this), @@ -91,8 +95,6 @@ Designer::Designer(int argc, char **argv): } // Setup OpenGL - GL::enable(GL_CULL_FACE); - pipeline = new GL::Pipeline(window.get_width(), window.get_height(), false); pipeline->set_camera(&camera); pipeline->add_renderable_for_pass(layout_3d->get_scene(), 0); @@ -130,6 +132,7 @@ Designer::Designer(int argc, char **argv): toolbars.push_back(new Layoutbar(*this)); toolbars.push_back(new Trackbar(*this)); toolbars.push_back(new Routebar(*this)); + toolbars.push_back(new Zonebar(*this)); for(vector::iterator i=toolbars.begin(); i!=toolbars.end(); ++i) { root.add(**i); @@ -159,6 +162,8 @@ Designer::Designer(int argc, char **argv): Designer::~Designer() { + for(vector::iterator i=toolbars.begin(); i!=toolbars.end(); ++i) + delete *i; delete overlay; delete pipeline; delete base_object; @@ -189,12 +194,30 @@ void Designer::quit() void Designer::new_track() { + if(mode!=SELECT) + return; + mode = CATALOGUE; + lbl_status->set_text("Select new track or press Esc to cancel"); +} + +void Designer::erase_tracks() +{ + if(mode!=SELECT) + return; + + set tracks = selection.get_tracks(); + selection.clear(); + for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) + { + overlay->clear(layout_3d->get_track(**i)); + delete *i; + } } void Designer::track_properties() { - if(selection.empty()) + if(mode!=SELECT || selection.empty()) return; TrackProperties *track_prop = new TrackProperties(selection); @@ -206,13 +229,29 @@ void Designer::track_properties() track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response)); } -void Designer::rename_route() +void Designer::extend_track() { - if(!cur_route) + if(mode!=SELECT) return; - InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name()); - input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept)); + if(manipulator.start_extend()) + mode = MANIPULATE; +} + +void Designer::connect_tracks() +{ + if(mode!=SELECT) + return; + + manipulator.connect(); +} + +void Designer::flatten_tracks() +{ + if(mode!=SELECT) + return; + + manipulator.flatten(); } void Designer::svg_export() @@ -224,7 +263,20 @@ void Designer::svg_export() void Designer::edit_route(Route *r) { cur_route = r; - show_route(r); + cur_zone = 0; + if(cur_route) + show_route(*cur_route); + else + clear_paths(); +} + +void Designer::rename_route() +{ + if(mode!=SELECT || !cur_route) + return; + + InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name()); + input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept)); } void Designer::add_selection_to_route() @@ -241,7 +293,46 @@ void Designer::add_selection_to_route() lbl_status->set_text(e.what()); } - show_route(cur_route); + show_route(*cur_route); +} + +void Designer::edit_zone(Zone *z) +{ + cur_zone = z; + cur_route = 0; + if(cur_zone) + show_zone(*cur_zone); + else + clear_paths(); +} + +void Designer::zone_properties() +{ + if(!cur_zone) + return; + + ZoneProperties *zone_prop = new ZoneProperties(*cur_zone); + root.add(*zone_prop); + const GLtk::Geometry &root_geom = root.get_geometry(); + const GLtk::Geometry &dlg_geom = zone_prop->get_geometry(); + zone_prop->set_position((root_geom.w-dlg_geom.w)/2, (root_geom.h-dlg_geom.h)/2); +} + +void Designer::add_selection_to_zone() +{ + if(!cur_zone) + return; + + try + { + cur_zone->add_tracks(selection.get_tracks()); + } + catch(const Exception &e) + { + lbl_status->set_text(e.what()); + } + + show_zone(*cur_zone); } Point Designer::map_pointer_to_ground(int x, int y) @@ -282,10 +373,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t) mod = Input::mod_from_sys(mod); if(key==Msp::Input::KEY_N && (mod&Input::MOD_SHIFT)) - { - manipulator.start_extend(); - mode = MANIPULATE; - } + extend_track(); else if(key==Msp::Input::KEY_N) new_track(); else if(key==Msp::Input::KEY_G) @@ -332,16 +420,7 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t) selection.clear(); } else if(key==Msp::Input::KEY_X) - { - set tracks = selection.get_tracks(); - selection.clear(); - for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) - { - overlay->clear(layout_3d->get_track(**i)); - layout->remove_track(**i); - delete *i; - } - } + erase_tracks(); else if(key==Msp::Input::KEY_F && (mod&Input::MOD_SHIFT)) { const set &tracks = selection.get_tracks(); @@ -358,15 +437,20 @@ void Designer::key_press(unsigned key, unsigned mod, wchar_t) } } else if(key==Msp::Input::KEY_F) - manipulator.flatten(); + flatten_tracks(); else if(key==Msp::Input::KEY_E && (mod&Input::MOD_SHIFT)) manipulator.even_slope(true); else if(key==Msp::Input::KEY_E) manipulator.even_slope(); else if(key==Msp::Input::KEY_A) - add_selection_to_route(); + { + if(cur_route) + add_selection_to_route(); + else if(cur_zone) + add_selection_to_zone(); + } else if(key==Msp::Input::KEY_C) - manipulator.connect(); + connect_tracks(); else if(key==Msp::Input::KEY_V) svg_export(); else if(key==Msp::Input::KEY_P) @@ -454,7 +538,6 @@ void Designer::render() else { pipeline->render_all(); - GL::enable(GL_CULL_FACE); { GL::Bind bind_blend(GL::Blend::alpha()); overlay->render(0); @@ -471,11 +554,11 @@ void Designer::render() GL::matrix_mode(GL::MODELVIEW); GL::load_identity(); - GL::disable(GL::DEPTH_TEST); - GL::Bind bind_blend(GL::Blend::alpha()); root.render(); + // XXX Should fix GLtk so these would not be needed GL::Texture::unbind(); + glColor3f(1.0, 1.0, 1.0); } void Designer::track_added(Track &trk) @@ -618,28 +701,44 @@ string Designer::tooltip(int x, int y) return string(); } -void Designer::show_route(const Route *route) +void Designer::clear_paths() { const set <racks = layout->get_tracks(); for(set::iterator i=ltracks.begin(); i!=ltracks.end(); ++i) { Track3D &t3d = layout_3d->get_track(**i); - if(route && route->has_track(**i)) - { - t3d.get_path().set_color(GL::Color(0.5, 0.8, 1.0)); - if((*i)->get_type().is_turnout()) - { - unsigned tid = (*i)->get_turnout_id(); - int path = (tid ? route->get_turnout(tid) : -1); - if(path>=0) - t3d.get_path().set_path(path); - else - t3d.get_path().set_mask((*i)->get_type().get_paths()); - } - else - t3d.get_path().set_path(0); - } + t3d.get_path().set_mask(0); + } +} + +void Designer::show_route(const Route &route) +{ + clear_paths(); + + const set &rtracks = route.get_tracks(); + for(set::iterator i=rtracks.begin(); i!=rtracks.end(); ++i) + { + Track3D &t3d = layout_3d->get_track(**i); + t3d.get_path().set_color(GL::Color(0.5, 0.8, 1.0)); + int path = -1; + if(unsigned tid = (*i)->get_turnout_id()) + path = route.get_turnout(tid); + if(path>=0) + t3d.get_path().set_path(path); else - t3d.get_path().set_mask(0); + t3d.get_path().set_mask((*i)->get_type().get_paths()); + } +} + +void Designer::show_zone(const Zone &zone) +{ + clear_paths(); + + const Zone::TrackSet &ztracks = zone.get_tracks(); + for(Zone::TrackSet::const_iterator i=ztracks.begin(); i!=ztracks.end(); ++i) + { + Track3D &t3d = layout_3d->get_track(**i); + t3d.get_path().set_color(GL::Color(0.8, 1.0, 0.5)); + t3d.get_path().set_mask((*i)->get_type().get_paths()); } }