#include <vector>
#include <string>
#include "global.h"
+#include "rect.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 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; \
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];
+ double radius[2]; \
+ double length;
+
+struct Object {
+ OBJECT_COMMON;
+};
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 {
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 {
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 {
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 {
OBJECT_COMMON;
int subtype;
double offset;
-
- 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; }
+ 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;
+ Rect extents;
+ bool measured;
std::string s;
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), hitObject(false), s(str) { p[0] = pt1; }
+ style(LSSolid), selected(false), hovered(false), hitObject(false),
+ measured(false), s(str) { p[0] = pt1; angle[0] = 0; }
};
struct Polygon {
OBJECT_COMMON;
std::vector<void *> objects;
double scale;
-
- Container(): type(OTContainer), id(Global::objectID++), selected(false), hovered(false), hitObject(false) {}
+ 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<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__
projects / architektonas / blobdiff