X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.h;h=0a72328cc6d8446b0804d1792c38240407a1b5af;hb=642cf72c11b49a9e00128ab6258a2438c785a5ab;hp=0c8965403a3437663e0ea1dbe68faaec6dda89cf;hpb=bd9b40058a376c946318a444dd6c77737ec6ac98;p=architektonas

diff --git a/src/object.h b/src/object.h
index 0c89654..0a72328 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 Painter;
 class QFont;
 class Dimension;
+//class FILE;
 
 enum ObjectState { OSInactive, OSSelected };
+enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer };
 
 class Object
 {
@@ -23,10 +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);
 //Hm.		Object * Connect(Object *);
 
 		// Class methods
@@ -36,25 +56,42 @@ class Object
 		static void SetViewportHeight(int);
 		static void SetDeleteActive(bool state = true);
 		static void SetDimensionActive(bool state = true);
+		static void SetSnapMode(bool state = true);
+		static Vector SnapPointToGrid(Vector);
 
 	protected:
 		Vector position;					// All objects have a position (doubles as reference point)
 		Object * parent;
 //		Pen pen;
 //		Fill fill;
+	public:
+		ObjectType type;
 		ObjectState state;
+		unsigned int layer;
+	protected:
 		ObjectState oldState;
 		bool needUpdate;
-		Dimension * attachedDimension;
-		std::vector<Object *> connected;
+//		Dimension * attachedDimension;
+		std::vector<Connection> connected;
 
 		// Class variables
+	public:
 		static QFont * font;
+	protected:
 		static bool fixedAngle;
 		static bool fixedLength;
 		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;
+		static double gridSpacing;			// Grid spacing in base units
+		static int currentLayer;
 };
 
 #endif	// __OBJECT_H__