X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.h;h=72aaad644f29a79d96dba2d08a59e83118529509;hb=bb8d0671717bac2c5350e34024273381be1d8175;hp=5b19505d2c94be29bccb49cf44c87de0625b3b3d;hpb=eb0057e8a8145032152e4c417fcd102ef5a21484;p=architektonas

diff --git a/src/object.h b/src/object.h
index 5b19505..72aaad6 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1,9 +1,11 @@
 #ifndef __OBJECT_H__
 #define __OBJECT_H__
 
+#include <stdio.h>
 #include <vector>							// This is a container
 #include "vector.h"							// This is the mathematical construct
-#include <stdio.h>
+#include "connection.h"
+#include <QRectF>
 
 class Painter;
 class QFont;
@@ -11,6 +13,7 @@ class Dimension;
 //class FILE;
 
 enum ObjectState { OSInactive, OSSelected };
+enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer };
 
 class Object
 {
@@ -25,15 +28,25 @@ class Object
 		virtual void PointerMoved(Vector);
 		virtual void PointerReleased(void);
 		virtual bool NeedsUpdate(void);
+		virtual bool HitTest(Point);
 		virtual void Transmute(Object *, Object *);
 		virtual Object * GetParent(void);
 		virtual void Add(Object *);
 		virtual Vector * GetPointAt(Vector);
 		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);
+//		virtual ObjectType Type(void);// = 0; // Pure virtual, must be implemented
+		virtual void Translate(Vector);
+		virtual void Rotate(Vector, double);
+		virtual void Scale(Vector, double);
 		ObjectState GetState(void);
 		void Reparent(Object *);
-		Dimension * GetAttachedDimension(void);
+//		Dimension * GetAttachedDimension(void);
 //Hm.		Object * Connect(Object *);
 
 		// Class methods
@@ -50,11 +63,14 @@ class Object
 		Object * parent;
 //		Pen pen;
 //		Fill fill;
+	public:
+		ObjectType type;
 		ObjectState state;
+	protected:
 		ObjectState oldState;
 		bool needUpdate;
-		Dimension * attachedDimension;
-		std::vector<Object *> connected;
+//		Dimension * attachedDimension;
+		std::vector<Connection> connected;
 
 		// Class variables
 		static QFont * font;
@@ -63,7 +79,13 @@ class Object
 		static int viewportHeight;
 		static bool deleteActive;
 		static bool dimensionActive;
+	public:
 		static bool snapToGrid;
+		static bool ignoreClicks;
+		static bool dontMove;
+	public:
+		static bool selectionInProgress;
+		static QRectF selection;
 };
 
 #endif	// __OBJECT_H__