/* $Id$
This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
Distributed under the GPL
*/
#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include "catalogue.h"
-#include "locotype.h"
#include "tracktype.h"
+#include "vehicletype.h"
using namespace std;
using namespace Msp;
namespace Marklin {
+Catalogue::Catalogue():
+ scale(1),
+ gauge(1.524),
+ layout(*this)
+{ }
+
Catalogue::~Catalogue()
{
for(map<unsigned, TrackType *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
delete i->second;
- for(map<unsigned, LocoType *>::iterator i=locos.begin(); i!=locos.end(); ++i)
+ for(map<unsigned, VehicleType *>::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
delete i->second;
}
-TrackType &Catalogue::get_track(unsigned art_nr) const
+float Catalogue::get_rail_elevation() const
+{
+ return ballast_profile.get_height()+rail_profile.get_height();
+}
+
+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);
+}
+
+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
+void Catalogue::add_vehicle(VehicleType &veh)
{
- map<unsigned, LocoType *>::const_iterator i=locos.find(art_nr);
- if(i==locos.end())
- throw KeyError("Unknown locomotive type");
+ if(vehicles.count(veh.get_article_number()))
+ throw Exception("Duplicate vehicle type");
+
+ vehicles[veh.get_article_number()] = &veh;
+ signal_vehicle_added.emit(veh);
+}
+
+const VehicleType &Catalogue::get_vehicle(unsigned art_nr) const
+{
+ map<unsigned, VehicleType *>::const_iterator i = vehicles.find(art_nr);
+ if(i==vehicles.end())
+ throw KeyError("Unknown vehicle type");
return *i->second;
}
Catalogue::Loader::Loader(Catalogue &c):
DataFile::BasicLoader<Catalogue>(c)
{
- add("locomotive", &Loader::locomotive);
+ add("ballast_profile", &Loader::ballast_profile);
+ add("gauge", &Loader::gauge);
+ add("layout", &Loader::layout);
+ add("rail_profile", &Loader::rail_profile);
+ add("scale", &Loader::scale);
add("track", &Loader::track);
+ add("vehicle", &Loader::vehicle);
}
-void Catalogue::Loader::locomotive(unsigned art_nr)
+void Catalogue::Loader::ballast_profile()
{
- if(obj.locos.count(art_nr))
- throw Exception("Duplicate locomotive number");
+ load_sub(obj.ballast_profile);
+}
- RefPtr<LocoType> loco = new LocoType(art_nr);
- load_sub(*loco);
- obj.locos[art_nr] = loco.release();
+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::track(unsigned art_nr)
+void Catalogue::Loader::layout()
{
- if(obj.tracks.count(art_nr))
- throw Exception("Duplicate track number");
+ load_sub(obj.layout);
+}
+void Catalogue::Loader::rail_profile()
+{
+ load_sub(obj.rail_profile);
+}
+
+void Catalogue::Loader::scale(float n, float d)
+{
+ obj.scale = n/d;
+}
+
+void Catalogue::Loader::track(unsigned art_nr)
+{
RefPtr<TrackType> trk = new TrackType(art_nr);
load_sub(*trk);
- obj.tracks[art_nr] = trk.release();
+ obj.add_track(*trk);
+ trk.release();
+}
+
+void Catalogue::Loader::vehicle(unsigned art_nr)
+{
+ RefPtr<VehicleType> veh = new VehicleType(art_nr);
+ load_sub(*veh);
+ obj.add_vehicle(*veh);
+ veh.release();
}
} // namespace Marklin