X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrafficmanager.cpp;h=069731e060ae3a80e741a754fa83519af0b6da59;hb=38fb8d56efde037a71c46a58bda314655e68ab6c;hp=9666f12a1996bb8a41a5096ce2ad6eca347ad042;hpb=540e931ec79129c8776f48434ff5b230b53337f1;p=r2c2.git

diff --git a/source/libmarklin/trafficmanager.cpp b/source/libmarklin/trafficmanager.cpp
index 9666f12..069731e 100644
--- a/source/libmarklin/trafficmanager.cpp
+++ b/source/libmarklin/trafficmanager.cpp
@@ -1,14 +1,18 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
 #include <algorithm>
+#include <msp/datafile/writer.h>
 #include <msp/time/utils.h>
+#include "catalogue.h"
 #include "control.h"
 #include "layout.h"
+#include "locotype.h"
+#include "tracktype.h"
 #include "trafficmanager.h"
 #include "turnout.h"
 
@@ -21,19 +25,19 @@ TrafficManager::TrafficManager(Control &c, Layout &l):
 	control(c),
 	layout(l)
 {
-	const set<Track *> &tracks=layout.get_tracks();
+	const set<Track *> &tracks = layout.get_tracks();
 
 	set<Track *> used_tracks;
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		if(unsigned tid=(*i)->get_turnout_id())
-			new Turnout(control, tid);
+			new Turnout(control, tid, (*i)->get_type().get_n_routes()>=3);
 		if(unsigned sid=(*i)->get_sensor_id())
 			new Sensor(control, sid);
 
 		if(used_tracks.count(*i)==0)
 		{
-			Block *block=new Block(*this, **i);
+			Block *block = new Block(*this, **i);
 			blocks.push_back(block);
 			used_tracks.insert(block->get_tracks().begin(), block->get_tracks().end());
 		}
@@ -57,7 +61,7 @@ Block &TrafficManager::get_block_by_track(const Track &t) const
 {
 	for(list<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
 	{
-		const set<Track *> &tracks=(*i)->get_tracks();
+		const set<Track *> &tracks = (*i)->get_tracks();
 		if(tracks.count(const_cast<Track *>(&t)))
 			return **i;
 	}
@@ -73,14 +77,47 @@ void TrafficManager::add_train(Train *t)
 
 void TrafficManager::tick()
 {
-	Time::TimeStamp t=Time::now();
+	Time::TimeStamp t = Time::now();
+	Time::TimeDelta dt;
+	if(last_tick)
+		dt = t-last_tick;
+	last_tick = t;
 
 	for(list<Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
-		(*i)->tick(t);
+		(*i)->tick(t, dt);
+}
+
+void TrafficManager::save(const string &fn) const
+{
+	IO::BufferedFile out(fn, IO::M_WRITE);
+	DataFile::Writer writer(out);
+	for(list<Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+	{
+		const Locomotive &loco = (*i)->get_locomotive();
+		DataFile::Statement st("train");
+		st.append(loco.get_type().get_article_number());
+		st.append(loco.get_address());
+		(*i)->save(st.sub);
+		writer.write(st);
+	}
 }
 
 void TrafficManager::turnout_route_changed(unsigned, Turnout *)
 {
 }
 
+
+TrafficManager::Loader::Loader(TrafficManager &tm):
+	DataFile::BasicLoader<TrafficManager>(tm)
+{
+	add("train", &Loader::train);
+}
+
+void TrafficManager::Loader::train(unsigned art_nr, unsigned addr)
+{
+	Locomotive *loco = new Locomotive(obj.layout.get_catalogue().get_locomotive(art_nr), obj.control, addr);
+	Train *trn = new Train(obj, *loco);
+	load_sub(*trn);
+}
+
 } // namespace Marklin