Use generic ObjectTypes in Catalogue

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

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index e35b4abcf13a43c46a53861472cb127a7466bb49..2a66181f32772c44557aef23fc64cd3479a65c27 100644 (file)
--- a/source/designer/extendtool.cpp
+++ b/source/designer/extendtool.cpp
@@ -7,9 +7,8 @@ using namespace std;
 using namespace Msp;
 using namespace R2C2;
 
-ExtendTool::ExtendTool(Designer &d, Input::Mouse &m, const set<Object *> &objects):
-       Tool(d, m),
-       accepted(false)
+ExtendTool::ExtendTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const set<Object *> &objects):
+       Tool(d, k, m)
 {
        for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
                if(Track *t = dynamic_cast<Track *>(*i))
@@ -93,28 +92,11 @@ void ExtendTool::connect()
        extend_tracks.front()->link_to(*start_track);
        extend_tracks.back()->link_to(*end_track);
 
-       accepted = true;
-       set_done();
+       set_done(true);
 }
 
-void ExtendTool::button_press(unsigned btn)
+void ExtendTool::pointer_motion()
 {
-       if(btn==1)
-       {
-               for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
-                       if(extend_tracks.front()->link_to(**i))
-                               break;
-               accepted = true;
-               set_done();
-       }
-       else if(btn==3)
-               set_done();
-}
-
-void ExtendTool::axis_motion(unsigned axis, float value, float rel)
-{
-       Tool::axis_motion(axis, value, rel);
-
        Vector pos;
        Angle dir;
        float length = 0;
@@ -163,22 +145,30 @@ void ExtendTool::axis_motion(unsigned axis, float value, float rel)
        }
 }
 
+void ExtendTool::finish()
+{
+       for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
+               if(extend_tracks.front()->link_to(**i))
+                       break;
+}
+
 vector<Track *> ExtendTool::create_straight(const Vector &start, const Angle &dir, float length, float limit)
 {
-       const Catalogue::TrackMap &track_types = designer.get_catalogue().get_tracks();
+       const Catalogue::ObjectMap &object_types = designer.get_catalogue().get_all();
        map<float, const TrackType *> types_by_length;
        unsigned preference = 0;
-       for(Catalogue::TrackMap::const_iterator i=track_types.begin(); i!=track_types.end(); ++i)
-       {
-               const vector<TrackPart> &parts = i->second->get_parts();
-               if(parts.size()!=1)
-                       continue;
-               if(parts.front().is_curved() || parts.front().is_dead_end())
-                       continue;
+       for(Catalogue::ObjectMap::const_iterator i=object_types.begin(); i!=object_types.end(); ++i)
+               if(const TrackType *tt = dynamic_cast<const TrackType *>(i->second))
+               {
+                       const vector<TrackPart> &parts = tt->get_parts();
+                       if(parts.size()!=1)
+                               continue;
+                       if(parts.front().is_curved() || parts.front().is_dead_end())
+                               continue;
 
-               types_by_length[parts.front().get_length()] = i->second;
-               preference = max(preference, i->second->get_autofit_preference());
-       }
+                       types_by_length[parts.front().get_length()] = tt;
+                       preference = max(preference, tt->get_autofit_preference());
+               }
 
        vector<float> lengths;
        float removed = 0;