X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fextendtool.cpp;h=021f184a8fb89a4393a9b8dfa6525691ad0da426;hb=d5de37274a309d55706b5077cfcc60ef753fa97d;hp=a5dea819a192132aca5454864203bcc7dddf8bb1;hpb=0c0a16e5f0f41efddb6f3ff920e54a5a11e1841d;p=r2c2.git

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index a5dea81..021f184 100644
--- a/source/designer/extendtool.cpp
+++ b/source/designer/extendtool.cpp
@@ -7,8 +7,9 @@ using namespace std;
 using namespace Msp;
 using namespace R2C2;
 
-ExtendTool::ExtendTool(Designer &d, Input::Mouse &m, const set<Object *> &objects):
-	Tool(d, m)
+ExtendTool::ExtendTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const set<Object *> &objects):
+	Tool(d, k, m),
+	max_preference(0)
 {
 	for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
 		if(Track *t = dynamic_cast<Track *>(*i))
@@ -24,6 +25,20 @@ ExtendTool::ExtendTool(Designer &d, Input::Mouse &m, const set<Object *> &object
 		done = true;
 		set_status("No free endpoints");
 	}
+
+	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;
+
+			types_by_length[parts.front().get_length()] = tt;
+			max_preference = max(max_preference, tt->get_autofit_preference());
+		}
 }
 
 ExtendTool::~ExtendTool()
@@ -154,22 +169,8 @@ void ExtendTool::finish()
 
 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();
-	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;
-
-		types_by_length[parts.front().get_length()] = i->second;
-		preference = max(preference, i->second->get_autofit_preference());
-	}
-
 	vector<float> lengths;
+	unsigned preference = max_preference;
 	float removed = 0;
 	while(length>limit)
 	{