Misc. fixes & additions

[architektonas] / src / dimension.h

diff --git a/src/dimension.h b/src/dimension.h
index 34084c26af291a8d31e4bf70aacf58acc1e9f25a..7ffca2faabf8e72b4473c809c1f8981391cf8c07 100644 (file)
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -1,21 +1,32 @@
 #ifndef __DIMENSION_H__
 #define __DIMENSION_H__
 
+#include "connection.h"
 #include "object.h"
 
+enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader };
+
 class Dimension: public Object
 {
        public:
-               Dimension(Vector, Vector, Object * p = 0);
+               Dimension(Vector, Vector, DimensionType dt = DTLinear, Object * p = 0);
+               Dimension(Connection, Connection, DimensionType dt = DTLinear, Object * p = 0);
                ~Dimension();
 
-               virtual void Draw(QPainter *);
+               virtual void Draw(Painter *);
                virtual Vector Center(void);
                virtual bool Collided(Vector);
                virtual void PointerMoved(Vector);
                virtual void PointerReleased(void);
-               void SetPoint1(Vector);
-               void SetPoint2(Vector);
+               virtual bool HitTest(Point);
+               virtual void Enumerate(FILE *);
+               virtual Object * Copy(void);
+               virtual Vector GetPointAtParameter(double parameter);
+               virtual void Connect(Object *, double);
+               virtual void Disconnect(Object *, double);
+               virtual void DisconnectAll(Object *);
+               virtual QRectF Extents(void);
+               void FlipSides(void);
 
        protected:
                Vector endpoint;                                        // Starting point is Object::position
@@ -27,6 +38,17 @@ class Dimension: public Object
                bool draggingHandle2;
                bool objectWasDragged;
                double length;
+               DimensionType dimensionType;
+               bool hitPoint1;
+               bool hitPoint2;
+       public:
+               double size;                                            // Size of arrows/text in base units
+
+       private:
+               // We use these in lieu of the built-in connected[] array; no reason to
+               // do it this way especially
+               Connection point1;
+               Connection point2;
 };
 
 #endif // __DIMENSION_H__