X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fextendtool.cpp;h=9b6ec9ab606474bd5c1facfdd9d2b623fb86d80c;hb=50462807446fd62dbacfba90a7afffc1ff70d3b1;hp=2a66181f32772c44557aef23fc64cd3479a65c27;hpb=7c98e23312cf01ce1fa6c1ffd8e36c22d2fa6110;p=r2c2.git

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index 2a66181..9b6ec9a 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,9 +22,23 @@ 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);
 	}
+
+	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()
@@ -37,7 +52,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 +62,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_appearance().get_gauge()/10;
 		
 		for(vector<TrackIter>::const_iterator j=i; ++j!=unlinked_endpoints.end(); )
 		{
@@ -68,6 +84,8 @@ void ExtendTool::connect()
 			if(gap<0)
 				continue;
 
+			start_track = i->track();
+			end_track = j->track();
 			ok = true;
 		}
 
@@ -78,6 +96,7 @@ void ExtendTool::connect()
 	if(!ok)
 	{
 		set_status("No aligned endpoints found");
+		set_done(false);
 		return;
 	}
 
@@ -86,6 +105,7 @@ void ExtendTool::connect()
 	if(extend_tracks.empty())
 	{
 		set_status("No connection possible");
+		set_done(false);
 		return;
 	}
 
@@ -147,30 +167,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::ObjectMap &object_types = designer.get_catalogue().get_all();
-	map<float, const TrackType *> types_by_length;
-	unsigned preference = 0;
-	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;
-			preference = max(preference, tt->get_autofit_preference());
-		}
-
 	vector<float> lengths;
+	unsigned preference = max_preference;
 	float removed = 0;
 	while(length>limit)
 	{