diff options
author | Gerald Combs <gerald@wireshark.org> | 2014-11-18 16:21:42 -0800 |
---|---|---|
committer | Gerald Combs <gerald@wireshark.org> | 2014-12-09 21:25:33 +0000 |
commit | 4921e559906aee70c4665f1c739057e227787e01 (patch) | |
tree | 4465cb9e9de152bfb57f00852e437994e2d85cd9 /ui/qt/sequence_diagram.cpp | |
parent | 3147087de323c0294b51006f97b641fc408f1b06 (diff) | |
download | wireshark-4921e559906aee70c4665f1c739057e227787e01.tar.gz |
Qt: Initial VoIP Calls dialog.
Add Telephony menu items for VoIP Calls and SIP Flows. Put VoIP Calls at
the top, since that seems to be the primary item.
Add configure-time checks for QtMultimediaWidgets in anticipation of
adding a VoIP playback dialog.
Add an icon for the playback button. (Yes, I've been avoiding
GNOME-level gratuitous icons so far but this is one of the rare
occiasions where it makes sense.)
Add a help link define for the VoIP calls dialog.
Change-Id: I5d0799685c598ad9af76fe9667f8ea7d14b66050
Reviewed-on: https://code.wireshark.org/review/5674
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'ui/qt/sequence_diagram.cpp')
-rw-r--r-- | ui/qt/sequence_diagram.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/ui/qt/sequence_diagram.cpp b/ui/qt/sequence_diagram.cpp index 8660c4295c..3bd4c2d724 100644 --- a/ui/qt/sequence_diagram.cpp +++ b/ui/qt/sequence_diagram.cpp @@ -31,8 +31,6 @@ #include <QPen> #include <QPointF> -#include <QDebug> - const int max_comment_em_width_ = 20; // UML-like network node sequence diagrams. @@ -98,8 +96,9 @@ SequenceDiagram::SequenceDiagram(QCPAxis *keyAxis, QCPAxis *valueAxis, QCPAxis * void SequenceDiagram::setData(seq_analysis_info_t *sainfo) { data_->clear(); + sainfo_ = sainfo; + if (!sainfo) return; - WSCPSeqData new_data; double cur_key = 0.0; QVector<double> key_ticks, val_ticks; QVector<QString> key_labels, val_labels, com_labels; @@ -108,6 +107,7 @@ void SequenceDiagram::setData(seq_analysis_info_t *sainfo) for (GList *cur = g_queue_peek_nth_link(sainfo->items, 0); cur; cur = g_list_next(cur)) { seq_analysis_item_t *sai = (seq_analysis_item_t *) cur->data; + WSCPSeqData new_data; new_data.key = cur_key; new_data.value = sai; @@ -120,7 +120,6 @@ void SequenceDiagram::setData(seq_analysis_info_t *sainfo) cur_key++; } - sainfo_ = sainfo; for (unsigned int i = 0; i < sainfo_->num_nodes; i++) { val_ticks.append(i); @@ -193,7 +192,7 @@ void SequenceDiagram::draw(QCPPainter *painter) WSCPSeqDataMap::const_iterator it; for (it = data_->constBegin(); it != data_->constEnd(); ++it) { double cur_key = it.key(); - seq_analysis_item_t *sai = (seq_analysis_item_t *) it.value().value; + seq_analysis_item_t *sai = it.value().value; QPen fg_pen(mainPen()); if (sai->fd->num == selected_packet_) { |