Refactoring deleting visualization object.

Instead of searcing inside current graphics scene use QPointer class. --HG-- branch : develop
2024-06-29 07:38:11 +02:00 · 2016-07-07 14:56:55 +03:00 · 2016-07-07 14:56:55 +03:00 · bd7f328a8a
parent 628fdd4217
commit bd7f328a8a
31 changed files with 7 additions and 47 deletions
--- a/src/libs/vtools/dialogs/tools/dialogalongline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogalongline.cpp
@ -142,7 +142,6 @@ DialogAlongLine::~DialogAlongLine()
    VContainer *locData = const_cast<VContainer *> (data);
    locData->RemoveVariable(currentLength);

-    DeleteVisualization<VisToolAlongLine>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogarc.cpp
@ -113,7 +113,6 @@ void DialogArc::DeployF2TextEdit()
 //---------------------------------------------------------------------------------------------------------------------
 DialogArc::~DialogArc()
 {
-    DeleteVisualization<VisToolArc>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogarcwithlength.cpp
@ -90,7 +90,6 @@ DialogArcWithLength::DialogArcWithLength(const VContainer *data, const quint32 &
 //---------------------------------------------------------------------------------------------------------------------
 DialogArcWithLength::~DialogArcWithLength()
 {
-    DeleteVisualization<VisToolArcWithLength>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogbisector.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogbisector.cpp
@ -142,7 +142,6 @@ void DialogBisector::DeployFormulaTextEdit()
 //---------------------------------------------------------------------------------------------------------------------
 DialogBisector::~DialogBisector()
 {
-    DeleteVisualization<VisToolBisector>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezier.cpp
@ -63,7 +63,6 @@ DialogCubicBezier::DialogCubicBezier(const VContainer *data, const quint32 &tool
 //---------------------------------------------------------------------------------------------------------------------
 DialogCubicBezier::~DialogCubicBezier()
 {
-    DeleteVisualization<VisToolCubicBezier>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp
@ -61,7 +61,6 @@ DialogCubicBezierPath::DialogCubicBezierPath(const VContainer *data, const quint
 //---------------------------------------------------------------------------------------------------------------------
 DialogCubicBezierPath::~DialogCubicBezierPath()
 {
-    DeleteVisualization<VisToolCubicBezierPath>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcurveintersectaxis.cpp
@ -77,7 +77,6 @@ DialogCurveIntersectAxis::DialogCurveIntersectAxis(const VContainer *data, const
 //---------------------------------------------------------------------------------------------------------------------
 DialogCurveIntersectAxis::~DialogCurveIntersectAxis()
 {
-    DeleteVisualization<VisToolCurveIntersectAxis>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutarc.cpp
@ -106,7 +106,6 @@ void DialogCutArc::DeployFormulaTextEdit()
 //---------------------------------------------------------------------------------------------------------------------
 DialogCutArc::~DialogCutArc()
 {
-    DeleteVisualization<VisToolCutArc>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutspline.cpp
@ -73,7 +73,6 @@ DialogCutSpline::DialogCutSpline(const VContainer *data, const quint32 &toolId,
 //---------------------------------------------------------------------------------------------------------------------
 DialogCutSpline::~DialogCutSpline()
 {
-    DeleteVisualization<VisToolCutSpline>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogcutsplinepath.cpp
@ -73,7 +73,6 @@ DialogCutSplinePath::DialogCutSplinePath(const VContainer *data, const quint32 &
 //---------------------------------------------------------------------------------------------------------------------
 DialogCutSplinePath::~DialogCutSplinePath()
 {
-    DeleteVisualization<VisToolCutSplinePath>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogendline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogendline.cpp
@ -167,7 +167,7 @@ void DialogEndLine::ChosenObject(quint32 id, const SceneObject &type)
            if (SetObject(id, ui->comboBoxBasePoint, ""))
            {
                vis->VisualMode(id);
-                connect(vis, &Visualization::ToolTip, this, &DialogTool::ShowVisToolTip);
+                connect(vis.data(), &Visualization::ToolTip, this, &DialogTool::ShowVisToolTip);
                prepare = true;
            }
        }
@ -343,7 +343,6 @@ void DialogEndLine::closeEvent(QCloseEvent *event)
 //---------------------------------------------------------------------------------------------------------------------
 DialogEndLine::~DialogEndLine()
 {
-    DeleteVisualization<VisToolEndLine>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogheight.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogheight.cpp
@ -75,7 +75,6 @@ DialogHeight::DialogHeight(const VContainer *data, const quint32 &toolId, QWidge
 //---------------------------------------------------------------------------------------------------------------------
 DialogHeight::~DialogHeight()
 {
-    DeleteVisualization<VisToolHeight>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogline.cpp
@ -68,7 +68,6 @@ DialogLine::DialogLine(const VContainer *data, const quint32 &toolId, QWidget *p
 //---------------------------------------------------------------------------------------------------------------------
 DialogLine::~DialogLine()
 {
-    DeleteVisualization<VisToolLine>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp
@ -75,7 +75,6 @@ DialogLineIntersect::DialogLineIntersect(const VContainer *data, const quint32 &
 //---------------------------------------------------------------------------------------------------------------------
 DialogLineIntersect::~DialogLineIntersect()
 {
-    DeleteVisualization<VisToolLineIntersect>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
+++ b/src/libs/vtools/dialogs/tools/dialoglineintersectaxis.cpp
@ -86,7 +86,6 @@ DialogLineIntersectAxis::DialogLineIntersectAxis(const VContainer *data, const q
 //---------------------------------------------------------------------------------------------------------------------
 DialogLineIntersectAxis::~DialogLineIntersectAxis()
 {
-    DeleteVisualization<VisToolLineIntersectAxis>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialognormal.cpp
+++ b/src/libs/vtools/dialogs/tools/dialognormal.cpp
@ -132,7 +132,6 @@ void DialogNormal::DeployFormulaTextEdit()
 //---------------------------------------------------------------------------------------------------------------------
 DialogNormal::~DialogNormal()
 {
-    DeleteVisualization<VisToolNormal>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromarcandtangent.cpp
@ -63,7 +63,6 @@ DialogPointFromArcAndTangent::DialogPointFromArcAndTangent(const VContainer *dat
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointFromArcAndTangent::~DialogPointFromArcAndTangent()
 {
-    DeleteVisualization<VisToolPointFromArcAndTangent>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointfromcircleandtangent.cpp
@ -88,7 +88,6 @@ DialogPointFromCircleAndTangent::DialogPointFromCircleAndTangent(const VContaine
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointFromCircleAndTangent::~DialogPointFromCircleAndTangent()
 {
-    DeleteVisualization<VisToolPointFromCircleAndTangent>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofcontact.cpp
@ -81,7 +81,6 @@ DialogPointOfContact::DialogPointOfContact(const VContainer *data, const quint32
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfContact::~DialogPointOfContact()
 {
-    DeleteVisualization<VisToolPointOfContact>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersection.cpp
@ -71,7 +71,6 @@ DialogPointOfIntersection::DialogPointOfIntersection(const VContainer *data, con
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfIntersection::~DialogPointOfIntersection()
 {
-    DeleteVisualization<VisToolPointOfIntersection>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectionarcs.cpp
@ -67,7 +67,6 @@ DialogPointOfIntersectionArcs::DialogPointOfIntersectionArcs(const VContainer *d
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfIntersectionArcs::~DialogPointOfIntersectionArcs()
 {
-    DeleteVisualization<VisToolPointOfIntersectionArcs>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncircles.cpp
@ -104,7 +104,6 @@ DialogPointOfIntersectionCircles::DialogPointOfIntersectionCircles(const VContai
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfIntersectionCircles::~DialogPointOfIntersectionCircles()
 {
-    DeleteVisualization<VisToolPointOfIntersectionCircles>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogpointofintersectioncurves.cpp
@ -65,7 +65,6 @@ DialogPointOfIntersectionCurves::DialogPointOfIntersectionCurves(const VContaine
 //---------------------------------------------------------------------------------------------------------------------
 DialogPointOfIntersectionCurves::~DialogPointOfIntersectionCurves()
 {
-    DeleteVisualization<VisToolPointOfIntersectionCurves>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp
@ -81,7 +81,6 @@ DialogRotation::DialogRotation(const VContainer *data, const quint32 &toolId, QW
 //---------------------------------------------------------------------------------------------------------------------
 DialogRotation::~DialogRotation()
 {
-    DeleteVisualization<VisToolRotation>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogshoulderpoint.cpp
@ -143,7 +143,6 @@ void DialogShoulderPoint::DeployFormulaTextEdit()
 //---------------------------------------------------------------------------------------------------------------------
 DialogShoulderPoint::~DialogShoulderPoint()
 {
-    DeleteVisualization<VisToolShoulderPoint>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogspline.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogspline.cpp
@ -122,7 +122,6 @@ DialogSpline::DialogSpline(const VContainer *data, const quint32 &toolId, QWidge
 //---------------------------------------------------------------------------------------------------------------------
 DialogSpline::~DialogSpline()
 {
-    DeleteVisualization<VisToolSpline>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp
@ -108,7 +108,6 @@ DialogSplinePath::DialogSplinePath(const VContainer *data, const quint32 &toolId
 //---------------------------------------------------------------------------------------------------------------------
 DialogSplinePath::~DialogSplinePath()
 {
-    DeleteVisualization<VisToolSplinePath>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogtool.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtool.cpp
@ -78,6 +78,11 @@ DialogTool::DialogTool(const VContainer *data, const quint32 &toolId, QWidget *p
 DialogTool::~DialogTool()
 {
    emit ToolTip("");
+
+    if (not vis.isNull())
+    {
+        delete vis;
+    }
 }

 //---------------------------------------------------------------------------------------------------------------------
--- a/src/libs/vtools/dialogs/tools/dialogtool.h
+++ b/src/libs/vtools/dialogs/tools/dialogtool.h
@ -181,7 +181,7 @@ protected:
    /** @brief number number of handled objects */
    qint32           number;

-    Visualization   *vis;
+    QPointer<Visualization> vis;

    virtual void     closeEvent ( QCloseEvent * event ) Q_DECL_OVERRIDE;
    virtual void     showEvent( QShowEvent *event ) Q_DECL_OVERRIDE;
@ -241,9 +241,6 @@ protected:
    template <typename T>
    void             AddVisualization();

-    template <typename T>
-    void             DeleteVisualization();
-
    void             ChangeColor(QWidget *widget, const QColor &color);
    virtual void     ShowVisualization() {}
    /**
@ -360,19 +357,6 @@ inline void DialogTool::AddVisualization()
    }
 }

-//---------------------------------------------------------------------------------------------------------------------
-template <typename T>
-inline void DialogTool::DeleteVisualization()
-{
-    T *toolVis = qobject_cast<T *>(vis);
-    SCASSERT(toolVis != nullptr);
-
-    if (qApp->getCurrentScene()->items().contains(toolVis))
-    { // In some cases scene delete object yourself. If not make check program will crash.
-        delete vis;
-    }
-}
-
 //---------------------------------------------------------------------------------------------------------------------
 template <typename T>
 inline T DialogTool::getCurrentCrossPoint(QComboBox *box) const
--- a/src/libs/vtools/dialogs/tools/dialogtriangle.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtriangle.cpp
@ -75,7 +75,6 @@ DialogTriangle::DialogTriangle(const VContainer *data, const quint32 &toolId, QW
 //---------------------------------------------------------------------------------------------------------------------
 DialogTriangle::~DialogTriangle()
 {
-    DeleteVisualization<VisToolTriangle>();
    delete ui;
 }

--- a/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp
+++ b/src/libs/vtools/dialogs/tools/dialogtruedarts.cpp
@ -80,7 +80,6 @@ DialogTrueDarts::DialogTrueDarts(const VContainer *data, const quint32 &toolId,
 //---------------------------------------------------------------------------------------------------------------------
 DialogTrueDarts::~DialogTrueDarts()
 {
-    DeleteVisualization<VisToolTrueDarts>();
    delete ui;
 }