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>

2 files changed, 20 insertions, 1 deletions

diff --git a/ui/qt/io_graph_dialog.cpp b/ui/qt/io_graph_dialog.cpp
index b377d7e82f..f423d44d57 100644
--- a/ui/qt/io_graph_dialog.cpp
+++ b/ui/qt/io_graph_dialog.cpp
@@ -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
diff --git a/ui/qt/io_graph_dialog.h b/ui/qt/io_graph_dialog.h
index b7945ed66b..cb1a2dbca4 100644
--- a/ui/qt/io_graph_dialog.h
+++ b/ui/qt/io_graph_dialog.h
@@ -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();