X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=e7e7b30643ffa82465922fe2fdc3fead7d6a61cb;hb=10cf4c797bed05831e976068b7504908279dc997;hp=8250a002c8dab39c8ff820b210e70ea60613bac0;hpb=3c890e51a9763ffcee49e15753453a7da248272b;p=architektonas diff --git a/src/structs.h b/src/structs.h index 8250a00..e7e7b30 100644 --- a/src/structs.h +++ b/src/structs.h @@ -2,13 +2,13 @@ #define __STRUCTS_H__ #include -#include #include +#include #include "global.h" #include "rect.h" #include "vector.h" -enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer, OTPolyline, OTCount }; +enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTDimension, OTPolyline, OTSpline, OTText, OTContainer, OTCount }; enum DimensionType { DTLinear = 0, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader, DTCount }; @@ -18,20 +18,10 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone }; enum BasicUnit { BUInch = 0, BUFoot, BUYard, BUMile, BUMM, BUCM, BUM, BUKM, BUCount }; -const char objName[OTCount][16] = { - "None", "Line", "Circle", "Ellipse", "Arc", "Polygon", "Dimension", - "Spline", "Text", "Container" -}; -const char dimName[DTCount][32] = { - "Linear", "Vertical", "Horizontal", "Radial", "Diametric", - "Circumferential", "Angular", "Leader" -}; - -const char buShortName[BUCount][8] = { - "in", "ft", "yd", "mi", "mm", "cm", "m", "km" -}; - -const double buInInches[BUCount] = { 1.0, 12.0, 36.0, 1.0/25.4, 1.0/2.54, 1.0/0.0254, 1.0/0.0000254 }; +extern const char objName[OTCount][16]; +extern const char dimName[DTCount][32]; +extern const char buShortName[BUCount][8]; +extern const double buInInches[BUCount]; #define OBJECT_COMMON \ int type; \ @@ -56,43 +46,33 @@ struct Object { struct Line { OBJECT_COMMON; - Line(): type(OTLine), id(Global::objectID++), selected(false), hovered(false), hitObject(false) { hitPoint[0] = hitPoint[1] = false; } - 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; hitPoint[0] = hitPoint[1] = false; } - Vector Vect(void) { return Vector(p[0], p[1]); } - Vector Unit(void) { return Vector(p[0], p[1]).Unit(); } - double Length(void) { return Vector(p[0], p[1]).Magnitude(); } + Line(); + Line(Vector pt1, Vector pt2, float th = 1.0, uint32_t c = 0, int l = LSSolid); + Vector Vect(void); + Vector Unit(void); + double Length(void); }; struct Circle { OBJECT_COMMON; - 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; hitPoint[0] = hitPoint[1] = false; } + Circle(); + Circle(Vector pt1, double r, float th = 1.0, uint32_t c = 0, int l = LSSolid); }; 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; hitPoint[0] = hitPoint[1] = false; } + Ellipse(); + Ellipse(Vector pt1, Vector pt2, double r1, double r2, float th = 1.0, uint32_t c = 0, int l = LSSolid); }; struct Arc { OBJECT_COMMON; - 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; hitPoint[0] = hitPoint[1] = hitPoint[2] = false; } + Arc(); + Arc(Vector pt1, double r, double a1, double a2, float th = 1.0, uint32_t c = 0, int l = LSSolid); + Rect Bounds(void); }; struct Dimension { @@ -102,14 +82,8 @@ struct Dimension { 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++), selected(false), - hovered(false), hitObject(false) - { hitPoint[0] = hitPoint[1] = hitPoint[2] = hitPoint[3] = hitPoint[4] = false; } - Dimension(Vector pt1, Vector pt2, DimensionType dt = DTLinear, double offs = 0, 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(offs) - { p[0] = pt1; p[1] = pt2; hitPoint[0] = hitPoint[1] = hitPoint[2] = hitPoint[3] = hitPoint[4] = false; } + Dimension(); + Dimension(Vector pt1, Vector pt2, DimensionType dt = DTLinear, double offs = 0, float th = 1.0, uint32_t c = 0x0000FF, int l = LSSolid); }; struct Text { @@ -118,37 +92,29 @@ struct Text { bool measured; std::string s; - Text(): type(OTText), id(Global::objectID++) {} - Text(Vector pt1, const 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; } -}; - -//prolly don't need this, as this just a special case of a polyline... -struct Polygon { - OBJECT_COMMON; - int sides; - - Polygon(): type(OTPolygon), id(Global::objectID++) {} + Text(); + Text(Vector pt1, const char * str, float th = 10.0, uint32_t c = 0); }; struct Polyline { OBJECT_COMMON; - VPVector points; -//need this? could just repeat the endpoint as well... -// bool closed; - Object * clicked; - - Polyline(): type(OTPolyline), id(Global::objectID++), selected(false), hovered(false), hitObject(false), clicked(NULL) {} - void Add(void * obj) { points.push_back(obj); } - void Add(VPVector objs) { points.insert(points.end(), objs.begin(), objs.end()); } + std::vector points; +// bool closed; //need this? could just repeat the endpoint as well... +// Object * clicked; + int ptNum; + + Polyline(float th = 1.0, uint32_t c = 0, int l = LSSolid); + Polyline(std::vector, float th = 1.0, uint32_t c = 0, int l = LSSolid); + void Add(Point); + void Add(std::vector); + Rect Bounds(void); + void Translate(Point); }; struct Spline { OBJECT_COMMON; - Spline(): type(OTSpline), id(Global::objectID++) {} + Spline(); }; struct Container { @@ -163,24 +129,9 @@ struct Container { int decimalPrecision; // 0-5, which, +1, is # of decimal places int fractionalPrecision; // 0-5, which, +1, is 1/(2^n) - Container(bool tl = false): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false), topLevel(tl), clicked(NULL), baseUnit(0), unitStyle(0), decimalPrecision(3), fractionalPrecision(4) {} - void Add(void * obj) { objects.push_back(obj); } - void Add(VPVector objs) { objects.insert(objects.end(), objs.begin(), objs.end()); } -// void DeleteContents(void) {} -/* void DeleteContents(Container * c) - { - std::vector::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; - } - }*/ + Container(bool tl = false); + void Add(void * obj); + void Add(VPVector objs); }; #endif // __STRUCTS_H__