X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fstructs.h;h=e0e17c89bf8dd5ce82ce381cfd555051557ee79c;hb=da1348151182fe5340495ff8243e662b96c1fbfa;hp=398cfa773fd4390c1cb4e83e2afba75ed046eaac;hpb=06456047e6476969e45be5b1f31b8336ea74c45f;p=architektonas diff --git a/src/structs.h b/src/structs.h index 398cfa7..e0e17c8 100644 --- a/src/structs.h +++ b/src/structs.h @@ -7,7 +7,7 @@ #include "global.h" #include "vector.h" -enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTDimension, OTSpline, OTText, OTContainer }; +enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTDimension, OTSpline, OTText, OTContainer }; enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader }; @@ -26,7 +26,9 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone }; bool hovered; \ bool hitPoint[4]; \ bool hitObject; \ - Point p[4]; + Point p[4]; \ + double angle[2]; \ + double radius[2]; struct Line { OBJECT_COMMON; @@ -39,35 +41,32 @@ struct Line { struct Circle { OBJECT_COMMON; - 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), hitObject(false), radius(r) { p[0] = pt1; } + style(l), selected(false), hovered(false), hitObject(false) + { p[0] = pt1; radius[0] = r; } }; struct Ellipse { OBJECT_COMMON; - 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), hitObject(false), radius1(r1), radius2(r2) { p[0] = pt1; p[1] = pt2; } + style(l), selected(false), hovered(false), hitObject(false) + { p[0] = pt1; p[1] = pt2; radius[0] = r1; radius[1] = r2; } }; struct Arc { OBJECT_COMMON; - 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), hitObject(false), radius(r), angle1(a1), angle2(a2) { p[0] = pt1; } + style(l), selected(false), hovered(false), hitObject(false) + { p[0] = pt1; radius[0] = r; angle[0] = a1, angle[1] = a2; } }; struct Dimension { @@ -91,10 +90,21 @@ struct Text { style(LSSolid), selected(false), hovered(false), hitObject(false), s(str) { p[0] = pt1; } }; +struct Polygon { + OBJECT_COMMON; + + Polygon(): type(OTPolygon), id(Global::objectID++) {} +}; + +struct Spline { + OBJECT_COMMON; + + Spline(): type(OTSpline), id(Global::objectID++) {} +}; + struct Container { OBJECT_COMMON; std::vector objects; - double angle; double scale; Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false) {}