X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.h;h=b8fdd9db76f70b0a2cf8fbd5e797951c278183e3;hb=669a05b5a52bd759f0ea08772e0ed17222b015a0;hp=2e2efffa5f5b14bb14c196052115ea84b0d6f521;hpb=676007c81e292079daaa7188f4fbf2757ae77ef8;p=architektonas

diff --git a/src/object.h b/src/object.h
index 2e2efff..b8fdd9d 100644
--- a/src/object.h
+++ b/src/object.h
@@ -5,6 +5,7 @@
 #include <vector>							// This is a container
 #include "vector.h"							// This is the mathematical construct
 #include "connection.h"
+#include <QRectF>
 
 class Painter;
 class QFont;
@@ -12,6 +13,7 @@ class Dimension;
 //class FILE;
 
 enum ObjectState { OSInactive, OSSelected };
+enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer };
 
 class Object
 {
@@ -26,6 +28,7 @@ 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 *);
@@ -36,6 +39,11 @@ class Object
 		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);
@@ -49,26 +57,39 @@ class Object
 		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;
+	protected:
 		ObjectState oldState;
 		bool needUpdate;
 //		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
 };
 
 #endif	// __OBJECT_H__