X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fdesigner.cpp;h=61f0d9c00fb495ca08b98ec6654858a2c550d0b4;hb=107a7f787d406f1f664c4986557f9a896e0845ea;hp=edbec387d12cc6c7a0a161a5ba2814b862cb1a79;hpb=f950f5a77714a155e57c868101911e181a617818;p=r2c2.git diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp index edbec38..61f0d9c 100644 --- a/source/designer/designer.cpp +++ b/source/designer/designer.cpp @@ -47,6 +47,7 @@ Designer::Designer(int argc, char **argv): cur_route(0), cur_zone(0), mode(SELECT), + sel_wrap(selection), manipulator(*this, mouse, selection), measure(*this) { @@ -67,8 +68,8 @@ 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)); + layout->signal_object_added.connect(sigc::mem_fun(this, &Designer::object_added)); + layout->signal_object_removed.connect(sigc::mem_fun(this, &Designer::object_removed)); if(argc>1) { @@ -110,31 +111,40 @@ Designer::Designer(int argc, char **argv): 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"); @@ -154,7 +164,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 +186,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() @@ -214,9 +225,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 +259,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 +280,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() @@ -332,7 +345,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() @@ -413,7 +426,7 @@ void Designer::key_press(unsigned key) else if(key==Msp::Input::KEY_F && shift) { const set &tracks = selection.get_objects(); - const set <racks = layout->get_tracks(); + const set <racks = layout->get_all(); for(set::const_iterator i=tracks.begin(); i!=tracks.end(); ++i) { (*i)->set_flex(!(*i)->get_flex()); @@ -450,7 +463,7 @@ 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) @@ -491,7 +504,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(); @@ -514,16 +527,20 @@ void Designer::render() glColor3f(1.0, 1.0, 1.0); } -void Designer::track_added(Track &trk) +void Designer::object_added(Object &obj) { - new_tracks.push_back(&trk); + if(Track *trk = dynamic_cast(&obj)) + new_tracks.push_back(trk); } -void Designer::track_removed(Track &trk) +void Designer::object_removed(Object &obj) { - list::iterator i = find(new_tracks.begin(), new_tracks.end(), &trk); - if(i!=new_tracks.end()) - new_tracks.erase(i); + if(Track *trk = dynamic_cast(&obj)) + { + list::iterator i = find(new_tracks.begin(), new_tracks.end(), trk); + if(i!=new_tracks.end()) + new_tracks.erase(i); + } } Object *Designer::pick_object(const Vector &pointer) @@ -532,7 +549,7 @@ 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_object(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) @@ -587,8 +604,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); } @@ -598,17 +615,6 @@ 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_objects(); @@ -630,15 +636,15 @@ void Designer::svg_export_accept(const string &text) string Designer::tooltip(int x, int y) { - if(Object *obj = pick_object(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 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(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()) @@ -652,7 +658,7 @@ string Designer::tooltip(int x, int y) void Designer::clear_paths() { - const set <racks = layout->get_tracks(); + const set <racks = layout->get_all(); for(set::iterator i=ltracks.begin(); i!=ltracks.end(); ++i) { Track3D &t3d = layout_3d->get_track(**i);