X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdimension.h;h=dfbfd1d95dc3fa978cf0781bfe4c4ccc8faa34f8;hb=771113b26ca27707c96fdcd80d79a08e40884268;hp=ba30b8f7e98980eb82274d8983c6b41190e90160;hpb=4d6ba8a6eb781dbee818b6a55d21df7b52468936;p=architektonas

diff --git a/src/dimension.h b/src/dimension.h
index ba30b8f..dfbfd1d 100644
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -1,7 +1,6 @@
 #ifndef __DIMENSION_H__
 #define __DIMENSION_H__
 
-#include "connection.h"
 #include "object.h"
 
 class Line;
@@ -15,22 +14,18 @@ class Dimension: public Object
 
 	public:
 		Dimension(Vector, Vector, DimensionType dt = DTLinear, Object * p = 0);
-//		Dimension(Connection, Connection, DimensionType dt = DTLinear, Object * p = 0);
 		~Dimension();
 
 		virtual void Draw(Painter *);
 		virtual Vector Center(void);
 		virtual bool Collided(Vector);
-		virtual void PointerMoved(Vector);
+		virtual bool PointerMoved(Vector);
 		virtual void PointerReleased(void);
 		virtual bool HitTest(Point);
 		virtual void Enumerate(FILE *);
 		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);
 
@@ -42,6 +37,7 @@ class Dimension: public Object
 		Vector endpoint;					// Starting point is Object::position
 		Vector oldPoint;					// Used for dragging
 		Point oldEndpoint;
+		Point linePt1, linePt2;				// Used for testing dimension line hits
 
 	private:
 		bool dragging;
@@ -57,12 +53,6 @@ class Dimension: public Object
 		bool oldHitPoint1, oldHitPoint2, oldHitLine, oldHitFlipSwitch;
 	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 it this way especially
-//		Connection point1;
-//		Connection point2;
 };
 
 #endif	// __DIMENSION_H__