]> git.tdb.fi Git - r2c2.git/blobdiff - source/designer/designer.cpp
New approach for displaying track state
[r2c2.git] / source / designer / designer.cpp
index d640073427c5c936ce2ceb53ced27d9a0472775f..3c3f83c903bb4592a712af1f039c957c63b91e8a 100644 (file)
@@ -68,9 +68,6 @@ Designer::Designer(int argc, char **argv):
        layout = new Layout(catalogue);
        layout_3d = new Layout3D(*layout);
 
-       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)
        {
                filename = argv[1];
@@ -111,24 +108,34 @@ 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<Toolbar *>::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);
@@ -144,9 +151,9 @@ Designer::Designer(int argc, char **argv):
        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<Track *> &tracks = layout->get_all<Track>();
+       for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+               update_track_icon(layout_3d->get<Track3D>(**i));
 }
 
 Designer::~Designer()
@@ -176,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()
@@ -201,7 +210,7 @@ void Designer::erase_tracks()
        selection.clear();
        for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
-               overlay->clear(layout_3d->get_track(**i));
+               overlay->clear(layout_3d->get<Track3D>(**i));
                delete *i;
        }
 }
@@ -213,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));
 }
@@ -249,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)
@@ -268,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()
@@ -347,10 +358,6 @@ void Designer::tick()
        root.tick();
        camera_ctl->tick(dt);
 
-       for(list<Track *>::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();
@@ -421,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<Track3D>(**i));
                }
        }
        else if(key==Msp::Input::KEY_F)
@@ -509,24 +516,6 @@ void Designer::render()
        view->render();
 
        root.render();
-       // XXX Should fix GLtk so this would not be needed
-       glColor3f(1.0, 1.0, 1.0);
-}
-
-void Designer::object_added(Object &obj)
-{
-       if(Track *trk = dynamic_cast<Track *>(&obj))
-               new_tracks.push_back(trk);
-}
-
-void Designer::object_removed(Object &obj)
-{
-       if(Track *trk = dynamic_cast<Track *>(&obj))
-       {
-               list<Track *>::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)
@@ -601,22 +590,11 @@ void Designer::measure_done()
        selection_changed();
 }
 
-void Designer::arrange_toolbars()
-{
-       unsigned x = 0;
-       for(vector<Toolbar *>::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<Track *> &tracks = selection.get_objects<Track>();
        for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
-               update_track_icon(layout_3d->get_track(**i));
+               update_track_icon(layout_3d->get<Track3D>(**i));
 }
 
 void Designer::route_name_accept(const string &text)
@@ -633,15 +611,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<Track *>(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())
@@ -655,12 +633,9 @@ string Designer::tooltip(int x, int y)
 
 void Designer::clear_paths()
 {
-       const set<Track *> &ltracks = layout->get_all<Track>();
-       for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
-       {
-               Track3D &t3d = layout_3d->get_track(**i);
-               t3d.get_path().set_mask(0);
-       }
+       for(list<Path3D *>::iterator i=highlight_paths.begin(); i!=highlight_paths.end(); ++i)
+               delete *i;
+       highlight_paths.clear();
 }
 
 void Designer::show_route(const Route &route)
@@ -670,15 +645,11 @@ void Designer::show_route(const Route &route)
        const set<Track *> &rtracks = route.get_tracks();
        for(set<Track *>::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<Track3D>(**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));
        }
 }
 
@@ -689,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<Track3D>(**i);
+               Path3D *path = new Path3D(t3d);
+               path->set_color(GL::Color(0.8, 1.0, 0.5));
        }
 }