Don't crash if a train has no router

[r2c2.git] / source / designer / measure.h

diff --git a/source/designer/measure.h b/source/designer/measure.h
index 69442d823984fdcbfe7ee3e21e9ce91a1043cd62..31f5f2a7b9323574ce3a01ba374e3a95d48ed84a 100644 (file)
--- a/source/designer/measure.h
+++ b/source/designer/measure.h
@@ -2,44 +2,41 @@
 #define MEASURE_H_
 
 #include <sigc++/sigc++.h>
+#include <msp/gl/renderable.h>
+#include "libr2c2/geometry.h"
+#include "tool.h"
 
 class Designer;
 
-class Measure
+class Measure: public Tool, public Msp::GL::Renderable
 {
 private:
-       enum State
-       {
-               NONE,
-               STARTING,
-               ACTIVE
-       };
-
-public:
-       sigc::signal<void> signal_done;
-       sigc::signal<void> signal_changed;
-
-private:
-       Designer &designer;
-       R2C2::Vector pointer;
-       R2C2::Vector spoint;
-       float sdir;
+       R2C2::Snap start;
+       bool start_pinned;
        float par_dist;
        float perp_dist;
-       float adiff;
-       State state;
+       R2C2::Angle adiff;
+       Msp::GL::Mesh mesh;
 
 public:
-       Measure(Designer &);
+       Measure(Designer &, Msp::Input::Keyboard &, Msp::Input::Mouse &);
+       virtual ~Measure();
+
        float get_parallel_distance() const { return par_dist; }
        float get_perpendicular_distance() const { return perp_dist; }
-       float get_angle_difference() const { return adiff; }
-       void start();
-       void button_press(int, int, float, float, unsigned);
-       void pointer_motion(int, int, float, float);
-       void render();
+       const R2C2::Angle &get_angle_difference() const { return adiff; }
+
+private:
+       void back();
+       virtual void key_press(unsigned);
+       virtual void button_press(unsigned);
+       virtual void pointer_motion();
+
+public:
+       virtual void render(Msp::GL::Renderer &, const Msp::GL::Tag &) const;
 private:
-       void snap_to_tracks(R2C2::Vector &, float &);
+       void update_mesh();
+       void snap_to_tracks(R2C2::Snap &);
 };
 
 #endif