Make use of the mspmath library

[r2c2.git] / source / designer / designer.cpp

diff --git a/source/designer/designer.cpp b/source/designer/designer.cpp
index da897713c8a57987d6f0bd0dcd81a5bde4ca1786..6d2fd41eca30c17451b1babc510b13796f064e96 100644 (file)
--- a/source/designer/designer.cpp
+++ b/source/designer/designer.cpp
@@ -198,7 +198,7 @@ void Designer::erase_tracks()
        if(mode!=SELECT)
                return;
 
-       set<Track *> tracks = selection.get_tracks();
+       set<Track *> tracks = selection.get_objects<Track>();
        selection.clear();
        for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
        {
@@ -278,7 +278,7 @@ void Designer::add_selection_to_route()
 
        try
        {
-               cur_route->add_tracks(selection.get_tracks());
+               cur_route->add_tracks(selection.get_objects<Track>());
        }
        catch(const exception &e)
        {
@@ -317,7 +317,7 @@ void Designer::add_selection_to_zone()
 
        try
        {
-               cur_zone->add_tracks(selection.get_tracks());
+               cur_zone->add_tracks(selection.get_objects<Track>());
        }
        catch(const exception &e)
        {
@@ -332,7 +332,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 +412,7 @@ void Designer::key_press(unsigned key)
                erase_tracks();
        else if(key==Msp::Input::KEY_F && shift)
        {
-               const set<Track *> &tracks = selection.get_tracks();
+               const set<Track *> &tracks = selection.get_objects<Track>();
                const set<Track *> &ltracks = layout->get_tracks();
                for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
                {
@@ -450,21 +450,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 +476,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 +491,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 +526,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(Vector(cpos.x, cpos.y, cpos.z), Vector(cray.x, cray.y, cray.z));
 }
 
 void Designer::update_track_icon(Track3D &track)
@@ -559,7 +559,7 @@ void Designer::update_track_icon(Track3D &track)
 
 void Designer::selection_changed()
 {
-       const set<Track *> &tracks = selection.get_tracks();
+       const set<Track *> &tracks = selection.get_objects<Track>();
        if(tracks.empty())
                lbl_status->set_text(string());
        else
@@ -587,8 +587,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 +611,7 @@ void Designer::arrange_toolbars()
 
 void Designer::track_properties_response(int)
 {
-       const set<Track *> &tracks = selection.get_tracks();
+       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));
 }
@@ -630,17 +630,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<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(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;
        }