-#include <algorithm>
#include <fstream>
-#include <msp/parser/parser.h>
+#include <msp/core/refptr.h>
+#include <msp/datafile/parser.h>
#include "catalogue.h"
#include "layout.h"
+#include "tracktype.h"
using namespace std;
using namespace Msp;
catalogue(c)
{ }
-void Layout::add_track(Track *t)
+void Layout::add_track(Track &t)
{
- if(find(tracks.begin(), tracks.end(), t)==tracks.end())
- {
- tracks.push_back(t);
+ if(tracks.insert(&t).second)
signal_track_added.emit(t);
- }
}
-void Layout::remove_track(Track *t)
+void Layout::remove_track(Track &t)
{
- TrackSeq::iterator i=remove_if(tracks.begin(), tracks.end(), bind1st(equal_to<Track *>(), t));
- if(i!=tracks.end())
+ if(tracks.count(&t))
{
- tracks.erase(i, tracks.end());
+ tracks.erase(&t);
signal_track_removed.emit(t);
}
}
void Layout::check_links()
{
- for(TrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
(*i)->break_links();
- for(TrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
- for(TrackSeq::iterator j=i; j!=tracks.end(); ++j)
+ for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(set<Track *>::iterator j=i; j!=tracks.end(); ++j)
if(j!=i)
(*i)->snap_to(**j, true);
}
void Layout::load(const string &fn)
{
- ifstream in(fn.c_str());
- if(!in)
- throw Exception("Couldn't open file");
+ IO::File in(fn);
+ IO::Buffered inb(in);
filename=fn;
- Parser::Parser parser(in, fn);
+ DataFile::Parser parser(inb, fn);
Loader loader(*this);
loader.load(parser);
check_links();
- for(TrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
(*i)->check_slope();
}
if(base.size())
out<<"base \""<<base<<"\";\n";
- for(TrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
{
- out<<"track "<<(*i)->get_article_number()<<"\n{\n";
+ 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";
Layout::~Layout()
{
- for(TrackSeq::iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
delete *i;
}
void Layout::Loader::track(unsigned art_nr)
{
- Track *tmpl=layout.catalogue.get_track(art_nr);
- if(!tmpl)
- throw Exception("Unknown track");
+ TrackType &type=layout.catalogue.get_track(art_nr);
- Track *trk=tmpl->copy();
- try
- {
- load_sub(*trk);
- }
- catch(Msp::Exception &e)
- {
- delete trk;
- throw;
- }
- layout.tracks.push_back(trk);
- layout.signal_track_added.emit(trk);
+ RefPtr<Track> trk=new Track(type);
+ load_sub(*trk);
+ layout.add_track(*trk.release());
}
} // namespace Marklin