Fix a bug with attaching ends in ExtendTool

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

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index a5dea819a192132aca5454864203bcc7dddf8bb1..9b6ec9ab606474bd5c1facfdd9d2b623fb86d80c 100644 (file)
--- 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))
@@ -21,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()
@@ -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,29 +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::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)
        {