X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=5f694886d5b079843c05ce5db191f8bd8a9c8525;hb=c20f82651fdc4dd26172bcb71a85e6eb29eacd43;hp=b63921248aca8fc1071d8b8fdd8f2b4b777faff6;hpb=a398911ea125eb6b25320e96599e0ae39b720cf8;p=architektonas diff --git a/src/structs.h b/src/structs.h index b639212..5f69488 100644 --- a/src/structs.h +++ b/src/structs.h @@ -5,15 +5,25 @@ #include #include #include "global.h" +#include "rect.h" #include "vector.h" -enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, 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 ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, TTPolygon, TTSpline, TTRotate, TTMirror, TTTrim, TTTriangulate, TTDelete, TTParallel }; -enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone }; +enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone }; + +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" +}; #define OBJECT_COMMON \ int type; \ @@ -24,90 +34,123 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone }; int style; \ bool selected; \ bool hovered; \ - bool hitPoint[4]; \ - bool hitObject; + bool hitPoint[5]; \ + bool hitObject; \ + Point p[5]; \ + double angle[2]; \ + double radius[2]; \ + double length; + +struct Object { + OBJECT_COMMON; +}; struct Line { OBJECT_COMMON; - Point p1; - Point p2; - Line(): type(OTLine), id(Global::objectID++) {} + 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), p1(pt1), p2(pt2) {} + style(l), selected(false), hovered(false), hitObject(false) { p[0] = pt1; p[1] = pt2; hitPoint[0] = hitPoint[1] = false; } }; struct Circle { OBJECT_COMMON; - Point p1; - double radius; + 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), p1(pt1), radius(r) {} + style(l), selected(false), hovered(false), hitObject(false) + { p[0] = pt1; radius[0] = r; hitPoint[0] = hitPoint[1] = false; } }; struct Ellipse { OBJECT_COMMON; - Point p1; - Point p2; - double radius1; - double radius2; + 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), p1(pt1), p2(pt2), radius1(r1), radius2(r2) {} + 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; } }; struct Arc { OBJECT_COMMON; - Point p1; - double radius; - double angle1; - double angle2; + 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), p1(pt1), radius(r), angle1(a1), angle2(a2) {} + 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; } }; struct Dimension { OBJECT_COMMON; int subtype; - Point p1; - Point p2; double offset; - - 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), subtype(dt), p1(pt1), p2(pt2) {} + 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; } }; struct Text { OBJECT_COMMON; - Point p1; + Rect extents; + bool measured; std::string s; - Text(Vector pt, char * str, float th = 10.0, uint32_t c = 0): + 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), p1(pt), s(str) {} + 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 objects; - double angle; - double scale; - Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false) {} + Polygon(): type(OTPolygon), id(Global::objectID++) {} }; -struct Object { +struct Spline { OBJECT_COMMON; + + Spline(): type(OTSpline), id(Global::objectID++) {} }; +struct Container { + OBJECT_COMMON; + std::vector objects; + double scale; + bool topLevel; + Object * clicked; + + Container(bool tl = false): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false), topLevel(tl), clicked(NULL) {} + void Add(void * obj) { objects.push_back(obj); } +// 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; + } + }*/ +}; #endif // __STRUCTS_H__