diff options
| author |  Berthold Stoeger <bstoeger@mail.tuwien.ac.at> | 2019-08-25 12:56:41 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-08-28 07:10:09 -0700 |
| commit | 25b30da2446d9daf8343c246056b207d285582e7 (patch) | |
| tree | 3b2b4d7e586530938c10c79fcba25b2e0524d8f6 /profile-widget | |
| parent | 0e55739f03d15b93a678e29bb1af26ff703f0c2f (diff) | |
| download | subsurface-25b30da2446d9daf8343c246056b207d285582e7.tar.gz | |
Profile: properly initialize plot_info structures
The create_plot_info_new() function releases old plot data. This
can only work if the plot_info structure was initialized previously.
The ProfileWidget2 did that by a memset, but other parts of the code
did not.
Therefore, introduce a init_plot_info() function and call that when
generating a plot_info struct. Constructors would make this so much
easier - but since this is called from C, we can't use them.
Fixes #2251
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
Diffstat (limited to 'profile-widget')
| -rw-r--r-- | profile-widget/profilewidget2.cpp | 2 | ||||
| -rw-r--r-- | profile-widget/ruleritem.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/profile-widget/profilewidget2.cpp b/profile-widget/profilewidget2.cpp index f3dfb8ce9..bde470fd7 100644 --- a/profile-widget/profilewidget2.cpp +++ b/profile-widget/profilewidget2.cpp @@ -148,7 +148,7 @@ ProfileWidget2::ProfileWidget2(QWidget *parent) : QGraphicsView(parent), // would like to be able to ASSERT here that PreferencesDialog::loadSettings has been called. isPlotZoomed = prefs.zoomed_plot; // now it seems that 'prefs' has loaded our preferences - memset(&plotInfo, 0, sizeof(plotInfo)); + init_plot_info(&plotInfo); setupSceneAndFlags(); setupItemSizes(); diff --git a/profile-widget/ruleritem.cpp b/profile-widget/ruleritem.cpp index f489aa9dd..3e61790ad 100644 --- a/profile-widget/ruleritem.cpp +++ b/profile-widget/ruleritem.cpp @@ -17,7 +17,7 @@ RulerNodeItem2::RulerNodeItem2() : timeAxis(NULL), depthAxis(NULL) { - memset(&pInfo, 0, sizeof(pInfo)); + init_plot_info(&pInfo); setRect(-8, -8, 16, 16); setBrush(QColor(0xff, 0, 0, 127)); setPen(QColor(Qt::red)); |