osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Qt: update to QCustomPlot 1.3.2 

QCustomPlot 1.3.1 includes a fix for a crash ("Fixed potential crash in
QCPGraph::pointDistance if getScatterPlotData returns empty list").
Full changelog: http://www.qcustomplot.com/release/1.3.2/changelog.txt

The new files are based on QCustomPlot-source.tar.gz (1.3.2) with
Alexis' typo and license header changes from v1.99.2rc0-479-gc411029a3c
("Update to QCustomPlot 1.3.0") applied. All successive Wireshark
patches up to v2.5.0rc0-854-g6f28f1a59e ("Fix MacOS build") were
applied. The Retina patches ("Fix QCustmPlot retina problems." and "QCP:
Fix retina label calculations.") gave conflicts due contextual changes
which I resolved by renaming newCachedLabel to cachedLabel (following
the change in upstream commit baaad24706187f5be0a68011c780b51c4de11558).

Bug: 14971
Change-Id: I5012cb5a867891b466cbf1898fe4c28cbd11ba20
Reviewed-on: https://code.wireshark.org/review/28732
Petri-Dish: Peter Wu <peter@lekensteyn.nl>
Tested-by: Petri Dish Buildbot
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Peter Wu 2018-07-17 00:20:01 +02:00 committed by Anders Broman
parent 0ce2cdda8b
commit 8563b94d56
2 changed files with 519 additions and 423 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

931
ui/qt/widgets/qcustomplot.cpp
View File

File diff suppressed because it is too large Load Diff

11
ui/qt/widgets/qcustomplot.h
View File

@ -1,7 +1,7 @@
/***************************************************************************
** **
** QCustomPlot, an easy to use, modern plotting widget for Qt **
** Copyright (C) 2011, 2012, 2013, 2014 Emanuel Eichhammer **
** Copyright (C) 2011-2015 Emanuel Eichhammer **
** **
** This program is free software: you can redistribute it and/or modify **
** it under the terms of the GNU General Public License as published by **
@ -21,8 +21,8 @@
** Website/Contact: http://www.qcustomplot.com/ **
** Emanuel Eichhammer has granted Wireshark permission to use QCustomPlot **
** under the terms of the GNU General Public License version 2. **
** Date: 27.12.14 **
** Version: 1.3.0 **
** Date: 22.12.15 **
** Version: 1.3.2 **
****************************************************************************/
#ifndef QCUSTOMPLOT_H
@ -53,7 +53,7 @@
# include <QPrintEngine>
#else
# include <QtNumeric>
# include <QtPrintSupport>
# include <QtPrintSupport/QtPrintSupport>
#endif
class QCPPainter;
@ -3101,7 +3101,7 @@ protected:
bool mTightBoundary;
QPointer<QCPColorScale> mColorScale;
// non-property members:
QImage mMapImage;
QImage mMapImage, mUndersampledMapImage;
QPixmap mLegendIcon;
bool mMapImageInvalidated;
@ -3617,6 +3617,7 @@ protected:
QPixmap mPixmap;
QPixmap mScaledPixmap;
bool mScaled;
bool mScaledPixmapInvalidated;
Qt::AspectRatioMode mAspectRatioMode;
Qt::TransformationMode mTransformationMode;
QPen mPen, mSelectedPen;