summaryrefslogtreecommitdiff
path: root/ui/qt
diff options
context:
space:
mode:
Diffstat (limited to 'ui/qt')
-rw-r--r--ui/qt/main_status_bar.cpp23
-rw-r--r--ui/qt/main_status_bar.h4
-rw-r--r--ui/qt/main_window.cpp6
-rw-r--r--ui/qt/packet_list.cpp4
-rw-r--r--ui/qt/packet_list_model.cpp73
-rw-r--r--ui/qt/packet_list_model.h5
-rw-r--r--ui/qt/packet_list_record.cpp13
-rw-r--r--ui/qt/packet_list_record.h3
8 files changed, 99 insertions, 32 deletions
diff --git a/ui/qt/main_status_bar.cpp b/ui/qt/main_status_bar.cpp
index 1a43712805..9802294be7 100644
--- a/ui/qt/main_status_bar.cpp
+++ b/ui/qt/main_status_bar.cpp
@@ -52,7 +52,7 @@ enum StatusContext {
STATUS_CTX_FIELD,
STATUS_CTX_BYTE,
STATUS_CTX_FILTER,
- STATUS_CTX_BUSY,
+ STATUS_CTX_PROGRESS,
STATUS_CTX_TEMPORARY
};
@@ -339,14 +339,14 @@ void MainStatusBar::pushProfileName()
void MainStatusBar::pushBusyStatus(const QString &message, const QString &messagetip)
{
- info_status_.pushText(message, STATUS_CTX_BUSY);
+ info_status_.pushText(message, STATUS_CTX_PROGRESS);
info_status_.setToolTip(messagetip);
progress_frame_.showBusy(true, false, NULL);
}
void MainStatusBar::popBusyStatus()
{
- info_status_.popText(STATUS_CTX_BUSY);
+ info_status_.popText(STATUS_CTX_PROGRESS);
info_status_.setToolTip(QString());
progress_frame_.hide();
}
@@ -355,6 +355,23 @@ void MainStatusBar::popProfileStatus() {
profile_status_.popText(STATUS_CTX_MAIN);
}
+void MainStatusBar::pushProgressStatus(const QString &message, bool animate, bool terminate_is_stop, gboolean *stop_flag)
+{
+ info_status_.pushText(message, STATUS_CTX_PROGRESS);
+ progress_frame_.showProgress(animate, terminate_is_stop, stop_flag);
+}
+
+void MainStatusBar::updateProgressStatus(int value)
+{
+ progress_frame_.setValue(value);
+}
+
+void MainStatusBar::popProgressStatus()
+{
+ info_status_.popText(STATUS_CTX_PROGRESS);
+ progress_frame_.hide();
+}
+
void MainStatusBar::updateCaptureStatistics(capture_session *cap_session)
{
QString packets_str;
diff --git a/ui/qt/main_status_bar.h b/ui/qt/main_status_bar.h
index ede9522442..e547196f70 100644
--- a/ui/qt/main_status_bar.h
+++ b/ui/qt/main_status_bar.h
@@ -81,6 +81,10 @@ public slots:
void pushProfileName();
void pushBusyStatus(const QString &message, const QString &messagetip = QString());
void popBusyStatus();
+ void pushProgressStatus(const QString &message, bool animate, bool terminate_is_stop = false, gboolean *stop_flag = NULL);
+ void updateProgressStatus(int value);
+ void popProgressStatus();
+
void updateCaptureStatistics(capture_session * cap_session);
void updateCaptureFixedStatistics(capture_session * cap_session);
diff --git a/ui/qt/main_window.cpp b/ui/qt/main_window.cpp
index 905cffe833..42ffbd377e 100644
--- a/ui/qt/main_window.cpp
+++ b/ui/qt/main_window.cpp
@@ -503,6 +503,12 @@ MainWindow::MainWindow(QWidget *parent) :
main_ui_->statusBar, SLOT(pushBusyStatus(QString)));
connect(packet_list_->packetListModel(), SIGNAL(popBusyStatus()),
main_ui_->statusBar, SLOT(popBusyStatus()));
+ connect(packet_list_->packetListModel(), SIGNAL(pushProgressStatus(QString,bool,bool,gboolean*)),
+ main_ui_->statusBar, SLOT(pushProgressStatus(QString,bool,bool,gboolean*)));
+ connect(packet_list_->packetListModel(), SIGNAL(updateProgressStatus(int)),
+ main_ui_->statusBar, SLOT(updateProgressStatus(int)));
+ connect(packet_list_->packetListModel(), SIGNAL(popProgressStatus()),
+ main_ui_->statusBar, SLOT(popProgressStatus()));
connect(proto_tree_, SIGNAL(protoItemSelected(const QString&)),
main_ui_->statusBar, SLOT(pushFieldStatus(const QString&)));
diff --git a/ui/qt/packet_list.cpp b/ui/qt/packet_list.cpp
index c11afdf76d..fa3483db80 100644
--- a/ui/qt/packet_list.cpp
+++ b/ui/qt/packet_list.cpp
@@ -765,10 +765,6 @@ void PacketList::clear() {
create_near_overlay_ = true;
create_far_overlay_ = true;
- /* XXX is this correct in all cases?
- * Reset the sort column, use packetlist as model in case the list is frozen.
- */
- sortByColumn(-1, Qt::AscendingOrder);
setColumnVisibility();
}
diff --git a/ui/qt/packet_list_model.cpp b/ui/qt/packet_list_model.cpp
index e82c181712..4e20462ab8 100644
--- a/ui/qt/packet_list_model.cpp
+++ b/ui/qt/packet_list_model.cpp
@@ -48,7 +48,8 @@ PacketListModel::PacketListModel(QObject *parent, capture_file *cf) :
QAbstractItemModel(parent),
size_hint_enabled_(true),
row_height_(-1),
- line_spacing_(0)
+ line_spacing_(0),
+ last_sort_column_(-1)
{
setCaptureFile(cf);
connect(this, SIGNAL(itemHeightChanged(QModelIndex)),
@@ -122,6 +123,7 @@ void PacketListModel::resetColumns()
}
dataChanged(index(0, 0), index(rowCount() - 1, columnCount() - 1));
headerDataChanged(Qt::Horizontal, 0, columnCount() - 1);
+ last_sort_column_ = -1;
}
void PacketListModel::resetColorized()
@@ -254,33 +256,67 @@ QElapsedTimer busy_timer_;
const int busy_timeout_ = 65; // ms, approximately 15 fps
void PacketListModel::sort(int column, Qt::SortOrder order)
{
+ // packet_list_store.c:packet_list_dissect_and_cache_all
if (!cap_file_ || visible_rows_.count() < 1) return;
- if (column < 0) return;
+ if (column < 0 || column == last_sort_column_) return;
sort_column_ = column;
text_sort_column_ = PacketListRecord::textColumn(column);
sort_order_ = order;
sort_cap_file_ = cap_file_;
- beginResetModel();
+ gboolean stop_flag = FALSE;
QString col_title = get_column_title(column);
+
+ busy_timer_.start();
+ emit pushProgressStatus(tr("Dissecting"), true, true, &stop_flag);
+ int row_num = 0;
+ foreach (PacketListRecord *row, physical_rows_) {
+ row->columnString(sort_cap_file_, column);
+ row_num++;
+ if (busy_timer_.elapsed() > busy_timeout_) {
+ if (stop_flag) {
+ emit popProgressStatus();
+ return;
+ }
+ emit updateProgressStatus(row_num * 100 / physical_rows_.count());
+ // What's the least amount of processing that we can do which will draw
+ // the progress indicator?
+ wsApp->processEvents(QEventLoop::AllEvents, 1);
+ busy_timer_.restart();
+ }
+ }
+ emit popProgressStatus();
+
+ // XXX Use updateProgress instead. We'd have to switch from std::sort to
+ // something we can interrupt.
if (!col_title.isEmpty()) {
QString busy_msg = tr("Sorting \"%1\"").arg(col_title);
emit pushBusyStatus(busy_msg);
- busy_timer_.start();
}
- std::sort(visible_rows_.begin(), visible_rows_.end(), recordLessThan);
- for (int i = 0; i < visible_rows_.count(); i++) {
- number_to_row_[visible_rows_[i]->frameData()->num] = i;
+
+ busy_timer_.restart();
+ std::sort(physical_rows_.begin(), physical_rows_.end(), recordLessThan);
+
+ beginResetModel();
+ visible_rows_.clear();
+ number_to_row_.clear();
+ foreach (PacketListRecord *record, physical_rows_) {
+ if (record->frameData()->flags.passed_dfilter || record->frameData()->flags.ref_time) {
+ visible_rows_ << record;
+ number_to_row_[record->frameData()->num] = visible_rows_.count() - 1;
+ }
}
+ endResetModel();
+
if (!col_title.isEmpty()) {
emit popBusyStatus();
}
- endResetModel();
if (cap_file_->current_frame) {
emit goToPacket(cap_file_->current_frame->num);
}
+ last_sort_column_ = column;
}
bool PacketListModel::recordLessThan(PacketListRecord *r1, PacketListRecord *r2)
@@ -291,11 +327,11 @@ bool PacketListModel::recordLessThan(PacketListRecord *r1, PacketListRecord *r2)
// _packet_list_compare_records, and packet_list_compare_custom from
// gtk/packet_list_store.c into one function
- // What's the least amount of processing that we can do which will draw
- // the busy indicator?
if (busy_timer_.elapsed() > busy_timeout_) {
- busy_timer_.restart();
+ // What's the least amount of processing that we can do which will draw
+ // the busy indicator?
wsApp->processEvents(QEventLoop::ExcludeUserInputEvents | QEventLoop::ExcludeSocketNotifiers, 1);
+ busy_timer_.restart();
}
if (sort_column_ < 0) {
// No column.
@@ -304,7 +340,7 @@ bool PacketListModel::recordLessThan(PacketListRecord *r1, PacketListRecord *r2)
// Column comes directly from frame data
cmp_val = frame_data_compare(sort_cap_file_->epan, r1->frameData(), r2->frameData(), sort_cap_file_->cinfo.columns[sort_column_].col_fmt);
} else {
- if (r1->columnString(sort_cap_file_, sort_column_).toByteArray().constData() == r2->columnString(sort_cap_file_, sort_column_).toByteArray().constData()) {
+ if (r1->columnString(sort_cap_file_, sort_column_).constData() == r2->columnString(sort_cap_file_, sort_column_).constData()) {
cmp_val = 0;
} else if (sort_cap_file_->cinfo.columns[sort_column_].col_fmt == COL_CUSTOM) {
header_field_info *hfi;
@@ -322,7 +358,8 @@ bool PacketListModel::recordLessThan(PacketListRecord *r1, PacketListRecord *r2)
(hfi->type == FT_BOOLEAN) || (hfi->type == FT_FRAMENUM) ||
(hfi->type == FT_RELATIVE_TIME)))
{
- /* Attempt to convert to numbers */
+ // Attempt to convert to numbers.
+ // XXX This is slow. Can we avoid doing this?
bool ok_r1, ok_r2;
double num_r1 = r1->columnString(sort_cap_file_, sort_column_).toDouble(&ok_r1);
double num_r2 = r2->columnString(sort_cap_file_, sort_column_).toDouble(&ok_r2);
@@ -335,14 +372,14 @@ bool PacketListModel::recordLessThan(PacketListRecord *r1, PacketListRecord *r2)
cmp_val = 1;
}
} else {
- cmp_val = strcmp(r1->columnString(sort_cap_file_, sort_column_).toByteArray().constData(), r2->columnString(sort_cap_file_, sort_column_).toByteArray().constData());
+ cmp_val = strcmp(r1->columnString(sort_cap_file_, sort_column_).constData(), r2->columnString(sort_cap_file_, sort_column_).constData());
}
} else {
- cmp_val = strcmp(r1->columnString(sort_cap_file_, sort_column_).toByteArray().constData(), r2->columnString(sort_cap_file_, sort_column_).toByteArray().constData());
+ cmp_val = strcmp(r1->columnString(sort_cap_file_, sort_column_).constData(), r2->columnString(sort_cap_file_, sort_column_).constData());
}
if (cmp_val == 0) {
- // Last resort. Compare column numbers.
+ // All else being equal, compare column numbers.
cmp_val = frame_data_compare(sort_cap_file_->epan, r1->frameData(), r2->frameData(), COL_NUMBER);
}
}
@@ -435,7 +472,7 @@ QVariant PacketListModel::data(const QModelIndex &d_index, int role) const
case Qt::DisplayRole:
{
int column = d_index.column();
- QVariant column_string = record->columnString(cap_file_, column);
+ QByteArray column_string = record->columnString(cap_file_, column, true);
// We don't know an item's sizeHint until we fetch its text here.
// Assume each line count is 1. If the line count changes, emit
// itemHeightChanged which triggers another redraw (including a
@@ -514,7 +551,7 @@ void PacketListModel::ensureRowColorized(int row)
if (!record)
return;
if (!record->colorized()) {
- record->columnString(cap_file_, 1);
+ record->columnString(cap_file_, 1, true);
}
}
diff --git a/ui/qt/packet_list_model.h b/ui/qt/packet_list_model.h
index 4fdbbaa419..6e78a11a5d 100644
--- a/ui/qt/packet_list_model.h
+++ b/ui/qt/packet_list_model.h
@@ -77,6 +77,10 @@ signals:
void pushBusyStatus(const QString &status);
void popBusyStatus();
+ void pushProgressStatus(const QString &status, bool animate, bool terminate_is_stop, gboolean *stop_flag);
+ void updateProgressStatus(int value);
+ void popProgressStatus();
+
public slots:
void setMonospaceFont(const QFont &mono_font, int row_height);
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
@@ -93,6 +97,7 @@ private:
int row_height_;
int line_spacing_;
+ int last_sort_column_;
static int sort_column_;
static int text_sort_column_;
static Qt::SortOrder sort_order_;
diff --git a/ui/qt/packet_list_record.cpp b/ui/qt/packet_list_record.cpp
index cd94014a25..cdf61bec12 100644
--- a/ui/qt/packet_list_record.cpp
+++ b/ui/qt/packet_list_record.cpp
@@ -47,17 +47,18 @@ PacketListRecord::PacketListRecord(frame_data *frameData) :
{
}
-const QVariant PacketListRecord::columnString(capture_file *cap_file, int column)
+const QByteArray PacketListRecord::columnString(capture_file *cap_file, int column, bool colorized)
{
// packet_list_store.c:packet_list_get_value
g_assert(fdata_);
if (!cap_file || column < 0 || column > cap_file->cinfo.num_cols) {
- return QVariant();
+ return QByteArray();
}
- if (column >= col_text_.size() || col_text_[column].isNull() || data_ver_ != col_data_ver_ || !colorized_) {
- dissect(cap_file, !colorized_);
+ bool dissect_color = colorized && !colorized_;
+ if (column >= col_text_.size() || col_text_[column].isNull() || data_ver_ != col_data_ver_ || dissect_color) {
+ dissect(cap_file, dissect_color);
}
return col_text_.value(column, QByteArray());
@@ -243,7 +244,9 @@ void PacketListRecord::cacheColumnStrings(column_info *cinfo)
break;
}
#else // MINIMIZE_STRING_COPYING
- // XXX Use QContiguousCache?
+ // XXX The GTK+ code uses GStringChunk for string storage. It
+ // doesn't appear to be that much faster, but it probably uses
+ // less memory.
QByteArray col_text;
if (!get_column_resolved(column) && cinfo->col_expr.col_expr_val[column]) {
/* Use the unresolved value in col_expr_val */
diff --git a/ui/qt/packet_list_record.h b/ui/qt/packet_list_record.h
index 17d7c6ae82..c8d2e90a28 100644
--- a/ui/qt/packet_list_record.h
+++ b/ui/qt/packet_list_record.h
@@ -42,7 +42,7 @@ class PacketListRecord
public:
PacketListRecord(frame_data *frameData);
// Return the string value for a column. Data is cached if possible.
- const QVariant columnString(capture_file *cap_file, int column);
+ const QByteArray columnString(capture_file *cap_file, int column, bool colorized = false);
frame_data *frameData() const { return fdata_; }
// packet_list->col_to_text in gtk/packet_list_store.c
static int textColumn(int column) { return cinfo_column_.value(column, -1); }
@@ -75,7 +75,6 @@ private:
void dissect(capture_file *cap_file, bool dissect_color = false);
void cacheColumnStrings(column_info *cinfo);
-
};
#endif // PACKET_LIST_RECORD_H
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-27 04:51:40 +0000