X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmeasure.h;h=f68178dcacaf2b2368a641c53d1fb0fd5426420a;hb=6ba6af3637c299ab00828c49de9151429488cc17;hp=d7c7b7719ad3c6b079b2a5317bba01f472183a24;hpb=6c61179fe09af2f5366d50f10aadbf5f83438087;p=r2c2.git diff --git a/source/designer/measure.h b/source/designer/measure.h index d7c7b77..f68178d 100644 --- a/source/designer/measure.h +++ b/source/designer/measure.h @@ -1,3 +1,10 @@ +/* $Id$ + +This file is part of the MSP Märklin suite +Copyright © 2006-2008 Mikkosoft Productions, Mikko Rasa +Distributed under the GPL +*/ + #ifndef MEASURE_H_ #define MEASURE_H_ @@ -7,18 +14,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 { @@ -27,6 +22,11 @@ private: ACTIVE }; +public: + sigc::signal signal_done; + sigc::signal signal_changed; + +private: Designer &designer; Marklin::Point pointer; Marklin::Point spoint; @@ -36,6 +36,16 @@ private: float adiff; State state; +public: + 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 &); };