Improve algorithms in several editing tools

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

diff --git a/source/designer/extendtool.cpp b/source/designer/extendtool.cpp
index ec4e7f685e9cb037d2b22182df965f68f8bd956d..aa0f72384e2543ec0c73e9abf32de82b4afef168 100644 (file)
--- a/source/designer/extendtool.cpp
+++ b/source/designer/extendtool.cpp
@@ -7,21 +7,20 @@ using namespace std;
 using namespace Msp;
 using namespace R2C2;
 
-ExtendTool::ExtendTool(Designer &d, Input::Mouse &m, const set<Object *> &o):
+ExtendTool::ExtendTool(Designer &d, Input::Mouse &m, const set<Object *> &objects):
        Tool(d, m),
-       objects(o),
        accepted(false)
 {
-       bool ok = false;
-       for(set<Object *>::const_iterator i=objects.begin(); (!ok && i!=objects.end()); ++i)
-               if(Track *track = dynamic_cast<Track *>(*i))
+       for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+               if(Track *t = dynamic_cast<Track *>(*i))
                {
-                       const vector<Track *> &links = track->get_links();
-                       for(vector<Track *>::const_iterator j=links.begin(); (!ok && j!=links.end()); ++j)
-                               ok = !*j;
+                       unsigned nls = t->get_n_link_slots();
+                       for(unsigned j=0; j<nls; ++j)
+                               if(!t->get_link(j))
+                                       unlinked_endpoints.push_back(TrackIter(t, j));
                }
 
-       if(!ok)
+       if(unlinked_endpoints.empty())
        {
                done = true;
                set_status("No free endpoints");
@@ -39,50 +38,30 @@ ExtendTool::~ExtendTool()
 
 void ExtendTool::connect()
 {
-       if(objects.size()!=2)
-       {
-               signal_status.emit("Exactly two tracks must be selected");
-               return;
-       }
-
-       Track *track1 = dynamic_cast<Track *>(*objects.begin());
-       Track *track2 = dynamic_cast<Track *>(*--objects.end());
-       if(!track1 || !track2)
-       {
-               signal_status.emit("Exactly two tracks must be selected");
-               return;
-       }
-
        float limit = designer.get_layout().get_catalogue().get_gauge()/10;
 
-       Snap sn1;
+       Track *start_track = 0;
+       Track *end_track = 0;
+       Snap start_sn;
        bool ok = false;
        float gap = 0;
-       unsigned nls1 = track1->get_n_link_slots();
-       unsigned nls2 = track2->get_n_link_slots();
-       for(unsigned i=0; i<nls1; ++i)
+       for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
        {
-               if(track1->get_link(i))
-                       continue;
-
-               sn1 = track1->get_snap_node(i);
+               start_sn = (*i)->get_snap_node(i->entry());
                
-               for(unsigned j=0; j<nls2; ++j)
+               for(vector<TrackIter>::const_iterator j=i; ++j!=unlinked_endpoints.end(); )
                {
-                       if(track2->get_link(j))
-                               continue;
+                       Snap end_sn = (*j)->get_snap_node(j->entry());
 
-                       Snap sn2 = track2->get_snap_node(j);
-
-                       float dz = sn2.position.z-sn1.position.z;
+                       float dz = end_sn.position.z-start_sn.position.z;
                        if(abs(dz)>0.02)
                                continue;
 
-                       Angle adiff = wrap_balanced(sn1.rotation+Angle::half_turn()-sn2.rotation);
+                       Angle adiff = wrap_balanced(start_sn.rotation+Angle::half_turn()-end_sn.rotation);
                        if(abs(adiff).radians()>0.01)
                                continue;
 
-                       Vector delta = rotated_vector(sn2.position-sn1.position, -sn1.rotation);
+                       Vector delta = rotated_vector(end_sn.position-start_sn.position, -start_sn.rotation);
                        if(abs(delta.y)>limit)
                                continue;
 
@@ -103,7 +82,7 @@ void ExtendTool::connect()
                return;
        }
 
-       extend_tracks = create_straight(sn1.position, sn1.rotation, gap, limit);
+       extend_tracks = create_straight(start_sn.position, start_sn.rotation, gap, limit);
 
        if(extend_tracks.empty())
        {
@@ -111,8 +90,8 @@ void ExtendTool::connect()
                return;
        }
 
-       extend_tracks.front()->link_to(*track1);
-       extend_tracks.back()->link_to(*track2);
+       extend_tracks.front()->link_to(*start_track);
+       extend_tracks.back()->link_to(*end_track);
 
        accepted = true;
        set_done();
@@ -122,7 +101,7 @@ void ExtendTool::button_press(unsigned btn)
 {
        if(btn==1)
        {
-               for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+               for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
                        if(extend_tracks.front()->link_to(**i))
                                break;
                accepted = true;
@@ -140,24 +119,17 @@ void ExtendTool::axis_motion(unsigned axis, float value, float rel)
        Angle dir;
        float length = 0;
 
-       for(set<Object *>::const_iterator i=objects.begin(); i!=objects.end(); ++i)
+       for(vector<TrackIter>::const_iterator i=unlinked_endpoints.begin(); i!=unlinked_endpoints.end(); ++i)
        {
-               unsigned nls = (*i)->get_n_link_slots();
-               for(unsigned j=0; j<nls; ++j)
-               {
-                       if((*i)->get_link(j))
-                               continue;
-
-                       Snap sn = (*i)->get_snap_node(j);
-                       Vector delta = rotated_vector(ground_pointer-sn.position, -sn.rotation);
+               Snap sn = (*i)->get_snap_node(i->entry());
+               Vector delta = rotated_vector(ground_pointer-sn.position, -sn.rotation);
 
-                       if(delta.x<length)
-                               continue;
+               if(delta.x<length)
+                       continue;
 
-                       pos = sn.position;
-                       dir = sn.rotation;
-                       length = delta.x;
-               }
+               pos = sn.position;
+               dir = sn.rotation;
+               length = delta.x;
        }
 
        if(length)