Fixed duplicate Connection issue.

[architektonas] / src / dimension.h

diff --git a/src/dimension.h b/src/dimension.h
index be8e5c51a31eda8efea566c3b4439bbbdb32c9f8..ca146bb4a48abd184e9343b52c58c8d3aa0e6592 100644 (file)
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -4,13 +4,16 @@
 #include "connection.h"
 #include "object.h"
 
-enum DimensionType { DTLinear, DTRadial, DTDiametric, DTCircumferential, DTLeader };
+class Line;
+
+enum DimensionType { DTLinear, DTLinearVert, DTLinearHorz, DTRadial, DTDiametric, DTCircumferential, DTAngular, DTLeader };
 
 class Dimension: public Object
 {
+       friend class Line;
+
        public:
                Dimension(Vector, Vector, DimensionType dt = DTLinear, Object * p = 0);
-//             Dimension(Vector *, Vector *, DimensionType dt = DTLinear, Object * p = 0);
                Dimension(Connection, Connection, DimensionType dt = DTLinear, Object * p = 0);
                ~Dimension();
 
@@ -19,17 +22,25 @@ class Dimension: public Object
                virtual bool Collided(Vector);
                virtual void PointerMoved(Vector);
                virtual void PointerReleased(void);
+               virtual bool HitTest(Point);
                virtual void Enumerate(FILE *);
-//             virtual Object * Copy(void);
+               virtual Object * Copy(void);
                virtual Vector GetPointAtParameter(double parameter);
+               virtual void MovePointAtParameter(double parameter, Vector);
                virtual void Connect(Object *, double);
                virtual void Disconnect(Object *, double);
                virtual void DisconnectAll(Object *);
+               virtual QRectF Extents(void);
                void FlipSides(void);
 
+       protected:
+               void SaveHitState(void);
+               bool HitStateChanged(void);
+
        protected:
                Vector endpoint;                                        // Starting point is Object::position
                Vector oldPoint;                                        // Used for dragging
+               Point oldEndpoint;
 
        private:
                bool dragging;
@@ -37,10 +48,16 @@ class Dimension: public Object
                bool draggingHandle2;
                bool objectWasDragged;
                double length;
-               DimensionType type;
+               DimensionType dimensionType;
+               bool hitPoint1;
+               bool hitPoint2;
+               bool oldHitPoint1, oldHitPoint2;
+       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 this way especially
+               // do it this way especially
                Connection point1;
                Connection point2;
 };