X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2F3d%2Flayout.cpp;h=1a557153fda308ce56a18066e281ca2e3e1b8830;hb=9b68c21ebf8ce26d92246ecd4a392d2908b511f7;hp=b95d4e59c835798d2df81530d060e6e7303bff7d;hpb=c0c5a34d1056eabdebd350da3534e24c902c0dac;p=r2c2.git

diff --git a/source/3d/layout.cpp b/source/3d/layout.cpp
index b95d4e5..1a55715 100644
--- a/source/3d/layout.cpp
+++ b/source/3d/layout.cpp
@@ -22,11 +22,11 @@ namespace Marklin {
 
 Layout3D::Layout3D(Layout &l):
 	layout(l),
-	catalogue(layout.get_catalogue()),
-	quality(4)
+	catalogue(layout.get_catalogue())
 {
 	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)
@@ -37,11 +37,8 @@ Layout3D::~Layout3D()
 {
 	while(!tracks.empty())
 		delete tracks.front();
-}
-
-void Layout3D::set_quality(unsigned q)
-{
-	quality = q;
+	while(!trains.empty())
+		delete trains.front();
 }
 
 void Layout3D::add_track(Track3D &t)
@@ -101,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);
@@ -116,4 +134,9 @@ void Layout3D::track_removed(Track &t)
 		}
 }
 
+void Layout3D::train_added(Train &t)
+{
+	new Train3D(*this, t);
+}
+
 } // namespace Marklin