X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fextendtool.cpp;h=8698fd52e6aabc048b348d49b796a06c236fb3e2;hb=b860a56bd9bc8894311c02d7673f379beff3220b;hp=3af4cf6cd0b1398f719e79346e3151794ff52939;hpb=a7bce7810670436ab667c034c80291b2f712d2a2;p=r2c2.git

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index 3af4cf6..8698fd5 100644
--- a/source/designer/extendtool.cpp
+++ b/source/designer/extendtool.cpp
@@ -8,7 +8,8 @@ using namespace Msp;
 using namespace R2C2;
 
 ExtendTool::ExtendTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const set<Object *> &objects):
-	Tool(d, k, m)
+	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))
@@ -21,8 +22,21 @@ ExtendTool::ExtendTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const s
 
 	if(unlinked_endpoints.empty())
 	{
-		done = true;
 		set_status("No free endpoints");
+		set_done(false);
+	}
+
+	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()] = *i;
+		max_preference = max(max_preference, (*i)->get_autofit_preference());
 	}
 }
 
@@ -37,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;
@@ -47,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(); )
 		{
@@ -68,6 +83,8 @@ void ExtendTool::connect()
 			if(gap<0)
 				continue;
 
+			start_track = i->track();
+			end_track = j->track();
 			ok = true;
 		}
 
@@ -78,6 +95,7 @@ void ExtendTool::connect()
 	if(!ok)
 	{
 		set_status("No aligned endpoints found");
+		set_done(false);
 		return;
 	}
 
@@ -86,6 +104,7 @@ void ExtendTool::connect()
 	if(extend_tracks.empty())
 	{
 		set_status("No connection possible");
+		set_done(false);
 		return;
 	}
 
@@ -124,20 +143,20 @@ void ExtendTool::pointer_motion()
 				delete *i;
 			extend_tracks = trks;
 
-			map<ArticleNumber, unsigned> counts;
+			map<const TrackType *, unsigned> counts;
 			length = 0;
 			for(vector<Track *>::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i)
 			{
 				length += (*i)->get_type().get_total_length();
-				++counts[(*i)->get_type().get_article_number()];
+				++counts[&(*i)->get_type()];
 			}
 
 			string detail;
-			for(map<ArticleNumber, unsigned>::const_iterator i=counts.begin(); i!=counts.end(); ++i)
+			for(map<const TrackType *, unsigned>::const_iterator i=counts.begin(); i!=counts.end(); ++i)
 			{
 				if(!detail.empty())
 					detail += ", ";
-				detail += format("%dx %s", i->second, i->first);
+				detail += format("%dx %s", i->second, i->first->get_article_number());
 			}
 
 			signal_status.emit(format("Extend: %.0fmm (%s)", length*1000, detail));
@@ -147,29 +166,18 @@ void ExtendTool::pointer_motion()
 
 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;
+	if(!extend_tracks.empty())
+	{
+		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();
-	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)
 	{