-/* $Id$
-
-This file is part of R²C²
-Copyright © 2006-2010 Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
+#include <msp/core/maputils.h>
#include <msp/core/refptr.h>
#include <msp/datafile/parser.h>
#include "catalogue.h"
+#include "signaltype.h"
#include "tracktype.h"
#include "vehicletype.h"
{
for(TrackMap::iterator i=tracks.begin(); i!=tracks.end(); ++i)
delete i->second;
+ for(SignalMap::iterator i=signals.begin(); i!=signals.end(); ++i)
+ delete i->second;
for(VehicleMap::iterator i=vehicles.begin(); i!=vehicles.end(); ++i)
delete i->second;
}
void Catalogue::add_track(TrackType &track)
{
- if(tracks.count(track.get_article_number()))
- throw Exception("Duplicate track type");
-
- tracks[track.get_article_number()] = &track;
+ insert_unique(tracks, track.get_article_number(), &track);
signal_track_added.emit(track);
}
const TrackType &Catalogue::get_track(const ArticleNumber &art_nr) const
{
- TrackMap::const_iterator i=tracks.find(art_nr);
- if(i==tracks.end())
- throw KeyError("Unknown track type");
-
- return *i->second;
+ return *get_item(tracks, art_nr);
}
void Catalogue::add_vehicle(VehicleType &veh)
{
- if(vehicles.count(veh.get_article_number()))
- throw Exception("Duplicate vehicle type");
-
- vehicles[veh.get_article_number()] = &veh;
+ insert_unique(vehicles, veh.get_article_number(), &veh);
signal_vehicle_added.emit(veh);
}
const VehicleType &Catalogue::get_vehicle(const ArticleNumber &art_nr) const
{
- VehicleMap::const_iterator i = vehicles.find(art_nr);
- if(i==vehicles.end())
- throw KeyError("Unknown vehicle type");
+ return *get_item(vehicles, art_nr);
+}
- return *i->second;
+void Catalogue::add_signal(SignalType &sig)
+{
+ insert_unique(signals, sig.get_article_number(), &sig);
+ signal_signal_added.emit(sig);
+}
+
+const SignalType &Catalogue::get_signal(const ArticleNumber &art_nr) const
+{
+ return *get_item(signals, art_nr);
}
Catalogue::Loader::Loader(Catalogue &c):
- DataFile::BasicLoader<Catalogue>(c)
+ DataFile::ObjectLoader<Catalogue>(c)
{
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("signal", &Loader::signal);
add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+ add("track_technique", &Catalogue::track_technique);
add("vehicle", static_cast<void (Loader::*)(unsigned)>(&Loader::vehicle));
add("vehicle", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::vehicle));
}
{
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));
+ obj.path_profile.append_vertex(Vector(0.1*obj.gauge, 0, 0), false);
+ obj.path_profile.append_vertex(Vector(-0.1*obj.gauge, 0, 0), false);
}
void Catalogue::Loader::layout()
obj.scale = n/d;
}
+void Catalogue::Loader::signal(ArticleNumber art_nr)
+{
+ if(obj.signals.count(art_nr))
+ throw key_error(art_nr);
+
+ RefPtr<SignalType> sig = new SignalType(art_nr);
+ load_sub(*sig);
+ obj.add_signal(*sig.release());
+}
+
void Catalogue::Loader::track(unsigned art_nr)
{
track(ArticleNumber(art_nr));
void Catalogue::Loader::track(ArticleNumber art_nr)
{
if(obj.tracks.count(art_nr))
- throw KeyError("Duplicate track type", art_nr.str());
+ throw key_error(art_nr);
RefPtr<TrackType> trk = new TrackType(art_nr);
load_sub(*trk);
void Catalogue::Loader::vehicle(ArticleNumber art_nr)
{
if(obj.vehicles.count(art_nr))
- throw KeyError("Duplicate vehicle type", art_nr.str());
+ throw key_error(art_nr);
RefPtr<VehicleType> veh = new VehicleType(art_nr);
load_sub(*veh);