Changed filterAcceptsRow of context_table_proxy_model.cpp to work wit…

…h SearchOptions Implemented SearchProxyModel::isMatching() function to check if a string matches the search criteria specified by the SearchOptions Removed the "m"-prefix from the getterMethods
emsec · Sep 26, 2023 · 1db3dd1 · 1db3dd1
1 parent 1b91945
commit 1db3dd1
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 21 deletions.
diff --git a/plugins/gui/include/gui/context_manager_widget/models/context_table_proxy_model.h b/plugins/gui/include/gui/context_manager_widget/models/context_table_proxy_model.h
@@ -83,6 +83,6 @@ namespace hal
         bool lessThan(const QModelIndex& left, const QModelIndex& right) const override;
 
     private:
-        QRegularExpression mFilterExpression;
+        QString mSearchString;
     };
 }    // namespace hal
diff --git a/plugins/gui/include/gui/searchbar/search_proxy_model.h b/plugins/gui/include/gui/searchbar/search_proxy_model.h
@@ -36,11 +36,23 @@ namespace hal
     public:
         SearchProxyModel(QObject* parent = nullptr);
 
+        /**
+         * @brief Check if a string matches the SearchOptions.
+         *
+         * This function checks whether a given `stringToCheck` matches the search criteria
+         * specified by `searchString` based on search options.
+         *
+         * @param searchString The search criteria to match against `stringToCheck`.
+         * @param stringToCheck The string to be checked for a match.
+         * @return True if `stringToCheck` matches the search criteria, otherwise false.
+         */
+        bool isMatching(const QString searchString, const QString stringToCheck) const;
+
     public Q_SLOTS:
         virtual void startSearch(QString text, int options) = 0;
 
     protected:
-        SearchOptions* mSearchOptions;
+        SearchOptions mSearchOptions;
     };
 }
 
diff --git a/plugins/gui/include/gui/searchbar/searchoptions.h b/plugins/gui/include/gui/searchbar/searchoptions.h
@@ -38,10 +38,10 @@ namespace hal
         int toInt() const;
         static int toInt(bool exactMatch, bool caseSensitive, bool regEx, QList<int> columns);
 
-        bool isMExactMatch() const;
-        bool isMCaseSensitive() const;
-        bool isMRegularExpression() const;
-        const QList<int>& getMColumns() const;
+        bool isExactMatch() const;
+        bool isCaseSensitive() const;
+        bool isRegularExpression() const;
+        const QList<int>& getColumns() const;
 
     private:
         bool mExactMatch;

