X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fdimension.h;h=32aa2857c3582ee1786faaa70b7f62baf0210c29;hb=2549a213bacfb2f6993ec143083d72b716854345;hp=4fbcaa8054a379069006ddd3cb2e498e302e06a4;hpb=e11a07565fe5ef3dfafbf9a933d7a1575e058867;p=architektonas diff --git a/src/dimension.h b/src/dimension.h index 4fbcaa8..32aa285 100644 --- a/src/dimension.h +++ b/src/dimension.h @@ -18,17 +18,24 @@ 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 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; @@ -36,8 +43,14 @@ 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 it this way especially Connection point1;