X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fdesigner%2Fmeasure.h;h=31f5f2a7b9323574ce3a01ba374e3a95d48ed84a;hb=03a22611772265b539f826f1f8bc482e71ca4a99;hp=84b1c832ea21a646052b05c432e07cdeb0c3da5f;hpb=c4a5973cff25a0dcdce11c0cbdf8e0fdc1ef4659;p=r2c2.git

diff --git a/source/designer/measure.h b/source/designer/measure.h
index 84b1c83..31f5f2a 100644
--- a/source/designer/measure.h
+++ b/source/designer/measure.h
@@ -3,46 +3,40 @@
 
 #include <sigc++/sigc++.h>
 #include <msp/gl/renderable.h>
+#include "libr2c2/geometry.h"
+#include "tool.h"
 
 class Designer;
 
-class Measure: public Msp::GL::Renderable
+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(float, float, unsigned);
-	void pointer_motion(float, float);
+	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 update_mesh();
-	void snap_to_tracks(R2C2::Vector &, float &);
+	void snap_to_tracks(R2C2::Snap &);
 };
 
 #endif