diff --git a/plugins/gui/src/context_manager_widget/models/context_table_proxy_model.cpp b/plugins/gui/src/context_manager_widget/models/context_table_proxy_model.cpp
@@ -8,29 +8,33 @@ namespace hal
 {
     ContextTableProxyModel::ContextTableProxyModel(QObject* parent) : SearchProxyModel(parent)
     {
-        mFilterExpression.setPatternOptions(QRegularExpression::CaseInsensitiveOption);
+
     }
 
     bool ContextTableProxyModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const
     {
-        QList<int> columns = mSearchOptions->getMColumns();
+        QList<int> columns = mSearchOptions.getColumns();
 
 
         //TODO get column count
         if(columns.empty()){
             //iterate over each column
             for(int index = 0; index < 2; index++){
                 QString entry = sourceModel()->index(source_row, index, source_parent).data().toString();
-                if(mFilterExpression.match(entry).hasMatch())
+                qInfo() << "Checking " << entry;
+                if(isMatching(mSearchString, entry))
+                {
+                    qInfo() << "true";
                     return true;
+                }
             }
             return false;
         }else
         {
             for(int index : columns)
             {
                 QString entry = sourceModel()->index(source_row, index, source_parent).data().toString();
-                if(mFilterExpression.match(entry).hasMatch())
+                if(SearchProxyModel::isMatching(mSearchString, entry));
                     return true;
             }
             return false;
@@ -64,7 +68,8 @@ namespace hal
 
     void ContextTableProxyModel::startSearch(QString text, int options)
     {
-        mFilterExpression.setPattern(text);
+        mSearchString = text;
+        mSearchOptions = SearchOptions(options);
         invalidateFilter();
     }
 }
diff --git a/plugins/gui/src/searchbar/search_proxy_model.cpp b/plugins/gui/src/searchbar/search_proxy_model.cpp
@@ -4,13 +4,34 @@
 namespace hal {
     SearchProxyModel::SearchProxyModel(QObject* parent): QSortFilterProxyModel(parent)
     {
-        mSearchOptions = new SearchOptions();
+        mSearchOptions = SearchOptions();
     }
 
     void SearchProxyModel::startSearch(QString text, int options)
     {
-        mSearchOptions = new SearchOptions(options);
+        mSearchOptions = SearchOptions(options);
         qInfo() << "Proxy received searchOptions";
     }
+    bool SearchProxyModel::isMatching(const QString searchString, const QString stringToCheck) const
+    {
+        if(!mSearchOptions.isExactMatch()){
+            //check if stringToCheck contains the searchString
+            return stringToCheck.contains(searchString, mSearchOptions.isCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive);
+        }
+        else if(mSearchOptions.isExactMatch()){
+            //check if the stringToCheck is the same as the searchString   - also checks CaseSensitivity
+
+            return 0 == QString::compare(searchString, stringToCheck, mSearchOptions.isCaseSensitive() ? Qt::CaseSensitive : Qt::CaseInsensitive);
+        }
+        else if(mSearchOptions.isRegularExpression()){
+            //checks if the stringToCheck matches the regEx given by searchString
+
+            //TODO regEx does not work
+
+            auto regEx = QRegularExpression(searchString, mSearchOptions.isCaseSensitive() ? QRegularExpression::NoPatternOption : QRegularExpression::CaseInsensitiveOption);
+            return regEx.match(stringToCheck).hasMatch();
+        }
+        return false;
+    }
 
 }
diff --git a/plugins/gui/src/searchbar/searchbar.cpp b/plugins/gui/src/searchbar/searchbar.cpp
@@ -27,7 +27,7 @@ namespace hal
 
         ensurePolished();
 
-        mCurrentOptions = new SearchOptions(9);//exact match and search in all columns is on
+        mCurrentOptions = new SearchOptions(8);//exact match and search in all columns is on
         mIncrementalSearch = false;
         mSearchIconLabel->setPixmap(gui_utility::getStyledSvgIcon(mSearchIconStyle, mSearchIcon).pixmap(QSize(16, 16)));
         mSearchIconLabel->installEventFilter(this);

diff --git a/plugins/gui/src/searchbar/searchoptions.cpp b/plugins/gui/src/searchbar/searchoptions.cpp
@@ -70,22 +70,22 @@ namespace hal
         mColumns = columns;
     }
 
-    bool SearchOptions::isMExactMatch() const
+    bool SearchOptions::isExactMatch() const
     {
         return mExactMatch;
     }
 
-    bool SearchOptions::isMCaseSensitive() const
+    bool SearchOptions::isCaseSensitive() const
     {
         return mCaseSensitive;
     }
 
-    bool SearchOptions::isMRegularExpression() const
+    bool SearchOptions::isRegularExpression() const
     {
         return mRegularExpression;
     }
 
-    const QList<int>& SearchOptions::getMColumns() const
+    const QList<int>& SearchOptions::getColumns() const
     {
         return mColumns;
     }

diff --git a/plugins/gui/src/searchbar/searchoptions_dialog.cpp b/plugins/gui/src/searchbar/searchoptions_dialog.cpp
@@ -80,9 +80,9 @@ namespace hal
 
     void SearchOptionsDialog::setOptions(SearchOptions* opts, bool incSearch, int minIncSearch) const
     {
-        mExactMatchBox->setChecked(opts->isMExactMatch());
-        mCaseSensitiveBox->setChecked(opts->isMCaseSensitive());
-        mRegExBox->setChecked(opts->isMRegularExpression());
+        mExactMatchBox->setChecked(opts->isExactMatch());
+        mCaseSensitiveBox->setChecked(opts->isCaseSensitive());
+        mRegExBox->setChecked(opts->isRegularExpression());
         mIncrementalSearchBox->setChecked(incSearch);
 
         mSpinBox->setValue(minIncSearch);