Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/MainWindow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -554,9 +554,9 @@ void MainWindow::populateTable()
}
}
if(only_defaults)
m_browseTableModel->setTable(tablename, storedData.sortOrderIndex, storedData.sortOrderMode);
m_browseTableModel->setTable(tablename, storedData.sortOrderIndex, storedData.sortOrderMode, storedData.filterValues);
else
m_browseTableModel->setTable(tablename, storedData.sortOrderIndex, storedData.sortOrderMode, v);
m_browseTableModel->setTable(tablename, storedData.sortOrderIndex, storedData.sortOrderMode, storedData.filterValues, v);

// There is information stored for this table, so extract it and apply it

Expand All @@ -579,10 +579,12 @@ void MainWindow::populateTable()
// Sorting
ui->dataTable->filterHeader()->setSortIndicator(storedData.sortOrderIndex, storedData.sortOrderMode);

// Filters
// Set filters blocking signals, since the filter is already applied to the browse table model
FilterTableHeader* filterHeader = qobject_cast<FilterTableHeader*>(ui->dataTable->horizontalHeader());
bool oldState = filterHeader->blockSignals(true);
for(auto filterIt=storedData.filterValues.constBegin();filterIt!=storedData.filterValues.constEnd();++filterIt)
filterHeader->setFilter(filterIt.key(), filterIt.value());
filterHeader->blockSignals(oldState);

// Encoding
m_browseTableModel->setEncoding(storedData.encoding);
Expand Down
10 changes: 7 additions & 3 deletions src/sqlitetablemodel.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ void SqliteTableModel::setChunkSize(size_t chunksize)
m_chunkSize = chunksize;
}

void SqliteTableModel::setTable(const sqlb::ObjectIdentifier& table, int sortColumn, Qt::SortOrder sortOrder, const QVector<QString>& display_format)
void SqliteTableModel::setTable(const sqlb::ObjectIdentifier& table, int sortColumn, Qt::SortOrder sortOrder, const QMap<int, QString> filterValues, const QVector<QString>& display_format)
{
// Unset all previous settings. When setting a table all information on the previously browsed data set is removed first.
reset();
Expand All @@ -63,6 +63,9 @@ void SqliteTableModel::setTable(const sqlb::ObjectIdentifier& table, int sortCol
m_sTable = table;
m_vDisplayFormat = display_format;

for(auto filterIt=filterValues.constBegin(); filterIt!=filterValues.constEnd(); ++filterIt)
updateFilter(filterIt.key(), filterIt.value(), false);

// The first column is the rowid column and therefore is always of type integer
m_vDataTypes.push_back(SQLITE_INTEGER);

Expand Down Expand Up @@ -734,7 +737,7 @@ QStringList SqliteTableModel::getColumns(const QString& sQuery, QVector<int>& fi
return listColumns;
}

void SqliteTableModel::updateFilter(int column, const QString& value)
void SqliteTableModel::updateFilter(int column, const QString& value, bool applyQuery)
{
// Check for any special comparison operators at the beginning of the value string. If there are none default to LIKE.
QString op = "LIKE";
Expand Down Expand Up @@ -846,7 +849,8 @@ void SqliteTableModel::updateFilter(int column, const QString& value)
}

// Build the new query
buildQuery();
if (applyQuery)
buildQuery();
}

void SqliteTableModel::clearCache()
Expand Down
4 changes: 2 additions & 2 deletions src/sqlitetablemodel.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class SqliteTableModel : public QAbstractTableModel
void setQuery(const QString& sQuery, bool dontClearHeaders = false);
QString query() const { return m_sQuery; }
QString customQuery(bool withRowid);
void setTable(const sqlb::ObjectIdentifier& table, int sortColumn = 0, Qt::SortOrder sortOrder = Qt::AscendingOrder, const QVector<QString> &display_format = QVector<QString>());
void setTable(const sqlb::ObjectIdentifier& table, int sortColumn = 0, Qt::SortOrder sortOrder = Qt::AscendingOrder, const QMap<int, QString> filterValues = QMap<int, QString>(), const QVector<QString> &display_format = QVector<QString>());
void setChunkSize(size_t chunksize);
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder);
const sqlb::ObjectIdentifier& currentTableName() const { return m_sTable; }
Expand Down Expand Up @@ -74,7 +74,7 @@ class SqliteTableModel : public QAbstractTableModel
void waitForFetchingFinished();

public slots:
void updateFilter(int column, const QString& value);
void updateFilter(int column, const QString& value, bool applyQuery = true);

// This cancels the execution of the current query. It can't guarantee that the query is stopped immediately or after returning but it should
// stop soon afterwards. If some data has already been loaded into the model, that data is not deleted
Expand Down