Catalogue::Catalogue():
scale(1),
- gauge(1.524)
+ gauge(1.524),
+ layout(*this)
{ }
Catalogue::~Catalogue()
delete i->second;
}
-TrackType &Catalogue::get_track(unsigned art_nr) const
+void Catalogue::add_track(TrackType &track)
+{
+ if(tracks.count(track.get_article_number()))
+ throw Exception("Duplicate track type");
+
+ tracks[track.get_article_number()] = &track;
+ signal_track_added.emit(track);
+}
+
+void Catalogue::add_locomotive(LocoType &loco)
+{
+ if(locos.count(loco.get_article_number()))
+ throw Exception("Duplicate track type");
+
+ locos[loco.get_article_number()] = &loco;
+ signal_loco_added.emit(loco);
+}
+
+const TrackType &Catalogue::get_track(unsigned art_nr) const
{
map<unsigned, TrackType *>::const_iterator i=tracks.find(art_nr);
if(i==tracks.end())
return *i->second;
}
-LocoType &Catalogue::get_locomotive(unsigned art_nr) const
+const LocoType &Catalogue::get_locomotive(unsigned art_nr) const
{
map<unsigned, LocoType *>::const_iterator i=locos.find(art_nr);
if(i==locos.end())
{
add("ballast_profile", &Loader::ballast_profile);
add("gauge", &Loader::gauge);
+ add("layout", &Loader::layout);
add("locomotive", &Loader::locomotive);
add("rail_profile", &Loader::rail_profile);
add("scale", &Loader::scale);
void Catalogue::Loader::gauge(float g)
{
obj.gauge = g/1000;
+ obj.path_profile = Profile();
+ obj.path_profile.append_point(Point(0.1*obj.gauge, 0));
+ obj.path_profile.append_point(Point(-0.1*obj.gauge, 0));
}
-void Catalogue::Loader::locomotive(unsigned art_nr)
+void Catalogue::Loader::layout()
{
- if(obj.locos.count(art_nr))
- throw Exception("Duplicate locomotive number");
+ load_sub(obj.layout);
+}
+void Catalogue::Loader::locomotive(unsigned art_nr)
+{
RefPtr<LocoType> loco = new LocoType(art_nr);
load_sub(*loco);
- obj.locos[art_nr] = loco.release();
+ obj.add_locomotive(*loco);
+ loco.release();
}
void Catalogue::Loader::rail_profile()
void Catalogue::Loader::track(unsigned art_nr)
{
- if(obj.tracks.count(art_nr))
- throw Exception("Duplicate track number");
-
RefPtr<TrackType> trk = new TrackType(art_nr);
load_sub(*trk);
- obj.tracks[art_nr] = trk.release();
+ obj.add_track(*trk);
+ trk.release();
}
} // namespace Marklin