Misc. fixes & additions

[architektonas] / src / line.h

diff --git a/src/line.h b/src/line.h
index 87c3c7f5d143d7d9af60a783b0dafbeae9b8181b..0ad264cd1f2debc38a08dabe68cf654bd59a78ab 100644 (file)
--- a/src/line.h
+++ b/src/line.h
@@ -7,33 +7,49 @@ class Dimension;
 
 class Line: public Object
 {
+       friend class Geometry;
+
        public:
                Line(Vector, Vector, Object * p = 0);
                ~Line();
 
-               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 SetDimensionOnPoint1(Dimension *);
-               void SetDimensionOnPoint2(Dimension *);
+               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 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:
                Vector endpoint;                                        // Starting point is Object::position
                Vector oldPoint;                                        // Used for dragging
+               Point oldEndpoint;
 
        private:
-               bool dragging;
+               bool draggingLine;
                bool draggingHandle1;
                bool draggingHandle2;
                bool objectWasDragged;
                double length;
+               Vector angle;
                bool hitPoint1, hitPoint2, hitLine;
                bool oldHitPoint1, oldHitPoint2, oldHitLine;
 };