X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Ftrain.cpp;h=307b1b7da0f2903cc526b348fcdc291af3970815;hb=d88bc162df8b34f2ca966524222880033132da0f;hp=d5b2b226721c961fb88b96753434d665f1f0180d;hpb=f06c2b89a2601981aae84d0f971c07816dc1bab4;p=r2c2.git

diff --git a/source/libmarklin/train.cpp b/source/libmarklin/train.cpp
index d5b2b22..307b1b7 100644
--- a/source/libmarklin/train.cpp
+++ b/source/libmarklin/train.cpp
@@ -16,6 +16,7 @@ Distributed under the GPL
 #include "locotype.h"
 #include "route.h"
 #include "simplephysics.h"
+#include "timetable.h"
 #include "tracktype.h"
 #include "train.h"
 #include "vehicle.h"
@@ -31,6 +32,7 @@ Train::Train(Layout &l, const LocoType &t, unsigned a):
 	address(a),
 	pending_block(0),
 	control(new AIControl(*this, new SimplePhysics)),
+	timetable(0),
 	active(false),
 	current_speed(0),
 	speed_changing(false),
@@ -55,6 +57,8 @@ Train::Train(Layout &l, const LocoType &t, unsigned a):
 	layout.signal_block_reserved.connect(sigc::mem_fun(this, &Train::block_reserved));
 	layout.get_driver().signal_sensor.connect(sigc::mem_fun(this, &Train::sensor_event));
 	layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Train::turnout_event));
+
+	control->signal_control_changed.connect(signal_control_changed);
 }
 
 Train::~Train()
@@ -88,7 +92,6 @@ const Vehicle &Train::get_vehicle(unsigned i) const
 void Train::set_control(const string &n, float v)
 {
 	control->set_control(n, v);
-	signal_control_changed.emit(n, control->get_control(n).value);
 }
 
 void Train::set_active(bool a)
@@ -299,6 +302,8 @@ void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 		stop_timeout = Time::TimeStamp();
 	}
 
+	if(timetable)
+		timetable->tick(t);
 	control->tick(dt);
 	float speed = control->get_speed();
 	unsigned speed_notch = find_speed(abs(speed));
@@ -369,6 +374,13 @@ void Train::save(list<DataFile::Statement> &st) const
 
 	if(route)
 		st.push_back((DataFile::Statement("route"), route->get_name()));
+
+	if(timetable)
+	{
+		DataFile::Statement ss("timetable");
+		timetable->save(ss.sub);
+		st.push_back(ss);
+	}
 }
 
 void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
@@ -772,6 +784,7 @@ Train::Loader::Loader(Train &t):
 	add("name",        &Loader::name);
 	add("real_speed",  &Loader::real_speed);
 	add("route",       &Loader::route);
+	add("timetable",   &Loader::timetable);
 }
 
 void Train::Loader::block(unsigned id)
@@ -816,4 +829,13 @@ void Train::Loader::route(const string &n)
 	obj.set_route(&obj.layout.get_route(n));
 }
 
+void Train::Loader::timetable()
+{
+	if(obj.timetable)
+		throw InvalidState("A timetable has already been loaded");
+
+	obj.timetable = new Timetable(obj);
+	load_sub(*obj.timetable);
+}
+
 } // namespace Marklin