OilfieldToolsNet/ResInsight
4
0 Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-10-13 17:02:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash on plot deletion

Browse Source
This commit is contained in:
Rebecca Cox committed 2017-11-03 13:23:06 +01:00
1 parent 95f7f40b15
commit cac5fa42a5
3 files changed
+29 -13
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ApplicationCode/UserInterface/RiuPlotAnnotationTool.cpp
+19 -6
View File
@@ -26,11 +26,20 @@
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuPlotAnnotationTool::attachFormationNames(const std::vector<QString>& names, const std::vector<std::pair<double, double>> yPositions)
RiuPlotAnnotationTool::~RiuPlotAnnotationTool()
{
detachAllAnnotations();
if (names.size() != yPositions.size()) return;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuPlotAnnotationTool::attachFormationNames(QwtPlot* plot, const std::vector<QString>& names, const std::vector<std::pair<double, double>> yPositions)
{
detachAllAnnotations();
if (names.size() != yPositions.size()) return;
m_plot = plot;
QPen curvePen;
curvePen.setStyle(Qt::DashLine);
curvePen.setColor(Qt::blue);
@@ -40,7 +49,7 @@ void RiuPlotAnnotationTool::attachFormationNames(const std::vector<QString>& nam
for (size_t i = 0; i < names.size(); i++)
{
std::unique_ptr<QwtPlotMarker> line(new QwtPlotMarker());
QwtPlotMarker* line(new QwtPlotMarker());
line->setLineStyle(QwtPlotMarker::HLine);
line->setLinePen(curvePen);
@@ -57,7 +66,7 @@ void RiuPlotAnnotationTool::attachFormationNames(const std::vector<QString>& nam
if ((i != names.size() - 1) && cvf::Math::abs(yPositions[i].second - yPositions[i+1].first) > delta)
{
std::unique_ptr<QwtPlotMarker> line(new QwtPlotMarker());
QwtPlotMarker* line(new QwtPlotMarker());
line->setLineStyle(QwtPlotMarker::HLine);
line->setLinePen(curvePen);
@@ -75,9 +84,13 @@ void RiuPlotAnnotationTool::attachFormationNames(const std::vector<QString>& nam
//--------------------------------------------------------------------------------------------------
void RiuPlotAnnotationTool::detachAllAnnotations()
{
for (size_t i = 0; i < m_markers.size(); i++)
if (m_plot)
{
m_markers[i]->detach();
for (size_t i = 0; i < m_markers.size(); i++)
{
m_markers[i]->detach();
delete m_markers[i];
}
}
m_markers.clear();
}
ApplicationCode/UserInterface/RiuPlotAnnotationTool.h
+7 -4
View File
@@ -23,18 +23,21 @@
#include <memory>
#include <vector>
#include <QPointer>
class QString;
class QwtPlot;
class RiuPlotAnnotationTool
{
public:
RiuPlotAnnotationTool(QwtPlot* plot) : m_plot(plot) {};
RiuPlotAnnotationTool() {};
~RiuPlotAnnotationTool();
void attachFormationNames(const std::vector<QString>& names, const std::vector<std::pair<double, double>> yPositions);
void attachFormationNames(QwtPlot* plot, const std::vector<QString>& names, const std::vector<std::pair<double, double>> yPositions);
void detachAllAnnotations();
private:
QwtPlot* m_plot;
std::vector<std::unique_ptr<QwtPlotMarker>> m_markers;
QPointer<QwtPlot> m_plot;
std::vector<QwtPlotMarker*> m_markers;
};