X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdimension.h;h=a5767a3ebfb4ad94a17492788424d29838e2743c;hb=9590e4ed45fd4e05eccc16bd8e9d51596aea5a6d;hp=be8e5c51a31eda8efea566c3b4439bbbdb32c9f8;hpb=676007c81e292079daaa7188f4fbf2757ae77ef8;p=architektonas

diff --git a/src/dimension.h b/src/dimension.h
index be8e5c5..a5767a3 100644
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -4,13 +4,17 @@
 #include "connection.h"
 #include "object.h"
 
-enum DimensionType { DTLinear, DTRadial, DTDiametric, DTCircumferential, DTLeader };
+class Line;
+
+enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader };
 
 class Dimension: public Object
 {
+	friend class Line;
+	friend class Geometry;
+
 	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();
 
@@ -19,17 +23,25 @@ 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 MovePointAtParameter(double parameter, Vector);
 		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;
@@ -37,10 +49,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;
 };