X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=6d4d49d10b1c349138f027988cc1fa0af302afcd;hb=ca9d278f9472206ad9a01190dcef9f0eb1bcc274;hp=ed3cd700564695a29ab8cde5262c04d057a6c6d6;hpb=581267f875f4ad32abd44dab6cd813bc871f55c5;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index ed3cd70..6d4d49d 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -42,11 +42,12 @@ Designer::Designer(int argc, char **argv): keyboard(window), mouse(window), ui_res("r2c2.res"), - root(ui_res, window), + root(ui_res, &window, &keyboard, &mouse), base_object(0), cur_route(0), cur_zone(0), mode(SELECT), + sel_wrap(selection), manipulator(*this, mouse, selection), measure(*this) { @@ -106,9 +107,9 @@ Designer::Designer(int argc, char **argv): pipeline->add_renderable_for_pass(layout_3d->get_endpoint_scene(), "unlit"); // Setup UI - keyboard.signal_button_press.connect(sigc::mem_fun(this, &Designer::key_press)); - mouse.signal_button_press.connect(sigc::mem_fun(this, &Designer::button_press)); - mouse.signal_axis_motion.connect(sigc::mem_fun(this, &Designer::axis_motion)); + keyboard.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::key_press), false)); + mouse.signal_button_press.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::button_press), false)); + mouse.signal_axis_motion.connect(sigc::bind_return(sigc::mem_fun(this, &Designer::axis_motion), false)); root.signal_tooltip.connect(sigc::mem_fun(this, &Designer::tooltip)); toolbars.push_back(new Layoutbar(*this)); @@ -133,8 +134,7 @@ Designer::Designer(int argc, char **argv): statusbar->add(*lbl_status); lbl_status->set_geometry(GLtk::Geometry(20, 2, 300, 16)); - track_wrap = new TrackWrap(*layout_3d, selection); - pipeline->add_renderable_for_pass(*track_wrap, "unlit"); + pipeline->add_renderable_for_pass(sel_wrap, "unlit"); overlay = new Overlay3D(ui_res.get_default_font()); pipeline->add_renderable_for_pass(*overlay, "overlay"); pipeline->add_renderable_for_pass(measure, "unlit"); @@ -154,7 +154,6 @@ Designer::~Designer() for(vector::iterator i=toolbars.begin(); i!=toolbars.end(); ++i) delete *i; delete camera_ctl; - delete track_wrap; delete overlay; delete main_view; delete base_object; @@ -198,7 +197,7 @@ void Designer::erase_tracks() if(mode!=SELECT) return; - set tracks = selection.get_tracks(); + set tracks = selection.get_objects(); selection.clear(); for(set::iterator i=tracks.begin(); i!=tracks.end(); ++i) { @@ -278,7 +277,7 @@ void Designer::add_selection_to_route() try { - cur_route->add_tracks(selection.get_tracks()); + cur_route->add_tracks(selection.get_objects()); } catch(const exception &e) { @@ -317,7 +316,7 @@ void Designer::add_selection_to_zone() try { - cur_zone->add_tracks(selection.get_tracks()); + cur_zone->add_tracks(selection.get_objects()); } catch(const exception &e) { @@ -332,7 +331,7 @@ Vector Designer::map_pointer_to_ground(const Vector &p) GL::Vector4 vec = main_view->get_camera().unproject(GL::Vector4(p.x, p.y, 0, 0)); const GL::Vector3 &pos = main_view->get_camera().get_position(); - return Vector(pos.x-vec.x*pos.z/vec.z, pos.y-vec.y*pos.z/vec.z); + return pos-GL::Vector3(vec.x, vec.y, vec.z)*(pos.z/vec.z); } void Designer::tick() @@ -412,7 +411,7 @@ void Designer::key_press(unsigned key) erase_tracks(); else if(key==Msp::Input::KEY_F && shift) { - const set &tracks = selection.get_tracks(); + const set &tracks = selection.get_objects(); const set <racks = layout->get_tracks(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { @@ -450,21 +449,21 @@ void Designer::button_press(unsigned btn) { bool shift = keyboard.get_button_state(Input::KEY_SHIFT_L) || keyboard.get_button_state(Input::KEY_SHIFT_R); - Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1)); + Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1), 0); Vector ground = map_pointer_to_ground(pointer); if(mode==CATALOGUE) { if(btn==1) { - Track *ctrack = pick_track(pointer); - if(ctrack) + Object *cobj = pick_object(pointer); + if(cobj) { - Track *track = new Track(*layout, ctrack->get_type()); - track->set_position(ground); + Object *obj = cobj->clone(layout); + obj->set_position(ground); selection.clear(); - selection.add_track(track); + selection.add_object(obj); mode = SELECT; } @@ -476,12 +475,12 @@ void Designer::button_press(unsigned btn) { if(btn==1) { - Track *track = pick_track(pointer); - if(track) + Object *obj = pick_object(pointer); + if(obj) { if(!shift) selection.clear(); - selection.toggle_track(track); + selection.toggle_object(obj); } } } @@ -491,7 +490,7 @@ void Designer::button_press(unsigned btn) void Designer::axis_motion(unsigned, float, float) { - Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1)); + Vector pointer(mouse.get_axis_value(0), mouse.get_axis_value(1), 0); float wx = pointer.x*window.get_width(); float wy = pointer.y*window.get_height(); @@ -526,13 +525,13 @@ void Designer::track_removed(Track &trk) new_tracks.erase(i); } -Track *Designer::pick_track(const Vector &pointer) +Object *Designer::pick_object(const Vector &pointer) { View3D &view = *(mode==CATALOGUE ? cat_view : main_view); 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_track(Vector(cpos.x, cpos.y, cpos.z), Vector(cray.x, cray.y, cray.z)); + return view.get_layout().get_layout().pick_object(Ray(cpos, Vector(cray))); } void Designer::update_track_icon(Track3D &track) @@ -559,7 +558,7 @@ void Designer::update_track_icon(Track3D &track) void Designer::selection_changed() { - const set &tracks = selection.get_tracks(); + const set &tracks = selection.get_objects(); if(tracks.empty()) lbl_status->set_text(string()); else @@ -587,8 +586,8 @@ void Designer::measure_changed() float pard = measure.get_parallel_distance()*1000; float perpd = measure.get_perpendicular_distance()*1000; float d = sqrt(pard*pard+perpd*perpd); - float adiff = measure.get_angle_difference()*180/M_PI; - string info = format("Par %.1fmm - Perp %.1fmm - Total %.1fmm - Angle %.1f°", pard, perpd, d, adiff); + const Angle &adiff = measure.get_angle_difference(); + string info = format("Par %.1fmm - Perp %.1fmm - Total %.1fmm - Angle %.1f°", pard, perpd, d, adiff.degrees()); lbl_status->set_text(info); } @@ -611,7 +610,7 @@ void Designer::arrange_toolbars() void Designer::track_properties_response(int) { - const set &tracks = selection.get_tracks(); + const set &tracks = selection.get_objects(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) update_track_icon(layout_3d->get_track(**i)); } @@ -630,17 +629,20 @@ void Designer::svg_export_accept(const string &text) string Designer::tooltip(int x, int y) { - if(Track *track = pick_track(Vector(x*2.0f/window.get_width()-1.0f, y*2.0f/window.get_height()-1.0f, 0))) + if(Object *obj = pick_object(Vector(x*2.0f/window.get_width()-1.0f, y*2.0f/window.get_height()-1.0f, 0))) { - const TrackType &ttype = track->get_type(); - string info = format("%d %s", ttype.get_article_number(), ttype.get_description()); - if(mode!=CATALOGUE && abs(track->get_slope())>1e-4) - info += format(" (slope %.1f%%)", abs(track->get_slope()/ttype.get_total_length()*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()); - + const ObjectType &otype = obj->get_type(); + string info = format("%d %s", otype.get_article_number(), otype.get_description()); + if(Track *track = dynamic_cast(obj)) + { + const TrackType &ttype = track->get_type(); + if(mode!=CATALOGUE && abs(track->get_slope())>1e-4) + info += format(" (slope %.1f%%)", abs(track->get_slope()/ttype.get_total_length()*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()); + } return info; }