X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fobject.h;h=34063a76e522d44f976a54f3db3d47c9f5d29287;hb=f3110724be7ad4d4e8c6b97d350ff8af7fbf3799;hp=8b047be15ab92c0839012fa3f53f22a42098cafd;hpb=d41ddd699001f6bbf6ac621f5c467bd13efb6087;p=architektonas

diff --git a/src/object.h b/src/object.h
index 8b047be..34063a7 100644
--- a/src/object.h
+++ b/src/object.h
@@ -1,14 +1,19 @@
 #ifndef __OBJECT_H__
 #define __OBJECT_H__
 
+#include <stdio.h>
 #include <vector>							// This is a container
 #include "vector.h"							// This is the mathematical construct
+#include "connection.h"
+#include <QRectF>
 
-class QPainter;
+class Painter;
 class QFont;
 class Dimension;
+//class FILE;
 
 enum ObjectState { OSInactive, OSSelected };
+enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer };
 
 class Object
 {
@@ -17,7 +22,7 @@ class Object
 		Object(Vector, Object * passedInParent = 0);
 		~Object();
 
-		virtual void Draw(QPainter *);
+		virtual void Draw(Painter *);
 		virtual Vector Center(void);
 		virtual bool Collided(Vector);
 		virtual void PointerMoved(Vector);
@@ -26,7 +31,18 @@ class Object
 		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
 		ObjectState GetState(void);
+		void Reparent(Object *);
+//		Dimension * GetAttachedDimension(void);
 //Hm.		Object * Connect(Object *);
 
 		// Class methods
@@ -36,17 +52,21 @@ class Object
 		static void SetViewportHeight(int);
 		static void SetDeleteActive(bool state = true);
 		static void SetDimensionActive(bool state = true);
+		static void SetSnapMode(bool state = true);
 
 	protected:
 		Vector position;					// All objects have a position (doubles as reference point)
 		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;
@@ -55,6 +75,9 @@ class Object
 		static int viewportHeight;
 		static bool deleteActive;
 		static bool dimensionActive;
+		static bool snapToGrid;
+		static bool ignoreClicks;
+		static bool dontMove;
 };
 
 #endif	// __OBJECT_H__