Added ability to manipulate Text objects.

[architektonas] / src / structs.h

diff --git a/src/structs.h b/src/structs.h
index f1b5ce1cf722dc06b6fd4b4050173f75f3834e17..cdd11ecac46540b778ac61659d62a20c981d4aa9 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -5,12 +5,16 @@
 #include <vector>
 #include <string>
 #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 ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone };
 
 #define OBJECT_COMMON \
        int type;         \
@@ -21,90 +25,117 @@ enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric
        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];
+
+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 = 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; }
 };
 
 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; }
 };
 
 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; }
 };
 
 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; }
 };
 
 struct Dimension {
        OBJECT_COMMON;
        int subtype;
-       Point p1;
-       Point p2;
        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), subtype(dt), p1(pt1), p2(pt2) {}
+               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(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<void *> 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<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__