X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibmarklin%2Flayout.cpp;h=f8ad397f183992507ea2eb0140d1d2ae20bccf2c;hb=2029c5e4220e0809a39744a28ca9e2ff22e8ad28;hp=bd9ee712d5370ae5b7aac5afc180102fefdc6614;hpb=38fb8d56efde037a71c46a58bda314655e68ab6c;p=r2c2.git

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index bd9ee71..f8ad397 100644
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -1,77 +1,246 @@
 /* $Id$
 
 This file is part of the MSP Märklin suite
-Copyright © 2006-2009 Mikkosoft Productions, Mikko Rasa
+Copyright © 2006-2010  Mikkosoft Productions, Mikko Rasa
 Distributed under the GPL
 */
 
+#include <algorithm>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
 #include <msp/datafile/writer.h>
+#include <msp/io/print.h>
+#include <msp/time/utils.h>
+#include "block.h"
 #include "catalogue.h"
+#include "driver.h"
 #include "layout.h"
+#include "route.h"
+#include "track.h"
 #include "tracktype.h"
+#include "train.h"
+#include "vehicletype.h"
 
 using namespace std;
 using namespace Msp;
 
 namespace Marklin {
 
-Layout::Layout(const Catalogue &c):
-	catalogue(c)
-{ }
+Layout::Layout(Catalogue &c, Driver *d):
+	catalogue(c),
+	driver(d),
+	next_turnout_id(0x800)
+{
+	if(driver)
+		driver->signal_sensor.connect(sigc::mem_fun(this, &Layout::sensor_event));
+}
 
 Layout::~Layout()
 {
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		delete *i;
+	delete driver;
+	while(!trains.empty())
+		delete trains.begin()->second;
+	while(!routes.empty())
+		delete *routes.begin();
+	while(!tracks.empty())
+		delete *tracks.begin();
+	while(!blocks.empty())
+		delete *blocks.begin();
+}
+
+Driver &Layout::get_driver() const
+{
+	if(!driver)
+		throw InvalidState("No driver");
+	return *driver;
 }
 
 void Layout::add_track(Track &t)
 {
 	if(tracks.insert(&t).second)
+	{
+		create_blocks();
 		signal_track_added.emit(t);
+	}
 }
 
 void Layout::remove_track(Track &t)
 {
-	if(tracks.count(&t))
+	if(tracks.erase(&t))
 	{
-		tracks.erase(&t);
+		create_blocks(t);
 		signal_track_removed.emit(t);
 	}
 }
 
-void Layout::check_links()
+unsigned Layout::allocate_turnout_id(bool dbl)
 {
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		(*i)->break_links();
+	unsigned result = next_turnout_id++;
+	if(dbl)
+		++next_turnout_id;
+	return result;
+}
 
-	set<Track *> flext;
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+void Layout::add_block(Block &b)
+{
+	blocks.insert(&b);
+}
+
+Block &Layout::get_block(unsigned id) const
+{
+	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		if((*i)->get_id()==id)
+			return **i;
+
+	throw KeyError("Unknown block", lexical_cast(id));
+}
+
+Block &Layout::get_block_by_track(Track &t) const
+{
+	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		if((*i)->has_track(t))
+			return **i;
+
+	throw InvalidParameterValue("No block found for track");
+}
+
+void Layout::create_blocks()
+{
+	set<Track *> used_tracks;
+	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
 	{
-		if((*i)->get_flex())
-			flext.insert(*i);
-		else
+		const set<Track *> &btracks = (*i)->get_tracks();
+		used_tracks.insert(btracks.begin(), btracks.end());
+	}
+
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+		if(used_tracks.count(*i)==0)
 		{
-			for(set<Track *>::iterator j=i; j!=tracks.end(); ++j)
-				if(j!=i)
-					(*i)->snap_to(**j, true);
+			Block *block = new Block(*this, **i);
+			used_tracks.insert(block->get_tracks().begin(), block->get_tracks().end());
 		}
-	}
 
-	for(set<Track *>::iterator i=flext.begin(); i!=flext.end(); ++i)
-		for(set<Track *>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
+	for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+		for(set<Block *>::iterator j=i; j!=blocks.end(); ++j)
 			if(j!=i)
-				(*i)->snap_to(**j, true);
+				(*i)->check_link(**j);
+}
+
+void Layout::create_blocks(Track &track)
+{
+	const vector<Track *> &links = track.get_links();
+	for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end();)
+	{
+		bool del = (*i)->has_track(track);
+		for(vector<Track *>::const_iterator j=links.begin(); (!del && j!=links.end()); ++j)
+			del = (*i)->has_track(**j);
+
+		if(del)
+			delete *i++;
+		else
+			++i;
+	}
+
+	create_blocks();
+}
+
+void Layout::remove_block(Block &b)
+{
+	blocks.erase(&b);
+}
+
+void Layout::add_route(Route &r)
+{
+	if(routes.insert(&r).second)
+		signal_route_added.emit(r);
+}
+
+Route &Layout::get_route(const string &name) const
+{
+	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
+		if((*i)->get_name()==name)
+			return **i;
+	throw KeyError("Unknown route", name);
+}
+
+void Layout::update_routes()
+{
+	for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+		(*i)->update_turnouts();
+}
+
+void Layout::remove_route(Route &r)
+{
+	if(routes.erase(&r))
+		signal_route_removed.emit(r);
+}
+
+void Layout::add_train(Train &t)
+{
+	if(trains.count(t.get_address()))
+		throw KeyError("Duplicate train address", lexical_cast(t.get_address()));
+
+	trains[t.get_address()] = &t;
+	signal_train_added.emit(t);
+}
+
+Train &Layout::get_train(unsigned addr) const
+{
+	map<unsigned, Train *>::const_iterator i = trains.find(addr);
+	if(i==trains.end())
+		throw KeyError("Unknown train", lexical_cast(addr));
+	return *i->second;
+}
+
+void Layout::remove_train(Train &t)
+{
+	if(trains.erase(t.get_address()))
+		signal_train_removed.emit(t);
+}
+
+void Layout::add_vehicle(Vehicle &v)
+{
+	if(vehicles.insert(&v).second)
+		signal_vehicle_added.emit(v);
+}
+
+void Layout::remove_vehicle(Vehicle &v)
+{
+	if(vehicles.erase(&v))
+		signal_vehicle_removed.emit(v);
+}
+
+void Layout::tick()
+{
+	if(driver)
+		driver->tick();
+
+	Time::TimeStamp t = Time::now();
+	Time::TimeDelta dt;
+	if(last_tick)
+		dt = t-last_tick;
+	last_tick = t;
+
+	for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
+		i->second->tick(t, dt);
+}
+
+void Layout::emergency(const string &msg)
+{
+	if(driver)
+		driver->halt(true);
+	IO::print("Emergency: %s\n", msg);
+	signal_emergency.emit(msg);
 }
 
 void Layout::save(const string &fn)
 {
 	IO::BufferedFile out(fn, IO::M_WRITE);
 	DataFile::Writer writer(out);
+
 	if(!base.empty())
 		writer.write((DataFile::Statement("base"), base));
+
 	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		DataFile::Statement st("track");
@@ -79,31 +248,92 @@ void Layout::save(const string &fn)
 		(*i)->save(st.sub);
 		writer.write(st);
 	}
