Added ability to edit grid unit in base units, work on Dimension.

[architektonas] / src / circle.h

diff --git a/src/circle.h b/src/circle.h
index 1a000da1e976fc9067cef114afe54979cc211d84..1f0d38723836822e32ba82089f163dfde45ca9c2 100644 (file)
--- a/src/circle.h
+++ b/src/circle.h
@@ -14,22 +14,23 @@ class Circle: public Object
                virtual bool Collided(Vector);
                virtual void PointerMoved(Vector);
                virtual void PointerReleased(void);
-//             virtual bool NeedsUpdate(void);
+               virtual bool HitTest(Point);
+               virtual void Enumerate(FILE *);
+               virtual QRectF Extents(void);
+//             virtual Object * Copy(void);
+//             virtual ObjectType Type(void);
 
        protected:
-               bool HitTest(Point);
                void SaveState(void);
                bool StateChanged(void);
 
        protected:
                double radius;                                          // Center is Object::position
-               Vector oldPoint;                                        // Used for dragging
+               Vector dragPoint;                                       // Used for rendering edge dragging
 
        private:
-               bool dragging;
-               bool draggingHandle1;
-               bool draggingHandle2;
-//             bool needUpdate;
+               bool draggingEdge;
+               bool draggingCenter;
                bool objectWasDragged;
                bool hitCenter, hitCircle;
                bool oldHitCenter, oldHitCircle;