Improve visualization for tool Point of intersection circles.

src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp

@@ -49,6 +49,8 @@
 #include "../vmisc/vabstractapplication.h"
 #include "../vmisc/vcommonsettings.h"
 #include "ui_dialogpointofintersectioncircles.h"
+#include "../vwidgets/vabstractmainwindow.h"
+#include "../vgeometry/vpointf.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContainer *data, quint32 toolId,
@@ -242,6 +244,67 @@ void DialogPointOfIntersectionCircles::SetCrossCirclesPoint(const CrossCirclesPo
     }
 }
 
+//---------------------------------------------------------------------------------------------------------------------
+void DialogPointOfIntersectionCircles::ShowDialog(bool click)
+{
+    if (m_stage == 0 || m_stage == 2)
+    {
+        return;
+    }
+
+    auto FinishCreating = [this]()
+    {
+        vis->SetMode(Mode::Show);
+        vis->RefreshGeometry();
+
+        emit ToolTip(QString());
+
+        setModal(true);
+        show();
+    };
+
+    if (click)
+    {
+        // The check need to ignore first release of mouse button.
+        // User can select point by clicking on a label.
+        if (not m_firstRelease)
+        {
+            m_firstRelease = true;
+            return;
+        }
+
+        auto *scene = qobject_cast<VMainGraphicsScene *>(VAbstractValApplication::VApp()->getCurrentScene());
+        SCASSERT(scene != nullptr)
+
+        QSharedPointer<VPointF> center = data->GeometricObject<VPointF>(m_stage == 1 ? GetFirstCircleCenterId()
+                                                                                     : GetSecondCircleCenterId());
+
+        QLineF line(static_cast<QPointF>(*center), scene->getScenePos());
+
+        if (m_stage == 1)
+        {
+            SetFirstCircleRadius(QString::number(FromPixel(line.length(), *data->GetPatternUnit())));
+            emit ToolTip(tr("Select second circle center"));
+            ++m_stage;
+            m_firstRelease = false;
+        }
+        else
+        {
+            SetSecondCircleRadius(QString::number(FromPixel(line.length(), *data->GetPatternUnit())));
+            ++m_stage;
+        }
+
+        if (m_stage > 2)
+        {
+            FinishCreating();
+        }
+
+        return;
+    }
+
+    FinishCreating();
+}
+
 //---------------------------------------------------------------------------------------------------------------------
 void DialogPointOfIntersectionCircles::ChosenObject(quint32 id, const SceneObject &type)
 {
@@ -255,26 +318,29 @@ void DialogPointOfIntersectionCircles::ChosenObject(quint32 id, const SceneObjec
         auto *point = qobject_cast<VisToolPointOfIntersectionCircles *>(vis);
         SCASSERT(point != nullptr)
 
-        switch (m_number)
+        switch (m_stage)
         {
             case 0:
-                if (SetObject(id, ui->comboBoxCircle1Center, tr("Select second circle center")))
+                if (SetObject(id, ui->comboBoxCircle1Center, QString()))
                 {
-                    m_number++;
+                    ++m_stage;
                     point->VisualMode(id);
+
+                    auto *window = qobject_cast<VAbstractMainWindow *>(
+                        VAbstractValApplication::VApp()->getMainWindow());
+                    SCASSERT(window != nullptr)
+                    connect(vis, &Visualization::ToolTip, window, &VAbstractMainWindow::ShowToolTip);
                 }
                 break;
-            case 1:
+            case 2:
                 if (getCurrentObjectId(ui->comboBoxCircle1Center) != id)
                 {
                     if (SetObject(id, ui->comboBoxCircle2Center, QString()))
                     {
-                        m_number = 0;
                         point->setObject2Id(id);
                         point->RefreshGeometry();
+                        ++m_stage;
                         prepare = true;
-                        this->setModal(true);
-                        this->show();
                     }
                 }
                 break;

src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.h

@@ -73,6 +73,8 @@ public:
     void SetNotes(const QString &notes);
     auto GetNotes() const -> QString;
 
+    void ShowDialog(bool click) override;
+
 public slots:
     void ChosenObject(quint32 id, const SceneObject &type) override;
     void PointChanged();
@@ -116,8 +118,10 @@ private:
     bool m_flagName{true};
     bool m_flagError{true};
 
+    bool m_firstRelease{false};
+
     /** @brief number number of handled objects */
-    qint32 m_number{0};
+    qint32 m_stage{0};
 };
 
 //---------------------------------------------------------------------------------------------------------------------

src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.cpp

@@ -41,6 +41,7 @@
 #include "../vwidgets/vmaingraphicsscene.h"
 #include "../visualization.h"
 #include "visline.h"
+#include "../vmisc/vmodifierkey.h"
 
 //---------------------------------------------------------------------------------------------------------------------
 VisToolPointOfIntersectionCircles::VisToolPointOfIntersectionCircles(const VContainer *data, QGraphicsItem *parent)
@@ -48,9 +49,15 @@ VisToolPointOfIntersectionCircles::VisToolPointOfIntersectionCircles(const VCont
 {
     this->setPen(QPen(Qt::NoPen)); // don't use parent this time
 
-    m_c1Path = InitItem<QGraphicsEllipseItem>(Qt::darkGreen, this);
+    m_c1Path = InitItem<VScaledEllipse>(Qt::darkGreen, this);
-    m_c2Path = InitItem<QGraphicsEllipseItem>(Qt::darkRed, this);
+    m_c1Path->SetPointMode(false);
+
+    m_c2Path = InitItem<VScaledEllipse>(Qt::darkRed, this);
+    m_c2Path->SetPointMode(false);
+
     m_point = InitPoint(mainColor, this);
+    m_point->setZValue(1);
+
     m_c1Center = InitPoint(supportColor, this);
     m_c2Center = InitPoint(supportColor, this);  //-V656
 }
@@ -63,26 +70,63 @@ void VisToolPointOfIntersectionCircles::RefreshGeometry()
         const QSharedPointer<VPointF> first = Visualization::data->GeometricObject<VPointF>(object1Id);
         DrawPoint(m_c1Center, static_cast<QPointF>(*first), supportColor);
 
-        if (m_object2Id > NULL_ID)
+        if (m_c1Radius > 0)
         {
-            const QSharedPointer<VPointF> second = Visualization::data->GeometricObject<VPointF>(m_object2Id);
+            m_c1Path->setRect(PointRect(m_c1Radius));
-            DrawPoint(m_c2Center, static_cast<QPointF>(*second), supportColor);
+            DrawPoint(m_c1Path, static_cast<QPointF>(*first), Qt::darkGreen, Qt::DashLine);
 
-            if (m_c1Radius > 0 && m_c2Radius > 0)
+            if (m_object2Id > NULL_ID)
             {
-                m_c1Path->setRect(PointRect(m_c1Radius));
+                const QSharedPointer<VPointF> second = Visualization::data->GeometricObject<VPointF>(m_object2Id);
-                DrawPoint(m_c1Path, static_cast<QPointF>(*first), Qt::darkGreen, Qt::DashLine);
+                DrawPoint(m_c2Center, static_cast<QPointF>(*second), supportColor);
 
-                m_c2Path->setRect(PointRect(m_c2Radius));
+                if (m_c2Radius > 0)
-                DrawPoint(m_c2Path, static_cast<QPointF>(*second), Qt::darkRed, Qt::DashLine);
+                {
+                    m_c2Path->setRect(PointRect(m_c2Radius));
+                    DrawPoint(m_c2Path, static_cast<QPointF>(*second), Qt::darkRed, Qt::DashLine);
 
-                QPointF fPoint;
+                    QPointF fPoint;
-                VToolPointOfIntersectionCircles::FindPoint(static_cast<QPointF>(*first),
+                    VToolPointOfIntersectionCircles::FindPoint(static_cast<QPointF>(*first),
-                                                           static_cast<QPointF>(*second),
+                                                               static_cast<QPointF>(*second),
-                                                           m_c1Radius, m_c2Radius, m_crossPoint, &fPoint);
+                                                               m_c1Radius, m_c2Radius, m_crossPoint, &fPoint);
-                DrawPoint(m_point, fPoint, mainColor);
+                    DrawPoint(m_point, fPoint, mainColor);
+                }
+                else if (mode == Mode::Creation)
+                {
+                    QLineF radiusLine (static_cast<QPointF>(*second), Visualization::scenePos);
+                    const qreal length = radiusLine.length();
+
+                    m_c2Path->setRect(PointRect(length));
+                    DrawPoint(m_c2Path, static_cast<QPointF>(*second), Qt::darkRed, Qt::DashLine);
+
+                    QPointF fPoint;
+                    VToolPointOfIntersectionCircles::FindPoint(static_cast<QPointF>(*first),
+                                                               static_cast<QPointF>(*second),
+                                                               m_c1Radius, length, m_crossPoint, &fPoint);
+                    DrawPoint(m_point, fPoint, mainColor);
+
+                    const QString prefix = UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true);
+                    Visualization::toolTip = tr("Radius = %1%2; "
+                                                "<b>Mouse click</b> - finish selecting the second radius, "
+                                                "<b>%3</b> - skip")
+                                                 .arg(NumberToUser(length), prefix, VModifierKey::EnterKey());
+                }
             }
         }
+        else if (mode == Mode::Creation)
+        {
+            QLineF radiusLine (static_cast<QPointF>(*first), Visualization::scenePos);
+            const qreal length = radiusLine.length();
+
+            m_c1Path->setRect(PointRect(length));
+            DrawPoint(m_c1Path, static_cast<QPointF>(*first), Qt::darkGreen, Qt::DashLine);
+
+            const QString prefix = UnitsToStr(VAbstractValApplication::VApp()->patternUnits(), true);
+            Visualization::toolTip = tr("Radius = %1%2; "
+                                        "<b>Mouse click</b> - finish selecting the first radius, "
+                                        "<b>%3</b> - skip")
+                                         .arg(NumberToUser(length), prefix, VModifierKey::EnterKey());
+        }
     }
 }
 

