Fixed Container loading, informative display.

[architektonas] / src / circle.cpp

diff --git a/src/circle.cpp b/src/circle.cpp
index 6473440ccdb287408e24870b501b23ebbd611551..75e9d9352e2749ccea3defaca75452bddb8d5aa9 100644 (file)
--- a/src/circle.cpp
+++ b/src/circle.cpp
@@ -53,6 +53,28 @@ Circle::~Circle()
 
        if (state == OSSelected && draggingEdge && objectWasDragged)
                painter->DrawHandle(dragPoint);
+
+       // If resizing the circle, draw an information panel showing the new radius.
+       if (draggingEdge)
+       {
+               QString text = QObject::tr("Radius: %1\nScale: %2%");
+               text = text.arg(radius, 0, 'd', 4).arg(radius / oldRadius * 100.0, 0, 'd', 0);
+#if 0
+               QPen pen = QPen(QColor(0x00, 0xFF, 0x00), 1.0, Qt::SolidLine);
+               painter->SetPen(pen);
+               painter->SetBrush(QBrush(QColor(0x40, 0xFF, 0x40, 0x9F)));
+               QRectF textRect(10.0, 10.0, 270.0, 70.0);       // x, y, w, h
+               painter->DrawRoundedRect(textRect, 7.0, 7.0);
+
+               textRect.setLeft(textRect.left() + 14);
+               painter->SetFont(*Object::font);
+               pen = QPen(QColor(0x00, 0x5F, 0xDF));
+               painter->SetPen(pen);
+               painter->DrawText(textRect, Qt::AlignVCenter, text);
+#else
+               painter->DrawInformativeText(text);
+#endif
+       }
 }
 
 
@@ -68,6 +90,11 @@ Circle::~Circle()
        objectWasDragged = false;
        HitTest(point);
 
+       // Now that we've done our hit testing on the non-snapped point, snap it if
+       // necessary...
+       if (snapToGrid)
+               point = SnapPointToGrid(point);
+
        draggingCenter = hitCenter;
        draggingEdge = hitCircle;
 
@@ -76,6 +103,7 @@ Circle::~Circle()
                dragPoint = point;
                oldState = state;
                state = OSSelected;
+               oldRadius = radius;
                return true;
        }
 
@@ -90,7 +118,8 @@ Circle::~Circle()
        if (selectionInProgress)
        {
                // Check for whether or not the rect contains this circle
-               if (selection.normalized().contains(Extents()))
+//             if (selection.normalized().contains(Extents()))
+               if (selection.contains(Extents()))
                        state = OSSelected;
                else
                        state = OSInactive;
@@ -100,9 +129,14 @@ Circle::~Circle()
 
        // Hit test tells us what we hit (if anything) through boolean variables. It
        // also tells us whether or not the state changed.
-       needUpdate = HitTest(point);
+       SaveHitState();
+       HitTest(point);
+       needUpdate = HitStateChanged();
        objectWasDragged = (draggingEdge | draggingCenter);
 
+       if (objectWasDragged)
+               needUpdate = true;
+
        if (draggingEdge)
                radius = Vector::Magnitude(point, position);
        else if (draggingCenter)
@@ -126,23 +160,9 @@ Circle::~Circle()
 }
 
 
-/*virtual*/ QRectF Circle::Extents(void)
+/*virtual*/ bool Circle::HitTest(Point point)
 {
-       return QRectF(QPointF(position.x - radius, position.y - radius), QPointF(position.x + radius, position.y + radius));
-}
-
-
-#if 0
-/*virtual*/ ObjectType Circle::Type(void)
-{
-       return OTCircle;
-}
-#endif
-
-
-bool Circle::HitTest(Point point)
-{
-       SaveState();
+//     SaveHitState();
        hitCenter = hitCircle = false;
        double length = Vector::Magnitude(position, point);
 //printf("Circle::length = %lf, radius = %lf\n", length, radius);
@@ -169,18 +189,25 @@ pointed at length with our on screen length.
        else if ((fabs(length - radius) * Painter::zoom) < 2.0)
                hitCircle = true;
 
-       return StateChanged();
+//     return HitStateChanged();
+       return (hitCenter || hitCircle ? true : false);
 }
 
 
-void Circle::SaveState(void)
+/*virtual*/ QRectF Circle::Extents(void)
+{
+       return QRectF(QPointF(position.x - radius, position.y - radius), QPointF(position.x + radius, position.y + radius));
+}
+
+
+void Circle::SaveHitState(void)
 {
        oldHitCenter = hitCenter;
        oldHitCircle = hitCircle;
 }
 
 
-bool Circle::StateChanged(void)
+bool Circle::HitStateChanged(void)
 {
        if ((hitCenter != oldHitCenter) || (hitCircle != oldHitCircle))
                return true;
@@ -194,3 +221,19 @@ bool Circle::StateChanged(void)
        fprintf(file, "CIRCLE (%lf,%lf) %lf\n", position.x, position.y, radius);
 }
 
+
+/*virtual*/ Object * Circle::Copy(void)
+{
+#warning "!!! This doesn't take care of attached Dimensions !!!"
+/*
+This is a real problem. While having a pointer in the Dimension to this line's points
+is fast & easy, it creates a huge problem when trying to replicate an object like this.
+
+Maybe a way to fix that then, is to have reference numbers instead of pointers. That
+way, if you copy them, ... you might still have problems. Because you can't be sure if
+a copy will be persistant or not, you then *definitely* do not want them to have the
+same reference number.
+*/
+       return new Circle(position, radius, parent);
+}
+