Initial bring-back of line to line intersection detection.

[architektonas] / src / line.h

diff --git a/src/line.h b/src/line.h
index bb4d5c1ac85efe0c60e9c93a0ea866f05d8a37c1..8c98924d648aeaa534bc1c7ec510efc5cd2e56e2 100644 (file)
--- a/src/line.h
+++ b/src/line.h
@@ -7,6 +7,8 @@ class Dimension;
 
 class Line: public Object
 {
+       friend class Geometry;
+
        public:
                Line(Vector, Vector, Object * p = 0);
                ~Line();
@@ -14,25 +16,33 @@ class Line: public Object
                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 Vector * GetPointAt(Vector);
                virtual void Enumerate(FILE *);
                virtual Object * Copy(void);
                virtual Vector GetPointAtParameter(double parameter);
+               virtual void MovePointAtParameter(double parameter, Vector);
                virtual QRectF Extents(void);
-//             virtual ObjectType Type(void);
+               virtual void Translate(Vector);
+               virtual void Rotate(Point, double);
+               virtual void Scale(Vector, double);
+               virtual void Mirror(Point, Point);
+               virtual void Save(void);
+               virtual void Restore(void);
                void SetDimensionOnLine(Dimension * d = 0);
                Object * FindAttachedDimension(void);
 
        protected:
-               bool HitTest(Point);
-               void SaveState(void);
-               bool StateChanged(void);
+               void SaveHitState(void);
+               bool HitStateChanged(void);
 
-       protected:
+       public:
                Vector endpoint;                                        // Starting point is Object::position
+       protected:
                Vector oldPoint;                                        // Used for dragging
+               Point oldEndpoint;
 
        private:
                bool draggingLine;
@@ -41,7 +51,9 @@ class Line: public Object
                bool objectWasDragged;
                double length;
                Vector angle;
+       public:
                bool hitPoint1, hitPoint2, hitLine;
+       private:
                bool oldHitPoint1, oldHitPoint2, oldHitLine;
 };