X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=cdd11ecac46540b778ac61659d62a20c981d4aa9;hb=ccac11461956c9c0cc9756f8963436b5d88dfbb7;hp=7fe1f09e96eca0c5d018c315a15d5498c598c676;hpb=3f1e5ba1d42ab40edf75cf05df16b0e25d0821cb;p=architektonas

diff --git a/src/structs.h b/src/structs.h
index 7fe1f09..cdd11ec 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -5,11 +5,12 @@
 #include <vector>
 #include <string>
 #include "global.h"
+#include "rect.h"
 #include "vector.h"
 
 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 };
 
@@ -30,6 +31,10 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone };
 	double angle[2];  \
 	double radius[2];
 
+struct Object {
+	OBJECT_COMMON;
+};
+
 struct Line {
 	OBJECT_COMMON;
 
@@ -85,12 +90,15 @@ struct Dimension {
 
 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 {
@@ -129,9 +137,5 @@ struct Container {
 	}*/
 };
 
-struct Object {
-	OBJECT_COMMON;
-};
-
 #endif	// __STRUCTS_H__