Add accessors adding things to a Catalogue from the outside

[r2c2.git] / source / libmarklin / catalogue.cpp

diff --git a/source/libmarklin/catalogue.cpp b/source/libmarklin/catalogue.cpp
index cce5ef04ee564d3b2bd7f8b78278e89a0ccab3ff..bb724bc823868bc8beb12b8ec968258ae80ad324 100644 (file)
--- a/source/libmarklin/catalogue.cpp
+++ b/source/libmarklin/catalogue.cpp
@@ -30,7 +30,25 @@ 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())
@@ -39,7 +57,7 @@ TrackType &Catalogue::get_track(unsigned art_nr) const
        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())
@@ -78,12 +96,10 @@ void Catalogue::Loader::layout()
 
 void Catalogue::Loader::locomotive(unsigned art_nr)
 {
-       if(obj.locos.count(art_nr))
-               throw Exception("Duplicate locomotive number");
-
        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()
@@ -98,12 +114,10 @@ void Catalogue::Loader::scale(float n, float d)
 
 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