mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-07 12:10:52 -06:00
Code Issues Packages Projects Releases Wiki Activity

Code review changes

Browse Source
This commit is contained in:
Gene Payne
2023-08-11 16:16:19 -06:00
parent 4433abdf79
commit cbe215fc5b
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
apps/OpenSpace/ext/launcher/include/profile/assetsdialog.h
View File

@@ -26,8 +26,8 @@
#define __OPENSPACE_UI_LAUNCHER___ASSETSDIALOG___H__
#include <QDialog>
#include <QSortFilterProxyModel>
#include <QRegularExpression>
#include <QSortFilterProxyModel>
#include "assettreemodel.h"
class QTextEdit;
@@ -41,7 +41,7 @@ public:
*
* \param parent The QObject* object that is the Qt parent of this object
*/
SearchProxyModel(QObject* parent = nullptr) : QSortFilterProxyModel(parent) {}
SearchProxyModel(QObject* parent = nullptr);
public slots:
/**
@@ -55,8 +55,9 @@ protected:
bool filterAcceptsRow(int sourceRow, const QModelIndex& sourceParent) const override;
private:
QRegularExpression* _regExPattern = nullptr;
bool acceptIndex(const QModelIndex& idx) const;
QRegularExpression* _regExPattern = nullptr;
};
class AssetsDialog final : public QDialog {

29
apps/OpenSpace/ext/launcher/src/profile/assetsdialog.cpp
View File

@@ -64,7 +64,7 @@ namespace {
{
int startIndex = 0;
std::string token = "${USER_ASSETS}/";
if (path.find(token) == 0) {
if (path.starts_with(token)) {
startIndex = static_cast<int>(token.length());
}
const size_t slash = path.find_first_of('/', startIndex);
@@ -301,6 +301,10 @@ void AssetsDialog::searchTextChanged(const QString& text) {
}
}
SearchProxyModel::SearchProxyModel(QObject* parent)
: QSortFilterProxyModel(parent)
{}
void SearchProxyModel::setFilterRegularExpression(const QString& pattern) {
_regExPattern = new QRegularExpression(
pattern,
@@ -317,20 +321,19 @@ bool SearchProxyModel::filterAcceptsRow(int sourceRow,
}
bool SearchProxyModel::acceptIndex(const QModelIndex& idx) const {
if (idx.isValid()) {
QString text = idx.data(Qt::DisplayRole).toString();
if (!_regExPattern) {
return false;
}
QRegularExpressionMatchIterator matchIterator = _regExPattern->globalMatch(text);
if (matchIterator.hasNext()) {
if (!idx.isValid() || !_regExPattern) {
return false;
}
QString text = idx.data(Qt::DisplayRole).toString();
QRegularExpressionMatchIterator matchIterator = _regExPattern->globalMatch(text);
if (matchIterator.hasNext()) {
return true;
}
for (int row = 0; row < idx.model()->rowCount(idx); ++row) {
if (acceptIndex(idx.model()->index(row, 0, idx))) {
return true;
}
for (int row = 0; row < idx.model()->rowCount(idx); ++row) {
if (acceptIndex(idx.model()->index(row, 0, idx))) {
return true;
}
}
}
return false;
}