diff options
| author | Michael Mann <mmann78@netscape.net> | 2017-09-18 22:48:11 -0400 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2017-09-19 06:44:51 +0000 |
| commit | dd5875c487dea7e75b3653485d153c0dab909699 (patch) | |
| tree | e1e6219872900d9a067dd6940389e6ede1ea84d5 /ui/qt | |
| parent | 8a25ac7306b9eef5c7d75ee1c610eb2b0a8144fe (diff) | |
Sequence analysis (flow graph) optimizations for dissectors
1. Remove protocol member from seq_analysis_item_t.
It's not used by any GUI, so don't burden dissectors with populating it.
2. Allow any dissector to change colors display by flow graph
3. Provide helper functions that may be common if other dissectors
want to create sequence analysis.
Change-Id: I04fa3c9f3cf6879ab9a8d7d6f4896b4979d010d7
Reviewed-on: https://code.wireshark.org/review/23613
Reviewed-by: Michael Mann <mmann78@netscape.net>
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jakub Zawadzki <darkjames-ws@darkjames.pl>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'ui/qt')
| -rw-r--r-- | ui/qt/lbm_uimflow_dialog.cpp | 1 | ||||
| -rw-r--r-- | ui/qt/sequence_diagram.cpp | 10 |
2 files changed, 4 insertions, 7 deletions
diff --git a/ui/qt/lbm_uimflow_dialog.cpp b/ui/qt/lbm_uimflow_dialog.cpp index c355afa031..29e5020270 100644 --- a/ui/qt/lbm_uimflow_dialog.cpp +++ b/ui/qt/lbm_uimflow_dialog.cpp @@ -128,7 +128,6 @@ static gboolean lbm_uimflow_add_to_graph(seq_analysis_info_t * seq_info, packet_ item->frame_number = pinfo->num; item->port_src = pinfo->srcport; item->port_dst = pinfo->destport; - item->protocol = g_strdup(port_type_to_str(pinfo->ptype)); if (stream_info->description == NULL) { item->frame_label = g_strdup_printf("(%" G_GUINT32_FORMAT ")", stream_info->sqn); diff --git a/ui/qt/sequence_diagram.cpp b/ui/qt/sequence_diagram.cpp index 98071b18a6..3b20d0b462 100644 --- a/ui/qt/sequence_diagram.cpp +++ b/ui/qt/sequence_diagram.cpp @@ -263,12 +263,10 @@ void SequenceDiagram::draw(QCPPainter *painter) fg_pen.setColor(sel_pal.color(QPalette::HighlightedText)); bg_color = sel_pal.color(QPalette::Highlight); selected_key_ = cur_key; - } else if (strcmp(sainfo_->name, "any") == 0) { - if (sai->has_color_filter) { - fg_pen.setColor(QColor().fromRgb(sai->fg_color)); - bg_color = QColor().fromRgb(sai->bg_color); - } - } else { // SEQ_ANALYSIS_VOIP, SEQ_ANALYSIS_TCP + } else if (sai->has_color_filter) { + fg_pen.setColor(QColor().fromRgb(sai->fg_color)); + bg_color = QColor().fromRgb(sai->bg_color); + } else { fg_pen.setColor(Qt::black); bg_color = ColorUtils::sequenceColor(sai->conv_num); } |