Throughput graph updates.

GTK+: Fix what appears to be an off-by-one error in the MA period (21
segments instead of 20). Throw away our initial segment length instead
of subtracting it from the moving sum, which skews the sum.

Qt: Add the througput graph. Use bits/s for the throughput y axis. Let
the user switch between graph types. The dialog hangs when doing this. I
haven't been able to track down the cause. Remove some unused code.

Both: Tell the user that we're using a 20 segment moving average. Move
more routines to tap-tcp-stream.[ch].

svn path=/trunk/; revision=51759

1 files changed, 15 insertions, 1 deletions

diff --git a/ui/qt/tcp_stream_dialog.h b/ui/qt/tcp_stream_dialog.h
index 129c1b9345..f9b874a9dd 100644
--- a/ui/qt/tcp_stream_dialog.h
+++ b/ui/qt/tcp_stream_dialog.h
@@ -52,6 +52,9 @@ public:
 signals:
     void goToPacket(int packet_num);
 
+public slots:
+    void setCaptureFile(capture_file *cf);
+
 protected:
     void keyPressEvent(QKeyEvent *event);
 
@@ -60,18 +63,29 @@ private:
     capture_file *cap_file_;
     QMap<double, struct segment *> segment_map_;
     struct tcp_graph graph_;
-    QRectF data_range_;
+    QCPPlotTitle *title_;
     QCPItemTracer *tracer_;
     guint32 packet_num_;
+    double y_translate_mul_;
 
+    int num_dsegs_;
+    int num_acks_;
+    int num_sack_ranges_;
 
+    void fillGraph();
+    void resetAxes();
+    void initializeStevens();
+    void initializeThroughput();
+    QString streamDescription();
     bool compareHeaders(struct segment *seg);
     void toggleTracerStyle(bool force_default = false);
 
 private slots:
     void graphClicked(QMouseEvent *event);
     void mouseMoved(QMouseEvent *event);
+    void translateYRange(const QCPRange &y_range1);
     void on_buttonBox_accepted();
+    void on_graphTypeComboBox_currentIndexChanged(int index);
 };
 
 #endif // TCP_STREAM_DIALOG_H