Major architecture rework

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

diff --git a/source/libmarklin/track.cpp b/source/libmarklin/track.cpp
index 3c2a410fa9d55bf2ab131985a76f7ea4266d4f1c..5843e22f017953474588c956ca73798fcbf4b4be 100644 (file)
--- a/source/libmarklin/track.cpp
+++ b/source/libmarklin/track.cpp
@@ -1,11 +1,13 @@
 /* $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 <cmath>
+#include "driver.h"
+#include "layout.h"
 #include "track.h"
 #include "tracktype.h"
 
@@ -14,19 +16,27 @@ using namespace Msp;
 
 namespace Marklin {
 
-Track::Track(const TrackType &t):
+Track::Track(Layout &l, const TrackType &t):
+       layout(l),
        type(t),
        rot(0),
        slope(0),
        flex(false),
        turnout_id(0),
        sensor_id(0),
-       links(t.get_endpoints().size())
-{ }
+       links(t.get_endpoints().size()),
+       active_path(0)
+{
+       layout.add_track(*this);
+
+       if(layout.has_driver())
+               layout.get_driver().signal_turnout.connect(sigc::mem_fun(this, &Track::turnout_event));
+}
 
 Track::~Track()
 {
        break_links();
+       layout.remove_track(*this);
 }
 
 void Track::set_position(const Point &p)
@@ -85,12 +95,36 @@ void Track::check_slope()
 
 void Track::set_turnout_id(unsigned i)
 {
+       if(!type.is_turnout())
+               throw InvalidState("Not a turnout");
+
        turnout_id = i;
+       layout.create_blocks(*this);
+       if(layout.has_driver() && turnout_id)
+               layout.get_driver().add_turnout(turnout_id);
 }
 
 void Track::set_sensor_id(unsigned i)
 {
+       if(type.is_turnout())
+               throw InvalidState("Can't set sensor on a turnout");
+
        sensor_id = i;
+       layout.create_blocks(*this);
+       if(layout.has_driver() && sensor_id)
+               layout.get_driver().add_sensor(sensor_id);
+}
+
+void Track::set_active_path(unsigned p)
+{
+       if(!turnout_id)
+               throw InvalidState("Not a turnout");
+       if(!(type.get_paths()&(1<<p)))
+               throw InvalidParameterValue("Invalid path");
+
+       layout.get_driver().set_turnout(turnout_id, p&1);
+       if(type.get_n_paths()>2)
+               layout.get_driver().set_turnout(turnout_id+1, p&2);
 }
 
 int Track::get_endpoint_by_link(const Track &other) const
@@ -164,6 +198,7 @@ bool Track::snap_to(Track &other, bool link)
                                                break_link(*links[i]);
                                        links[i] = &other;
                                        other.links[j] = this;
+                                       layout.create_blocks(*this);
                                }
 
                                return true;
@@ -201,6 +236,8 @@ void Track::break_link(Track &trk)
                {
                        *i = 0;
                        trk.break_link(*this);
+                       // XXX Creates the blocks twice
+                       layout.create_blocks(*this);
                        return;
                }
 }
@@ -324,17 +361,6 @@ Point Track::get_point(unsigned epi, unsigned path, float d) const
        }
 }
 
-Track *Track::copy() const
-{
-       Track *trk = new Track(type);
-       trk->set_position(pos);
-       trk->set_rotation(rot);
-       trk->set_slope(slope);
-       trk->set_flex(flex);
-
-       return trk;
-}
-
 void Track::save(list<DataFile::Statement> &st) const
 {
        st.push_back((DataFile::Statement("position"), pos.x, pos.y, pos.z));
@@ -348,6 +374,17 @@ void Track::save(list<DataFile::Statement> &st) const
                st.push_back((DataFile::Statement("flex"), true));
 }
 
+void Track::turnout_event(unsigned addr, bool state)
+{
+       if(!turnout_id)
+               return;
+
+       if(addr==turnout_id)
+               active_path = (active_path&2) | (state ? 1 : 0);
+       else if(type.is_double_address() && addr==turnout_id+1)
+               active_path = (active_path&1) | (state ? 2 : 0);
+}
+
 
 Track::Loader::Loader(Track &t):
        DataFile::BasicLoader<Track>(t)
@@ -355,8 +392,8 @@ Track::Loader::Loader(Track &t):
        add("position",   &Loader::position);
        add("rotation",   &Track::rot);
        add("slope",      &Track::slope);
-       add("turnout_id", &Track::turnout_id);
-       add("sensor_id",  &Track::sensor_id);
+       add("turnout_id", &Loader::turnout_id);
+       add("sensor_id",  &Loader::sensor_id);
        add("flex",       &Track::flex);
 }
 
@@ -365,4 +402,14 @@ void Track::Loader::position(float x, float y, float z)
        obj.pos = Point(x, y, z);
 }
 
+void Track::Loader::sensor_id(unsigned id)
+{
+       obj.set_sensor_id(id);
+}
+
+void Track::Loader::turnout_id(unsigned id)
+{
+       obj.set_turnout_id(id);
+}
+
 } // namespace Marklin