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

Additional styles for IO Graph 

This patch adds the styles Cross, Plus and Circle to IO Graph.

Change-Id: I72ff0134cd34a7e9b88a3e9c6a685526a0bca1db
Reviewed-on: https://code.wireshark.org/review/35555
Petri-Dish: Jim Young <jim.young.ws@gmail.com>
Tested-by: Petri Dish Buildbot
Reviewed-by: Jim Young <jim.young.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexander Meier 2019-12-23 16:50:26 +01:00 committed by Michael Mann
parent 4df2bd988d
commit 63a954320f
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
ui/qt/io_graph_dialog.cpp
View File

@ -88,6 +88,9 @@ static const value_string graph_style_vs[] = {
{ IOGraph::psDot, "Dot" },
{ IOGraph::psSquare, "Square" },
{ IOGraph::psDiamond, "Diamond" },
{ IOGraph::psCross, "Cross" },
{ IOGraph::psCircle, "Circle" },
{ IOGraph::psPlus, "Plus" },
{ 0, NULL }
};
@ -1750,6 +1753,22 @@ void IOGraph::setPlotStyle(int style)
graph_->setScatterStyle(QCPScatterStyle::ssDiamond);
}
break;
case psCross:
if (graph_) {
graph_->setScatterStyle(QCPScatterStyle::ssCross);
}
break;
case psPlus:
if (graph_) {
graph_->setScatterStyle(QCPScatterStyle::ssPlus);
}
break;
case psCircle:
if (graph_) {
graph_->setScatterStyle(QCPScatterStyle::ssCircle);
}
break;
case psBar:
case IOGraph::psStackedBar:
// Stacking set in scanGraphs

2
ui/qt/io_graph_dialog.h
View File

@ -45,7 +45,7 @@ class IOGraph : public QObject {
Q_OBJECT
public:
// COUNT_TYPE_* in gtk/io_graph.c
enum PlotStyles { psLine, psImpulse, psBar, psStackedBar, psDot, psSquare, psDiamond };
enum PlotStyles { psLine, psImpulse, psBar, psStackedBar, psDot, psSquare, psDiamond, psCross, psPlus, psCircle };
explicit IOGraph(QCustomPlot *parent);
~IOGraph();