X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=cdd11ecac46540b778ac61659d62a20c981d4aa9;hb=0e8f4edf80206248f0ad87a966d69d9ec9da3d2f;hp=e0e17c89bf8dd5ce82ce381cfd555051557ee79c;hpb=da1348151182fe5340495ff8243e662b96c1fbfa;p=architektonas

diff --git a/src/structs.h b/src/structs.h
index e0e17c8..cdd11ec 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -5,15 +5,16 @@
 #include <vector>
 #include <string>
 #include "global.h"
+#include "rect.h"
 #include "vector.h"
 
-enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer };
+enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer, OTCount };
 
-enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader };
+enum DimensionType { DTLinear = 0, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader, DTCount };
 
 enum ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, TTPolygon, TTSpline, TTRotate, TTMirror, TTTrim, TTTriangulate, TTDelete };
 
-enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone };
+enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone };
 
 #define OBJECT_COMMON \
 	int type;         \
@@ -24,12 +25,16 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone };
 	int style;        \
 	bool selected;    \
 	bool hovered;     \
-	bool hitPoint[4]; \
+	bool hitPoint[5]; \
 	bool hitObject;   \
-	Point p[4];       \
+	Point p[5];       \
 	double angle[2];  \
 	double radius[2];
 
+struct Object {
+	OBJECT_COMMON;
+};
+
 struct Line {
 	OBJECT_COMMON;
 
@@ -73,21 +78,27 @@ struct Dimension {
 	OBJECT_COMMON;
 	int subtype;
 	double offset;
+	Point lp[2];		// Line point, the actual dimension line
+	Object * obj[2];	// Pointer to attached objects (circle, lines for angle)
 
 	Dimension(): type(OTDimension), id(Global::objectID++) {}
 	Dimension(Vector pt1, Vector pt2, DimensionType dt = DTLinear, float th = 1.0, uint32_t c = 0x0000FF, int l = LSSolid):
-		type(OTDimension), id(Global::objectID++), layer(0), color(c), thickness(th),
-		style(l), selected(false), hovered(false), hitObject(false), subtype(dt) { p[0] = pt1; p[1] = pt2; }
+		type(OTDimension), id(Global::objectID++), layer(0), color(c),
+		thickness(th), style(l), selected(false), hovered(false),
+		hitObject(false), subtype(dt), offset(0) { p[0] = pt1; p[1] = pt2; }
 };
 
 struct Text {
 	OBJECT_COMMON;
+	Rect extents;
+	bool measured;
 	std::string s;
 
 	Text(): type(OTText), id(Global::objectID++) {}
 	Text(Vector pt1, char * str, float th = 10.0, uint32_t c = 0):
 		type(OTText), id(Global::objectID++), layer(0), color(c), thickness(th),
-		style(LSSolid), selected(false), hovered(false), hitObject(false), s(str) { p[0] = pt1; }
+		style(LSSolid), selected(false), hovered(false), hitObject(false),
+		measured(false), s(str) { p[0] = pt1; angle[0] = 0; }
 };
 
 struct Polygon {
@@ -106,14 +117,25 @@ struct Container {
 	OBJECT_COMMON;
 	std::vector<void *> objects;
 	double scale;
+	bool topLevel;
 
-	Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false) {}
-};
+	Container(bool tl = false): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false), topLevel(tl) {}
+//	void DeleteContents(void) {}
+/*	void DeleteContents(Container * c)
+	{
+		std::vector<void *>::iterator i;
 
-struct Object {
-	OBJECT_COMMON;
-};
+		for(i=c->objects.begin(); i!=c->objects.end(); i++)
+		{
+			Object * obj = (Object *)(*i);
 
+			if (obj->type == OTContainer)
+				DeleteContainer((Container *)obj);
+
+			delete *i;
+		}
+	}*/
+};
 
 #endif	// __STRUCTS_H__