Rename the project to R²C²

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

diff --git a/source/designer/measure.h b/source/designer/measure.h
index d7c7b7719ad3c6b079b2a5317bba01f472183a24..6800ecce307826fa0bcc46d204e0ec84b539b4b4 100644 (file)
--- a/source/designer/measure.h
+++ b/source/designer/measure.h
@@ -1,3 +1,10 @@
+/* $Id$
+
+This file is part of R²C²
+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<void> signal_done;
-       sigc::signal<void> 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,16 +22,31 @@ private:
                ACTIVE
        };
 
+public:
+       sigc::signal<void> signal_done;
+       sigc::signal<void> signal_changed;
+
+private:
        Designer &designer;
-       Marklin::Point pointer;
-       Marklin::Point spoint;
+       R2C2::Point pointer;
+       R2C2::Point spoint;
        float sdir;
        float par_dist;
        float perp_dist;
        float adiff;
        State state;
 
-       void snap_to_tracks(Marklin::Point &, float &);
+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(R2C2::Point &, float &);
 };
 
 #endif