src/libs/vtools/visualization/line/vistoolpointofintersectioncircles.h

@@ -60,15 +60,15 @@ public:
 private:
     // cppcheck-suppress unknownMacro
     Q_DISABLE_COPY_MOVE(VisToolPointOfIntersectionCircles) // NOLINT
-    quint32               m_object2Id{NULL_ID};
+    quint32            m_object2Id{NULL_ID};
-    qreal                 m_c1Radius{0};
+    qreal              m_c1Radius{0};
-    qreal                 m_c2Radius{0};
+    qreal              m_c2Radius{0};
-    CrossCirclesPoint     m_crossPoint{CrossCirclesPoint::FirstPoint};
+    CrossCirclesPoint  m_crossPoint{CrossCirclesPoint::FirstPoint};
-    VScaledEllipse       *m_point{nullptr};
+    VScaledEllipse    *m_point{nullptr};
-    VScaledEllipse       *m_c1Center{nullptr};
+    VScaledEllipse    *m_c1Center{nullptr};
-    VScaledEllipse       *m_c2Center{nullptr};
+    VScaledEllipse    *m_c2Center{nullptr};
-    QGraphicsEllipseItem *m_c1Path{nullptr};
+    VScaledEllipse    *m_c1Path{nullptr};
-    QGraphicsEllipseItem *m_c2Path{nullptr};
+    VScaledEllipse    *m_c2Path{nullptr};
 };
 
 #endif // VISTOOLPOINTOFINTERSECTIONCIRCLES_H

