X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fextendtool.cpp;h=54d3d10b8081dca2610f5f418470c6f0504f64e7;hb=5929b101ee38b5668b328e7b1eac4bf49c912412;hp=e35b4abcf13a43c46a53861472cb127a7466bb49;hpb=67785b72b333d539f779343ea674400e923c328e;p=r2c2.git

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index e35b4ab..54d3d10 100644
--- a/source/designer/extendtool.cpp
+++ b/source/designer/extendtool.cpp
@@ -7,9 +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),
-	accepted(false)
+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))
@@ -22,9 +22,23 @@ ExtendTool::ExtendTool(Designer &d, Input::Mouse &m, const set<Object *> &object
 
 	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()
@@ -38,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;
@@ -48,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(); )
 		{
@@ -79,6 +94,7 @@ void ExtendTool::connect()
 	if(!ok)
 	{
 		set_status("No aligned endpoints found");
+		set_done(false);
 		return;
 	}
 
@@ -87,34 +103,18 @@ void ExtendTool::connect()
 	if(extend_tracks.empty())
 	{
 		set_status("No connection possible");
+		set_done(false);
 		return;
 	}
 
 	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,24 +163,20 @@ void ExtendTool::axis_motion(unsigned axis, float value, float rel)
 	}
 }
 
-vector<Track *> ExtendTool::create_straight(const Vector &start, const Angle &dir, float length, float limit)
+void ExtendTool::finish()
 {
-	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)
+	if(!extend_tracks.empty())
 	{
-		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());
+		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)
+{
 	vector<float> lengths;
+	unsigned preference = max_preference;
 	float removed = 0;
 	while(length>limit)
 	{