X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdimension.h;h=32aa2857c3582ee1786faaa70b7f62baf0210c29;hb=2549a213bacfb2f6993ec143083d72b716854345;hp=2784e83bb3a9f8271844a03df89e1cf01e08aa15;hpb=9d59b5831000704a1ed39c22a6043ba658993159;p=architektonas

diff --git a/src/dimension.h b/src/dimension.h
index 2784e83..32aa285 100644
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -4,7 +4,7 @@
 #include "connection.h"
 #include "object.h"
 
-enum DimensionType { DTLinear, DTRadial, DTDiametric, DTCircumferential, DTLeader };
+enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader };
 
 class Dimension: public Object
 {
@@ -18,17 +18,24 @@ class Dimension: public Object
 		virtual bool Collided(Vector);
 		virtual void PointerMoved(Vector);
 		virtual void PointerReleased(void);
+		virtual bool HitTest(Point);
 		virtual void Enumerate(FILE *);
-//		virtual Object * Copy(void);
+		virtual Object * Copy(void);
 		virtual Vector GetPointAtParameter(double parameter);
 		virtual void Connect(Object *, double);
 		virtual void Disconnect(Object *, double);
 		virtual void DisconnectAll(Object *);
+		virtual QRectF Extents(void);
 		void FlipSides(void);
 
+	protected:
+		void SaveHitState(void);
+		bool HitStateChanged(void);
+
 	protected:
 		Vector endpoint;					// Starting point is Object::position
 		Vector oldPoint;					// Used for dragging
+		Point oldEndpoint;
 
 	private:
 		bool dragging;
@@ -36,10 +43,16 @@ class Dimension: public Object
 		bool draggingHandle2;
 		bool objectWasDragged;
 		double length;
-		DimensionType type;
+		DimensionType dimensionType;
+		bool hitPoint1;
+		bool hitPoint2;
+		bool oldHitPoint1, oldHitPoint2;
+	public:
+		double size;						// Size of arrows/text in base units
 
+	private:
 		// We use these in lieu of the built-in connected[] array; no reason to
-		// do this way especially
+		// do it this way especially
 		Connection point1;
 		Connection point2;
 };