Turn TrackPart into a proper class

[r2c2.git] / source / 3d / layout.cpp

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index a8fbc1ea0706ea61e08ecb1f2550d3d168e0e3f3..1a557153fda308ce56a18066e281ca2e3e1b8830 100644 (file)
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -26,6 +26,7 @@ Layout3D::Layout3D(Layout &l):
 {
        layout.signal_track_added.connect(sigc::mem_fun(this, &Layout3D::track_added));
        layout.signal_track_removed.connect(sigc::mem_fun(this, &Layout3D::track_removed));
+       layout.signal_train_added.connect(sigc::mem_fun(this, &Layout3D::train_added));
 
        const set<Track *> &ltracks = layout.get_tracks();
        for(set<Track *>::iterator i=ltracks.begin(); i!=ltracks.end(); ++i)
@@ -36,6 +37,8 @@ Layout3D::~Layout3D()
 {
        while(!tracks.empty())
                delete tracks.front();
+       while(!trains.empty())
+               delete trains.front();
 }
 
 void Layout3D::add_track(Track3D &t)
@@ -95,6 +98,27 @@ Track3D *Layout3D::pick_track(float x, float y, float size) const
        return track;
 }
 
+void Layout3D::add_train(Train3D &t)
+{
+       trains.push_back(&t);
+}
+
+void Layout3D::remove_train(Train3D &t)
+{
+       list<Train3D *>::iterator i = find(trains.begin(), trains.end(), &t);
+       if(i!=trains.end())
+               trains.erase(i);
+}
+
+Train3D &Layout3D::get_train(const Train &t) const
+{
+       for(list<Train3D *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+               if(&(*i)->get_train()==&t)
+                       return **i;
+
+       throw KeyError("Unknown train");
+}
+
 void Layout3D::track_added(Track &t)
 {
        new Track3D(*this, t);
@@ -110,4 +134,9 @@ void Layout3D::track_removed(Track &t)
                }
 }
 
+void Layout3D::train_added(Train &t)
+{
+       new Train3D(*this, t);
+}
+
 } // namespace Marklin