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))
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;
}
delete *i;
extend_tracks = trks;
- map<ArticleNumber, unsigned> counts;
+ map<const TrackType *, unsigned> counts;
length = 0;
for(vector<Track *>::iterator i=extend_tracks.begin(); i!=extend_tracks.end(); ++i)
{
length += (*i)->get_type().get_total_length();
- ++counts[(*i)->get_type().get_article_number()];
+ ++counts[&(*i)->get_type()];
}
string detail;
- for(map<ArticleNumber, unsigned>::const_iterator i=counts.begin(); i!=counts.end(); ++i)
+ for(map<const TrackType *, unsigned>::const_iterator i=counts.begin(); i!=counts.end(); ++i)
{
if(!detail.empty())
detail += ", ";
- detail += format("%dx %s", i->second, i->first);
+ detail += format("%dx %s", i->second, i->first->get_article_number());
}
signal_status.emit(format("Extend: %.0fmm (%s)", length*1000, detail));
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)
{