Changes to make containers behave like a first-class object.

[architektonas] / src / structs.h

diff --git a/src/structs.h b/src/structs.h
index cdd11ecac46540b778ac61659d62a20c981d4aa9..c1b33fb2958ee3133aae136199c345df547a0039 100644 (file)
--- a/src/structs.h
+++ b/src/structs.h
@@ -12,10 +12,19 @@ enum ObjectType { OTNone = 0, OTLine, OTCircle, OTEllipse, OTArc, OTPolygon, OTD
 
 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, 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;         \
        uint32_t id;      \
@@ -29,7 +38,8 @@ enum ToolState { TSNone, TSPoint1, TSPoint2, TSPoint3, TSPoint4, TSDone };
        bool hitObject;   \
        Point p[5];       \
        double angle[2];  \
-       double radius[2];
+       double radius[2]; \
+       double length;
 
 struct Object {
        OBJECT_COMMON;
@@ -38,10 +48,10 @@ struct Object {
 struct Line {
        OBJECT_COMMON;
 
-       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), hitObject(false) { p[0] = pt1; p[1] = pt2; }
+               style(l), selected(false), hovered(false), hitObject(false) { p[0] = pt1; p[1] = pt2; hitPoint[0] = hitPoint[1] = false; }
 };
 
 struct Circle {
@@ -51,7 +61,7 @@ struct Circle {
        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; }
+               { p[0] = pt1; radius[0] = r; hitPoint[0] = hitPoint[1] = false; }
 };
 
 struct Ellipse {
@@ -61,7 +71,7 @@ struct Ellipse {
        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; }
+               { p[0] = pt1; p[1] = pt2; radius[0] = r1; radius[1] = r2; hitPoint[0] = hitPoint[1] = false; }
 };
 
 struct Arc {
@@ -71,7 +81,7 @@ struct Arc {
        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; }
+               { p[0] = pt1; radius[0] = r; angle[0] = a1, angle[1] = a2; hitPoint[0] = hitPoint[1] = hitPoint[2] = false; }
 };
 
 struct Dimension {
@@ -81,11 +91,14 @@ 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++) {}
+       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, 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(0) { p[0] = pt1; p[1] = pt2; }
+               hitObject(false), subtype(dt), offset(0)
+               { p[0] = pt1; p[1] = pt2; hitPoint[0] = hitPoint[1] = hitPoint[2] = hitPoint[3] = hitPoint[4] = false; }
 };
 
 struct Text {
@@ -118,8 +131,10 @@ struct Container {
        std::vector<void *> objects;
        double scale;
        bool topLevel;
+       Object * clicked;
 
-       Container(bool tl = false): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false), topLevel(tl) {}
+       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)
        {