Make LCD output selectable at runtime through an extra I/O pin

[r2c2.git] / source / libmarklin / trackpart.h

diff --git a/source/libmarklin/trackpart.h b/source/libmarklin/trackpart.h
index 05fa0ba9dabd594cd2d882c99f579f1bdf165e50..13e0f38528c86e94046e7dc2b03d8f71857e5931 100644 (file)
--- a/source/libmarklin/trackpart.h
+++ b/source/libmarklin/trackpart.h
@@ -1,7 +1,7 @@
 /* $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
 */
 
@@ -9,38 +9,41 @@ Distributed under the GPL
 #define MARKLIN_TRACKPART_H_
 
 #include <msp/datafile/loader.h>
-#include "endpoint.h"
 #include "geometry.h"
 
 namespace Marklin {
 
-struct TrackPart
+class TrackPart
 {
-       class Loader: public Msp::DataFile::Loader
+public:
+       class Loader: public Msp::DataFile::BasicLoader<TrackPart>
        {
-       private:
-               TrackPart &part;
-
        public:
                Loader(TrackPart &);
-               TrackPart &get_object() { return part; }
        private:
                virtual void finish();
-
                void start(float, float, float);
        };
 
-       Point    pos;
-       float    dir;
-       float    length;
-       float    radius;
-       unsigned route;
-       bool     dead_end;
+private:
+       Point pos;
+       float dir;
+       float length;
+       float radius;
+       unsigned path;
+       bool dead_end;
+       TrackPart *links[2];
 
+public:
        TrackPart();
 
-       void collect_endpoints(std::vector<Endpoint> &) const;
-       Point get_point(float) const;
+       float get_length() const;
+       bool is_curved() const { return radius; }
+       TrackPoint get_point(float) const;
+       unsigned get_path() const { return path; }
+       bool is_dead_end() const { return dead_end; }
+       void check_link(TrackPart &);
+       TrackPart *get_link(unsigned) const;
 };
 
 } // namespace Marklin