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

diff --git a/source/libmarklin/layout.cpp b/source/libmarklin/layout.cpp
index 470d573..bd9ee71 100644
--- a/source/libmarklin/layout.cpp
+++ b/source/libmarklin/layout.cpp
@@ -1,13 +1,13 @@
 /* $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 <fstream>
 #include <msp/core/refptr.h>
 #include <msp/datafile/parser.h>
+#include <msp/datafile/writer.h>
 #include "catalogue.h"
 #include "layout.h"
 #include "tracktype.h"
@@ -17,7 +17,7 @@ using namespace Msp;
 
 namespace Marklin {
 
-Layout::Layout(Catalogue &c):
+Layout::Layout(const Catalogue &c):
 	catalogue(c)
 { }
 
@@ -47,77 +47,63 @@ void Layout::check_links()
 	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		(*i)->break_links();
 
+	set<Track *> flext;
 	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		for(set<Track *>::iterator j=i; j!=tracks.end(); ++j)
+	{
+		if((*i)->get_flex())
+			flext.insert(*i);
+		else
+		{
+			for(set<Track *>::iterator j=i; j!=tracks.end(); ++j)
+				if(j!=i)
+					(*i)->snap_to(**j, true);
+		}
+	}
+
+	for(set<Track *>::iterator i=flext.begin(); i!=flext.end(); ++i)
+		for(set<Track *>::iterator j=tracks.begin(); j!=tracks.end(); ++j)
 			if(j!=i)
 				(*i)->snap_to(**j, true);
 }
 
-void Layout::load(const string &fn)
+void Layout::save(const string &fn)
 {
-	IO::File in(fn);
-	IO::Buffered inb(in);
-
-	filename=fn;
-	DataFile::Parser parser(inb, fn);
-	Loader loader(*this);
-	loader.load(parser);
-
-	check_links();
-
-	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-		(*i)->check_slope();
-}
-
-int Layout::save(const string &fn)
-{
-	ofstream out(fn.c_str());
-	if(!out) return -1;
-
-	filename=fn;
-
+	IO::BufferedFile out(fn, IO::M_WRITE);
+	DataFile::Writer writer(out);
 	if(!base.empty())
-		out<<"base \""<<base<<"\";\n";
+		writer.write((DataFile::Statement("base"), base));
 	for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
-		out<<"track "<<(*i)->get_type().get_article_number()<<"\n{\n";
-		const Point &p=(*i)->get_position();
-		out<<"\tposition "<<p.x<<' '<<p.y<<' '<<p.z<<";\n";
-		out<<"\trotation "<<(*i)->get_rotation()<<";\n";
-		out<<"\tslope "<<(*i)->get_slope()<<";\n";
-
-		unsigned id=(*i)->get_turnout_id();
-		if(id)
-			out<<"\tturnout_id "<<id<<";\n";
-
-		id=(*i)->get_sensor_id();
-		if(id)
-			out<<"\tsensor_id "<<id<<";\n";
-
-		if((*i)->get_flex())
-			out<<"\tflex true;\n";
-
-		out<<"};\n";
+		DataFile::Statement st("track");
+		st.append((*i)->get_type().get_article_number());
+		(*i)->save(st.sub);
+		writer.write(st);
 	}
-
-	return 0;
 }
 
 
 Layout::Loader::Loader(Layout &l):
-	layout(l)
+	DataFile::BasicLoader<Layout>(l)
 {
 	add("base",  &Layout::base);
 	add("track", &Loader::track);
 }
 
+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)
 {
-	TrackType &type=layout.catalogue.get_track(art_nr);
+	TrackType &type = obj.catalogue.get_track(art_nr);
 
-	RefPtr<Track> trk=new Track(type);
+	RefPtr<Track> trk = new Track(type);
 	load_sub(*trk);
-	layout.add_track(*trk.release());
+	obj.add_track(*trk.release());
 }
 
 } // namespace Marklin