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

diff --git a/src/dimension.h b/src/dimension.h
index 0cda929..32aa285 100644
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -1,15 +1,16 @@
 #ifndef __DIMENSION_H__
 #define __DIMENSION_H__
 
+#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
 {
 	public:
 		Dimension(Vector, Vector, DimensionType dt = DTLinear, Object * p = 0);
-		Dimension(Vector *, Vector *, DimensionType dt = DTLinear, Object * p = 0);
+		Dimension(Connection, Connection, DimensionType dt = DTLinear, Object * p = 0);
 		~Dimension();
 
 		virtual void Draw(Painter *);
@@ -17,15 +18,24 @@ class Dimension: public Object
 		virtual bool Collided(Vector);
 		virtual void PointerMoved(Vector);
 		virtual void PointerReleased(void);
-		void SetPoint1(Vector *);
-		void SetPoint2(Vector *);
-		Vector GetPoint1(void);
-		Vector GetPoint2(void);
+		virtual bool HitTest(Point);
+		virtual void Enumerate(FILE *);
+		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;
@@ -33,10 +43,18 @@ 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
 
-		Vector * point1;					// These couple to external points; if there
-		Vector * point2;					// are none then fall back to endpoint/position
+	private:
+		// We use these in lieu of the built-in connected[] array; no reason to
+		// do it this way especially
+		Connection point1;
+		Connection point2;
 };
 
 #endif	// __DIMENSION_H__