X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmeasure.h;fp=source%2Fdesigner%2Fmeasure.h;h=61a5a754c7b19af8fea92927400b32fa06006834;hb=1d735b80482317fd930eb47ca255ab9f1f120a7d;hp=d7c7b7719ad3c6b079b2a5317bba01f472183a24;hpb=aead7f2da831199fbb8f6950b067656b2965c2fa;p=r2c2.git diff --git a/source/designer/measure.h b/source/designer/measure.h index d7c7b77..61a5a75 100644 --- a/source/designer/measure.h +++ b/source/designer/measure.h @@ -7,18 +7,6 @@ class Designer; class Measure { -public: - sigc::signal signal_done; - sigc::signal signal_changed; - - Measure(Designer &); - 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(); private: enum State { @@ -36,6 +24,19 @@ private: float adiff; State state; +public: + sigc::signal signal_done; + sigc::signal signal_changed; + + Measure(Designer &); + 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(); +private: void snap_to_tracks(Marklin::Point &, float &); };