Read MFX locomotive name

[r2c2.git] / source / libr2c2 / route.cpp

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index a2e7ac8c4c2c5d00a18597185377e12e70a89861..5ee30e033161030fa31a8f558f50e7f4a3b9aaea 100644 (file)
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -140,12 +140,6 @@ Route::~Route()
        layout.remove(*this);
 }
 
-void Route::set_name(const string &n)
-{
-       name = n;
-       signal_name_changed.emit(name);
-}
-
 void Route::set_temporary(bool t)
 {
        temporary = t;
@@ -221,10 +215,10 @@ int Route::get_turnout(unsigned id) const
 
 unsigned Route::get_path(Track &trk) const
 {
-       if(unsigned taddr = trk.get_turnout_address())
+       if(trk.get_type().is_turnout())
        {
-               map<unsigned, int>::const_iterator i = turnouts.find(taddr);
-               if(i!=turnouts.end())
+               map<unsigned, int>::const_iterator i = turnouts.find(trk.get_turnout_address());
+               if(i!=turnouts.end() && i->second>=0)
                        return i->second;
        }
        return trk.get_active_path();
@@ -263,6 +257,11 @@ void Route::save(list<DataFile::Statement> &st) const
                st.push_back((DataFile::Statement("turnout"), i->first, i->second));
 }
 
+DataFile::Statement Route::save_reference() const
+{
+       return (DataFile::Statement("route"), name);
+}
+
 Route *Route::find(const TrackIter &from, Track &to)
 {
        return create_route(from, TrackMatch(to));
@@ -287,7 +286,7 @@ Route *Route::find(const TrackIter &from, const set<Track *> &to)
 Route::Loader::Loader(Route &r):
        DataFile::ObjectLoader<Route>(r)
 {
-       add("name",    &Route::name);
+       add("name",    &Loader::name);
        add("turnout", &Loader::turnout);
 }
 
@@ -316,6 +315,11 @@ void Route::Loader::finish()
        }
 }
 
+void Route::Loader::name(const string &n)
+{
+       obj.name = n;
+}
+
 void Route::Loader::turnout(unsigned id, unsigned path)
 {
        turnouts[id] = path;