X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fobject.h;h=ec775d16fbf42fd1443bec267375bddb3d984f63;hb=921bf050ffe5fc81a9ab377e634180e659ee5d5d;hp=875e92ca6c358f7eec29ef60c3a1d24cf7d8895c;hpb=7b7c8ec7d7f5379e09a8b7392f465f41639b0c79;p=architektonas

diff --git a/src/object.h b/src/object.h
index 875e92c..ec775d1 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,11 +28,28 @@ 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(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
@@ -38,26 +60,42 @@ 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;
+		Point oldPosition;
+	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__