Rename ControlModel to Controller

[r2c2.git] / source / libmarklin / timetable.cpp

diff --git a/source/libmarklin/timetable.cpp b/source/libmarklin/timetable.cpp
index 1d65d0969791461abadd4f02f380496cd466aab1..bd9f5f0f046d5c24cd5c99eccf05ddd6b8233247 100644 (file)
--- a/source/libmarklin/timetable.cpp
+++ b/source/libmarklin/timetable.cpp
@@ -90,7 +90,6 @@ void Timetable::tick(const Time::TimeStamp &t)
                {
                case GOTO:
                        train.go_to(**parse_location(row.strparam).get_tracks().begin());
-                       executing = false;
                        break;
                case TRAVEL:
                        pending_block = &parse_location(row.strparam);
@@ -100,6 +99,9 @@ void Timetable::tick(const Time::TimeStamp &t)
                        wait_timeout = t+row.intparam*Time::sec;
                        executing = false;
                        break;
+               case ARRIVE:
+                       executing = false;
+                       break;
                case SPEED:
                        train.set_control("speed", row.intparam/3.6*train.get_layout().get_catalogue().get_scale());
                        break;
@@ -128,6 +130,9 @@ void Timetable::save(list<DataFile::Statement> &st) const
                case WAIT:
                        st.push_back((DataFile::Statement("wait"), i->intparam));
                        break;
+               case ARRIVE:
+                       st.push_back(DataFile::Statement("arrive"));
+                       break;
                case SPEED:
                        st.push_back((DataFile::Statement("speed"), i->intparam));
                        break;
@@ -158,7 +163,7 @@ void Timetable::sensor_event(unsigned addr, bool state)
 void Timetable::train_arrived()
 {
        Row &row = rows[current_row];
-       if(row.type==GOTO)
+       if(row.type==ARRIVE)
        {
                current_row = (current_row+1)%rows.size();
                executing = true;
@@ -187,6 +192,8 @@ string Timetable::Row::str() const
                return "travel to "+strparam;
        case WAIT:
                return format("wait for %d seconds", intparam);
+       case ARRIVE:
+               return "wait for arrival";
        case SPEED:
                return format("set speed %d km/h", intparam);
        case ROUTE:
@@ -209,12 +216,14 @@ Timetable::Row Timetable::Row::parse(const string &s)
                        ++nondigit;
                return Row(WAIT, lexical_cast<unsigned>(s.substr(9, nondigit-9)));
        }
+       else if(s=="wait for arrival")
+               return Row(ARRIVE, 0);
        else if(!s.compare(0, 10, "set speed "))
        {
                unsigned nondigit = 11;
-               while(nondigit<s.size() && isdigit(s[nondigit]))
+               while(nondigit<s.size() && (isdigit(s[nondigit]) || s[nondigit]=='-'))
                        ++nondigit;
-               return Row(SPEED, lexical_cast<unsigned>(s.substr(10, nondigit-10)));
+               return Row(SPEED, lexical_cast<int>(s.substr(10, nondigit-10)));
        }
        else if(!s.compare(0, 10, "set route "))
                return Row(ROUTE, s.substr(10));
@@ -226,6 +235,7 @@ Timetable::Row Timetable::Row::parse(const string &s)
 Timetable::Loader::Loader(Timetable &tt):
        DataFile::ObjectLoader<Timetable>(tt)
 {
+       add("arrive", &Loader::arrive);
        add("goto",   &Loader::go_to);
        add("route",  &Loader::route);
        add("speed",  &Loader::speed);
@@ -233,6 +243,11 @@ Timetable::Loader::Loader(Timetable &tt):
        add("wait",   &Loader::wait);
 }
 
+void Timetable::Loader::arrive()
+{
+       obj.rows.push_back(Row(ARRIVE, 0));
+}
+
 void Timetable::Loader::go_to(const string &t)
 {
        obj.rows.push_back(Row(GOTO, t));