src/libs/vwidgets/scalesceneitems.cpp

@@ -84,7 +84,22 @@ void VScaledEllipse::paint(QPainter *painter, const QStyleOptionGraphicsItem *op
     visPen.setWidthF(width);
 
     setPen(visPen);
-    ScaleCircleSize(this, scale);
+    if (m_pointMode)
+    {
+        ScaleCircleSize(this, scale);
+    }
 
     PaintWithFixItemHighlightSelected<QGraphicsEllipseItem>(this, painter, option, widget);
 }
+
+//---------------------------------------------------------------------------------------------------------------------
+bool VScaledEllipse::PointMode() const
+{
+    return m_pointMode;
+}
+
+//---------------------------------------------------------------------------------------------------------------------
+void VScaledEllipse::SetPointMode(bool newHoldSize)
+{
+    m_pointMode = newHoldSize;
+}

src/libs/vwidgets/scalesceneitems.h

@@ -67,8 +67,13 @@ public:
 
     virtual void paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
                        QWidget *widget = nullptr) override;
+    bool PointMode() const;
+    void SetPointMode(bool newPointMode);
+
 private:
     Q_DISABLE_COPY_MOVE(VScaledEllipse) // NOLINT
+
+    bool m_pointMode{true};
 };
 
 #endif // SCALESCENEITEMS_H