Make selections encompass Dimension objects.

[architektonas] / src / structs.h

diff --git a/src/structs.h b/src/structs.h
index e0e17c89bf8dd5ce82ce381cfd555051557ee79c..7fe1f09e96eca0c5d018c315a15d5498c598c676 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -7,13 +7,13 @@
 #include "global.h"
 #include "vector.h"
 
-enum ObjectType { OTNone, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, 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 ToolType { TTNone, TTLine, TTCircle, TTEllipse, TTArc, TTDimension, TTText, TTPolygon, TTSpline, TTRotate, TTMirror, TTTrim, TTTriangulate, TTDelete };
 
-enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone };
+enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone };
 
 #define OBJECT_COMMON \
        int type;         \
@@ -24,9 +24,9 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSDone };
        int style;        \
        bool selected;    \
        bool hovered;     \
-       bool hitPoint[4]; \
+       bool hitPoint[5]; \
        bool hitObject;   \
-       Point p[4];       \
+       Point p[5];       \
        double angle[2];  \
        double radius[2];
 
@@ -73,11 +73,14 @@ struct Dimension {
        OBJECT_COMMON;
        int subtype;
        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), hitObject(false), subtype(dt) { p[0] = pt1; p[1] = 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 {
@@ -106,14 +109,29 @@ struct Container {
        OBJECT_COMMON;
        std::vector<void *> objects;
        double scale;
+       bool topLevel;
 
-       Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false) {}
+       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;
+               }
+       }*/
 };
 
 struct Object {
        OBJECT_COMMON;
 };
 
-
 #endif // __STRUCTS_H__