Fixed Dimension class to rotate, translate & mirror correctly.

[architektonas] / src / dimension.h

diff --git a/src/dimension.h b/src/dimension.h
index ba30b8f7e98980eb82274d8983c6b41190e90160..b3993b0413856b858106b7a7d408cca38aba02c4 100644 (file)
--- a/src/dimension.h
+++ b/src/dimension.h
@@ -1,7 +1,6 @@
 #ifndef __DIMENSION_H__
 #define __DIMENSION_H__
 
-#include "connection.h"
 #include "object.h"
 
 class Line;
@@ -15,22 +14,23 @@ class Dimension: public Object
 
        public:
                Dimension(Vector, Vector, DimensionType dt = DTLinear, Object * p = 0);
-//             Dimension(Connection, Connection, DimensionType dt = DTLinear, Object * p = 0);
                ~Dimension();
 
                virtual void Draw(Painter *);
                virtual Vector Center(void);
                virtual bool Collided(Vector);
-               virtual void PointerMoved(Vector);
+               virtual bool PointerMoved(Vector);
                virtual void PointerReleased(void);
                virtual bool HitTest(Point);
+               virtual void Translate(Vector);
+               virtual void Rotate(Point, double);
+               virtual void Mirror(Point, Point);
+               virtual void Save(void);
+               virtual void Restore(void);
                virtual void Enumerate(FILE *);
                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);
 
@@ -42,6 +42,7 @@ class Dimension: public Object
                Vector endpoint;                                        // Starting point is Object::position
                Vector oldPoint;                                        // Used for dragging
                Point oldEndpoint;
+               Point linePt1, linePt2;                         // Used for testing dimension line hits
 
        private:
                bool dragging;
@@ -54,15 +55,11 @@ class Dimension: public Object
                bool hitPoint2;
                bool hitLine;
                bool hitFlipSwitch;
-               bool oldHitPoint1, oldHitPoint2, oldHitLine, oldHitFlipSwitch;
+               bool hitChangeSwitch1;
+               bool hitChangeSwitch2;
+               bool oldHitPoint1, oldHitPoint2, oldHitLine, oldHitFlipSwitch, oldHitChangeSwitch1, oldHitChangeSwitch2;
        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__