X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fstructs.h;h=cdd11ecac46540b778ac61659d62a20c981d4aa9;hb=4708212b56a0c5645226e728f9a26ee1fd2d027d;hp=a6b52ccb69a5fa3f4b70d3b58e65bba10e10eaf7;hpb=84afe881653a02a16b19d4da37435b8701b1a826;p=architektonas

diff --git a/src/structs.h b/src/structs.h
index a6b52cc..cdd11ec 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -5,9 +5,16 @@
 #include <vector>
 #include <string>
 #include "global.h"
+#include "rect.h"
 #include "vector.h"
 
-enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTEllipse, OTContainer, OTSpline };
+enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer, OTCount };
+
+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, TSPoint3, TSPoint4, TSDone };
 
 #define OBJECT_COMMON \
 	int type;         \
@@ -16,67 +23,119 @@ enum ObjectType { OTNone, OTObject, OTLine, OTCircle, OTArc, OTDimension, OTElli
 	uint32_t color;   \
 	float thickness;  \
 	int style;        \
-	bool selected;
+	bool selected;    \
+	bool hovered;     \
+	bool hitPoint[5]; \
+	bool hitObject;   \
+	Point p[5];       \
+	double angle[2];  \
+	double radius[2];
+
+struct Object {
+	OBJECT_COMMON;
+};
 
 struct Line {
 	OBJECT_COMMON;
-	Point p1;
-	Point p2;
 
 	Line(): type(OTLine), id(Global::objectID++) {}
-	Line(Vector pt1, Vector pt2, float th = 1.0, uint32_t c = 0, int l = 0):
-		type(OTLine), id(Global::objectID++), layer(l), color(c), thickness(th),
-		style(0), selected(false), p1(pt1), p2(pt2) {}
+	Line(Vector pt1, Vector pt2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
+		type(OTLine), id(Global::objectID++), layer(0), color(c), thickness(th),
+		style(l), selected(false), hovered(false), hitObject(false) { p[0] = pt1; p[1] = pt2; }
 };
 
 struct Circle {
 	OBJECT_COMMON;
-	Point p1;
-	double radius;
 
-	Circle(Vector pt1, double r, float th = 1.0, uint32_t c = 0, int l = 0):
-		type(OTCircle), id(Global::objectID++), layer(l), color(c), thickness(th),
-		style(0), selected(false), p1(pt1), radius(r) {}
+	Circle(): type(OTCircle), id(Global::objectID++) {}
+	Circle(Vector pt1, double r, float th = 1.0, uint32_t c = 0, int l = LSSolid):
+		type(OTCircle), id(Global::objectID++), layer(0), color(c), thickness(th),
+		style(l), selected(false), hovered(false), hitObject(false)
+		{ p[0] = pt1; radius[0] = r; }
+};
+
+struct Ellipse {
+	OBJECT_COMMON;
+
+	Ellipse(): type(OTEllipse), id(Global::objectID++) {}
+	Ellipse(Vector pt1, Vector pt2, double r1, double r2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
+		type(OTEllipse), id(Global::objectID++), layer(0), color(c), thickness(th),
+		style(l), selected(false), hovered(false), hitObject(false)
+		{ p[0] = pt1; p[1] = pt2; radius[0] = r1; radius[1] = r2; }
 };
 
 struct Arc {
 	OBJECT_COMMON;
-	Point p1;
-	double radius;
-	double angle1;
-	double angle2;
-
-	Arc(Vector pt1, double r, double a1, double a2, float th = 1.0, uint32_t c = 0, int l = 0):
-		type(OTArc), id(Global::objectID++), layer(l), color(c), thickness(th),
-		style(0), selected(false), p1(pt1), radius(r), angle1(a1), angle2(a2) {}
+
+	Arc(): type(OTArc), id(Global::objectID++) {}
+	Arc(Vector pt1, double r, double a1, double a2, float th = 1.0, uint32_t c = 0, int l = LSSolid):
+		type(OTArc), id(Global::objectID++), layer(0), color(c), thickness(th),
+		style(l), selected(false), hovered(false), hitObject(false)
+		{ p[0] = pt1; radius[0] = r; angle[0] = a1, angle[1] = a2; }
+};
+
+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), offset(0) { p[0] = pt1; p[1] = pt2; }
 };
 
 struct Text {
 	OBJECT_COMMON;
-	Point p1;
+	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),
+		measured(false), s(str) { p[0] = pt1; angle[0] = 0; }
 };
 
-struct Container {
+struct Polygon {
 	OBJECT_COMMON;
-	Point p1;
-	std::vector<void *> objects;
-	double angle;
-	double scale;
+
+	Polygon(): type(OTPolygon), id(Global::objectID++) {}
 };
 
-struct Dimension {
+struct Spline {
 	OBJECT_COMMON;
-	int subtype;
-	Point p1;
-	Point p2;
-	double offset;
+
+	Spline(): type(OTSpline), id(Global::objectID++) {}
 };
 
-struct Object {
+struct Container {
 	OBJECT_COMMON;
-};
+	std::vector<void *> objects;
+	double scale;
+	bool topLevel;
 
+	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;
+
+		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__