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))
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());
}
}
void ExtendTool::connect()
{
- float limit = designer.get_layout().get_catalogue().get_gauge()/10;
+ float limit;
Track *start_track = 0;
Track *end_track = 0;
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(); )
{
if(gap<0)
continue;
+ start_track = i->track();
+ end_track = j->track();
ok = true;
}
if(!ok)
{
set_status("No aligned endpoints found");
+ set_done(false);
return;
}
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;
}
}
-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)
{
void ExtendTool::update_selection(Selection &sel) const
{
- sel.replace(extend_tracks.begin(), extend_tracks.end());
+ if(accepted)
+ sel.replace(extend_tracks.begin(), extend_tracks.end());
}