X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=3c3f83c903bb4592a712af1f039c957c63b91e8a;hb=5116fff210cdc3f0fbdae13046cc60450aad5e8f;hp=ba7e669134766ace8b7bc93ce5c2331e9684fad0;hpb=ec1f75d72e5c4f7f7c9dafdf80f58c30ffb1a855;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index ba7e669..3c3f83c 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #include #include @@ -43,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) { @@ -68,9 +68,6 @@ Designer::Designer(int argc, char **argv): layout = new Layout(catalogue); layout_3d = new Layout3D(*layout); - layout->signal_track_added.connect(sigc::mem_fun(this, &Designer::track_added)); - layout->signal_track_removed.connect(sigc::mem_fun(this, &Designer::track_removed)); - if(argc>1) { filename = argv[1]; @@ -107,46 +104,56 @@ 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)); + root_layout = new GLtk::Layout; + root_layout->set_margin(0); + root.set_layout(root_layout); toolbars.push_back(new Layoutbar(*this)); toolbars.push_back(new Trackbar(*this)); toolbars.push_back(new Routebar(*this)); toolbars.push_back(new Zonebar(*this)); + Toolbar *prev = 0; for(vector::iterator i=toolbars.begin(); i!=toolbars.end(); ++i) { root.add(**i); if(i!=toolbars.begin()) (*i)->expand(false); - (*i)->signal_expanded.connect(sigc::hide(sigc::mem_fun(this, &Designer::arrange_toolbars))); + (*i)->signal_expanded.connect(sigc::hide(sigc::mem_fun(root_layout, &GLtk::Layout::update))); + if(prev) + { + root_layout->add_constraint(**i, GLtk::Layout::RIGHT_OF, *prev, 0); + root_layout->add_constraint(**i, GLtk::Layout::COPY_HEIGHT, *prev); + } + prev = *i; } - arrange_toolbars(); GLtk::Panel *statusbar = new GLtk::Panel; root.add(*statusbar); - statusbar->set_size(window.get_width(), 20); statusbar->set_focusable(false); + root_layout->set_gravity(*statusbar, -1, -1); + root_layout->set_expand(*statusbar, true, false); lbl_status = new GLtk::Label; 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"); camera_ctl = new CameraController(*main_view, keyboard, mouse); cat_view->get_camera().set_look_direction(GL::Vector3(0, 0.13053, -0.99144)); cat_view->view_all(true); main_view->view_all(); - const Layout3D::TrackMap &tracks = layout_3d->get_tracks(); - for(Layout3D::TrackMap::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) - update_track_icon(*i->second); + const set &tracks = layout->get_all(); + for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) + update_track_icon(layout_3d->get(**i)); } Designer::~Designer() @@ -154,7 +161,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; @@ -177,6 +183,8 @@ void Designer::save() { InputDialog *input = new InputDialog(*this, "Save layout", filename); input->signal_accept.connect(sigc::mem_fun(layout, &Layout::save)); + root.add(*input); + root_layout->set_gravity(*input, 0, 0); } void Designer::quit() @@ -198,11 +206,11 @@ 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) { - overlay->clear(layout_3d->get_track(**i)); + overlay->clear(layout_3d->get(**i)); delete *i; } } @@ -214,9 +222,7 @@ void Designer::track_properties() TrackProperties *track_prop = new TrackProperties(selection); root.add(*track_prop); - const GLtk::Geometry &root_geom = root.get_geometry(); - const GLtk::Geometry &dlg_geom = track_prop->get_geometry(); - track_prop->set_position((root_geom.w-dlg_geom.w)/2, (root_geom.h-dlg_geom.h)/2); + root_layout->set_gravity(*track_prop, 0, 0); track_prop->signal_response.connect(sigc::mem_fun(this, &Designer::track_properties_response)); } @@ -250,6 +256,8 @@ void Designer::svg_export() { InputDialog *input = new InputDialog(*this, "SVG export", FS::basepart(filename)+".svg"); input->signal_accept.connect(sigc::mem_fun(this, &Designer::svg_export_accept)); + root.add(*input); + root_layout->set_gravity(*input, 0, 0); } void Designer::edit_route(Route *r) @@ -269,6 +277,8 @@ void Designer::rename_route() InputDialog *input = new InputDialog(*this, "Route name", cur_route->get_name()); input->signal_accept.connect(sigc::mem_fun(this, &Designer::route_name_accept)); + root.add(*input); + root_layout->set_gravity(*input, 0, 0); } void Designer::add_selection_to_route() @@ -278,7 +288,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 +327,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 +342,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() @@ -348,10 +358,6 @@ void Designer::tick() root.tick(); camera_ctl->tick(dt); - for(list::iterator i=new_tracks.begin(); i!=new_tracks.end(); ++i) - layout_3d->get_track(**i).get_path().set_mask(0); - new_tracks.clear(); - render(); window.swap_buffers(); @@ -412,8 +418,8 @@ void Designer::key_press(unsigned key) erase_tracks(); else if(key==Msp::Input::KEY_F && shift) { - const set &tracks = selection.get_tracks(); - const set <racks = layout->get_tracks(); + const set &tracks = selection.get_objects(); + const set <racks = layout->get_all(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { (*i)->set_flex(!(*i)->get_flex()); @@ -422,7 +428,7 @@ void Designer::key_press(unsigned key) if(*j!=*i) (*i)->snap_to(**j, true); - update_track_icon(layout_3d->get_track(**i)); + update_track_icon(layout_3d->get(**i)); } } else if(key==Msp::Input::KEY_F) @@ -450,21 +456,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 +482,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 +497,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(); @@ -508,36 +514,17 @@ void Designer::render() View3D *view = (mode==CATALOGUE ? cat_view : main_view); view->render(); - if(mode==MEASURE) - { - GL::Bind bind_depth(GL::DepthTest::lequal()); - measure.render(); - } root.render(); - // XXX Should fix GLtk so this would not be needed - glColor3f(1.0, 1.0, 1.0); -} - -void Designer::track_added(Track &trk) -{ - new_tracks.push_back(&trk); -} - -void Designer::track_removed(Track &trk) -{ - list::iterator i = find(new_tracks.begin(), new_tracks.end(), &trk); - if(i!=new_tracks.end()) - 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(Ray(cpos, Vector(cray))); } void Designer::update_track_icon(Track3D &track) @@ -564,7 +551,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 @@ -592,8 +579,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); } @@ -603,22 +590,11 @@ void Designer::measure_done() selection_changed(); } -void Designer::arrange_toolbars() -{ - unsigned x = 0; - for(vector::iterator i=toolbars.begin(); i!=toolbars.end(); ++i) - { - const GLtk::Geometry &geom = (*i)->get_geometry(); - (*i)->set_position(x, window.get_height()-geom.h); - x += geom.w; - } -} - 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)); + update_track_icon(layout_3d->get(**i)); } void Designer::route_name_accept(const string &text) @@ -635,17 +611,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))) + const GLtk::Geometry &rgeom = root.get_geometry(); + if(Object *obj = pick_object(Vector(x*2.0f/rgeom.w-1.0f, y*2.0f/rgeom.h-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)) + { + 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()); + } return info; } @@ -654,12 +633,9 @@ string Designer::tooltip(int x, int y) 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); - t3d.get_path().set_mask(0); - } + for(list::iterator i=highlight_paths.begin(); i!=highlight_paths.end(); ++i) + delete *i; + highlight_paths.clear(); } void Designer::show_route(const Route &route) @@ -669,15 +645,11 @@ 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_track(**i); - t3d.get_path().set_color(GL::Color(0.5, 0.8, 1.0)); - int path = -1; + Track3D &t3d = layout_3d->get(**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 = route.get_turnout(tid); - if(path>=0) - t3d.get_path().set_path(path); - else - t3d.get_path().set_mask((*i)->get_type().get_paths()); + path->set_path(route.get_turnout(tid)); } } @@ -688,8 +660,8 @@ 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_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()); + Track3D &t3d = layout_3d->get(**i); + Path3D *path = new Path3D(t3d); + path->set_color(GL::Color(0.8, 1.0, 0.5)); } }