Convert Catalogue to a Collection

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

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index 163729e297509db776b64366f5d358796f60c466..c31c09f951149429182609d3ecaa7d9dd09aef27 100644 (file)
--- a/source/designer/extendtool.cpp
+++ b/source/designer/extendtool.cpp
@@ -26,19 +26,18 @@ ExtendTool::ExtendTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const s
                set_done(false);
        }
 
-       const Catalogue::ObjectMap &object_types = designer.get_catalogue().get_all();
-       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;
+       list<TrackType *> track_types = designer.get_catalogue().get_list<TrackType>();
+       for(list<TrackType *>::iterator i=track_types.begin(); i!=track_types.end(); ++i)
+       {
+               const vector<TrackPart> &parts = (*i)->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()] = tt;
-                       max_preference = max(max_preference, tt->get_autofit_preference());
-               }
+               types_by_length[parts.front().get_length()] = *i;
+               max_preference = max(max_preference, (*i)->get_autofit_preference());
+       }
 }
 
 ExtendTool::~ExtendTool()
@@ -52,7 +51,7 @@ ExtendTool::~ExtendTool()
 
 void ExtendTool::connect()
 {
-       float limit = designer.get_layout().get_catalogue().get_gauge()/10;
+       float limit;
 
        Track *start_track = 0;
        Track *end_track = 0;
@@ -62,6 +61,7 @@ void ExtendTool::connect()
        for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
        {
                start_sn = (*i)->get_snap_node(i->entry());
+               limit = (*i)->get_type().get_gauge()/10;
                
                for(vector<TrackIter>::const_iterator j=i; ++j!=unlinked_endpoints.end(); )
                {
@@ -83,6 +83,8 @@ void ExtendTool::connect()
                        if(gap<0)
                                continue;
 
+                       start_track = i->track();
+                       end_track = j->track();
                        ok = true;
                }