X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmeasure.h;h=b991d42be50b30eddc4c39697150565b4b0d9046;hb=ec1f75d72e5c4f7f7c9dafdf80f58c30ffb1a855;hp=e4f230f6b90c201de7c0222d20d4f17b47751ac2;hpb=3e9c210ddc036cd015228504cc0803c909e27f84;p=r2c2.git

diff --git a/source/designer/measure.h b/source/designer/measure.h
index e4f230f..b991d42 100644
--- a/source/designer/measure.h
+++ b/source/designer/measure.h
@@ -1,10 +1,3 @@
-/* $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_
 
@@ -22,9 +15,14 @@ private:
 		ACTIVE
 	};
 
+public:
+	sigc::signal<void> signal_done;
+	sigc::signal<void> signal_changed;
+
+private:
 	Designer &designer;
-	Marklin::Point pointer;
-	Marklin::Point spoint;
+	R2C2::Vector pointer;
+	R2C2::Vector spoint;
 	float sdir;
 	float par_dist;
 	float perp_dist;
@@ -32,19 +30,16 @@ private:
 	State state;
 
 public:
-	sigc::signal<void> signal_done;
-	sigc::signal<void> signal_changed;
-
 	Measure(Designer &);
-	float get_parallel_distance() const      { return par_dist; }
+	float get_parallel_distance() const { return par_dist; }
 	float get_perpendicular_distance() const { return perp_dist; }
-	float get_angle_difference() const       { return adiff; }
+	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 button_press(float, float, unsigned);
+	void pointer_motion(float, float);
 	void render();
 private:
-	void snap_to_tracks(Marklin::Point &, float &);
+	void snap_to_tracks(R2C2::Vector &, float &);
 };
 
 #endif