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

diff --git a/src/object.h b/src/object.h
index 5b19505..ff29e1f 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,9 +13,12 @@ class Dimension;
 //class FILE;
 
 enum ObjectState { OSInactive, OSSelected };
+enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer, OTSpline };
 
 class Object
 {
+	friend class Geometry;
+
 	public:
 		Object();
 		Object(Vector, Object * passedInParent = 0);
@@ -22,19 +27,30 @@ class Object
 		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 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);
+//Not yet, soon though		virtual void MovePointAtParameter(double parameter, Vector);
+		virtual void Connect(Object *, double);
+		virtual void Disconnect(Object *, double);
+		virtual void DisconnectAll(Object *);
+		virtual QRectF Extents(void);
+		virtual void Translate(Vector);
+		virtual void Rotate(Point, double);
+		virtual void Scale(Point, double);
+		virtual void Mirror(Point, Point);
+		virtual void Save(void);
+		virtual void Restore(void);
 		ObjectState GetState(void);
 		void Reparent(Object *);
-		Dimension * GetAttachedDimension(void);
-//Hm.		Object * Connect(Object *);
 
 		// Class methods
 		static void SetFixedAngle(bool state = true);
@@ -44,26 +60,45 @@ 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:
+	public:
 		Vector position;					// All objects have a position (doubles as reference point)
+	protected:
 		Object * parent;
+//this needs to be added eventually
 //		Pen pen;
 //		Fill fill;
+		Point oldPosition;
+	public:
+		ObjectType type;
 		ObjectState state;
+		unsigned int layer;
+	protected:
 		ObjectState oldState;
 		bool needUpdate;
-		Dimension * attachedDimension;
-		std::vector<Object *> connected;
+		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;
+		static Point snapPoint;
+		static bool snapPointIsValid;
 };
 
 #endif	// __OBJECT_H__