+
+	for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
+	{
+		if((*i)->is_temporary())
+			continue;
+
+		DataFile::Statement st("route");
+		(*i)->save(st.sub);
+		writer.write(st);
+	}
+}
+
+void Layout::save_trains(const string &fn)
+{
+	IO::BufferedFile out(fn, IO::M_WRITE);
+	DataFile::Writer writer(out);
+
+	for(map<unsigned, Train *>::const_iterator i=trains.begin(); i!=trains.end(); ++i)
+	{
+		DataFile::Statement st("train");
+		st.append(i->second->get_locomotive_type().get_article_number());
+		st.append(i->second->get_address());
+		i->second->save(st.sub);
+		writer.write(st);
+	}
+}
+
+void Layout::sensor_event(unsigned addr, bool state)
+{
+	if(state)
+	{
+		for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+			if((*i)->get_sensor_id()==addr)
+			{
+				if(!(*i)->get_train())
+					emergency(format("Unreserved sensor %d triggered", addr));
+				break;
+			}
+	}
 }
 
 
 Layout::Loader::Loader(Layout &l):
-	DataFile::BasicLoader<Layout>(l)
+	DataFile::BasicLoader<Layout>(l),
+	new_tracks(false)
 {
 	add("base",  &Layout::base);
+	add("route", static_cast<void (Loader::*)()>(&Loader::route));
+	add("route", static_cast<void (Loader::*)(const string &)>(&Loader::route));
 	add("track", &Loader::track);
+	add("train", &Loader::train);
 }
 
 void Layout::Loader::finish()
 {
-	obj.check_links();
-
 	for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
 		(*i)->check_slope();
 }
 
-void Layout::Loader::track(unsigned art_nr)
+void Layout::Loader::route()
 {
-	TrackType &type = obj.catalogue.get_track(art_nr);
+	Route *rte = new Route(obj);
+	load_sub(*rte);
+}
+
+void Layout::Loader::route(const string &n)
+{
+	Route *rte = new Route(obj);
+	rte->set_name(n);
+	load_sub(*rte);
+}
 
-	RefPtr<Track> trk = new Track(type);
+void Layout::Loader::track(unsigned art_nr)
+{
+	Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
 	load_sub(*trk);
-	obj.add_track(*trk.release());
+	new_tracks = true;
+	for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
+		if(*i!=trk)
+			trk->snap_to(**i, true);
+}
+
+void Layout::Loader::train(unsigned art_nr, unsigned addr)
+{
+	Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr);
+	load_sub(*trn);
 }
 
 } // namespace Marklin