Changeset 88728 in vbox

Timestamp:

Apr 27, 2021 11:51:02 AM (4 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

144046

Message:

FE/Qt: bugref:9930. Some cleaning

Location:

trunk/src/VBox/Frontends/VirtualBox/src/logviewer

Files:

• UIVMLogPage.cpp (modified) (2 diffs)
• UIVMLogPage.h (modified) (2 diffs)
• UIVMLogViewerFilterPanel.cpp (modified) (4 diffs)
• UIVMLogViewerFilterPanel.h (modified) (2 diffs)
• UIVMLogViewerWidget.cpp (modified) (3 diffs)
• UIVMLogViewerWidget.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.cpp

@@ -38 +38 @@
     , m_iSelectedBookmarkIndex(-1)
     , m_bFiltered(false)
-    , m_iFilteredLineCount(-1)
-    , m_iUnfilteredLineCount(-1)
     , m_iLogFileId(-1)
 {
@@ -298 +296 @@
 }
 
-void UIVMLogPage::setFilterParameters(const QSet<QString> &filterTermSet, int filterOperationType,
-                                      int iFilteredLineCount, int iUnfilteredLineCount)
-{
-    m_filterTermSet = filterTermSet;
-    m_filterOperationType = filterOperationType;
-    m_iFilteredLineCount = iFilteredLineCount;
-    m_iUnfilteredLineCount = iUnfilteredLineCount;
-}
-
-int  UIVMLogPage::filteredLineCount() const
-{
-    return m_iFilteredLineCount;
-}
-
-int  UIVMLogPage::unfilteredLineCount() const
-{
-    return m_iUnfilteredLineCount;
-}
-
-bool UIVMLogPage::shouldFilterBeApplied(const QSet<QString> &filterTermSet, int filterOperationType) const
-{
-    /* If filter terms set is different reapply the filter. */
-    if (filterTermSet != m_filterTermSet)
-        return true;
-
-    /* If filter operation type set is different reapply the filter. */
-    if (filterOperationType != m_filterOperationType)
-        return true;
-    return false;
-}
-
 QFont UIVMLogPage::currentFont() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogPage.h

@@ -93 +93 @@
     void setWrapLines(bool bWrapLines);
 
-    /** setFilterParameters is called at the end of filtering operation to store the parameter etc.
-     *  these parameters are used to decide whether we have to reapply the filter, and if not to
-     *  update filter panel with correct line counts etc.*/
-    void setFilterParameters(const QSet<QString> &filterTermSet, int filterOperationType,
-                             int iFilteredLineCount, int iUnfilteredLineCount);
-    int  filteredLineCount() const;
-    int  unfilteredLineCount() const;
-    /** Compares filter parameters with previous filter operation's parameters to decide if the
-     *  filter should be applied again. */
-    bool shouldFilterBeApplied(const QSet<QString> &filterTermSet, int filterOperationType) const;
-
     QFont currentFont() const;
     void setCurrentFont(QFont font);
@@ -150 +139 @@
         if m_bFiltered is false than (m_strLog == m_pTextEdit->text()). */
         bool           m_bFiltered;
-        /** The set of filter terms used in the last filtering.
-            Used when deciding whether we have to reapply the filter or not. see shouldFilterBeApplied function. */
-        QSet<QString>  m_filterTermSet;
-        /** The type of the boolean last filtering operation. Used in deciding whether we have to reapply the
-            filter. see shouldFilterBeApplied function. This is int cast of enum FilterOperatorButton
-            of UIVMLogViewerFilterPanel. */
-        int            m_filterOperationType;
-        /** These counts are saveds and restored during filtering operation. If filter is not reapplied these counts
-            are shown in the filter panel. */
-        int            m_iFilteredLineCount;
-        int            m_iUnfilteredLineCount;
     /** @} */
     /** Id of the machine the log shown in this page belongs to. */

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.cpp

@@ -264 +264 @@
 }
 
-void UIVMLogViewerFilterPanel::applyFilter(const int iCurrentIndex /* = 0 */)
-{
-    Q_UNUSED(iCurrentIndex);
+void UIVMLogViewerFilterPanel::applyFilter()
+{
     filter();
     retranslateUi();
@@ -282 +281 @@
     if (!logPage)
         return;
-    /* Check if we have to reapply the filter. If not
-       restore line counts etc. and return */
-    // if (!logPage->shouldFilterBeApplied(m_filterTermSet, (int)m_eFilterOperatorButton))
-    // {
-    //     m_iFilteredLineCount = logPage->filteredLineCount();
-    //     m_iUnfilteredLineCount = logPage->unfilteredLineCount();
-    //     emit sigFilterApplied(!logPage->isFiltered() /* isOriginalLog */);
-    //     return;
-    // }
-
 
     const QString* originalLogString = logString();
@@ -309 +298 @@
         emit sigFilterApplied(true /* isOriginalLog */);
         m_iFilteredLineCount = document->lineCount();
-        logPage->setFilterParameters(m_filterTermSet, (int)m_eFilterOperatorButton,
-                                     m_iFilteredLineCount, m_iUnfilteredLineCount);
         return;
     }
@@ -338 +325 @@
 
     emit sigFilterApplied(false /* isOriginalLog */);
-    logPage->setFilterParameters(m_filterTermSet, (int)m_eFilterOperatorButton,
-                                 m_iFilteredLineCount, m_iUnfilteredLineCount);
-}
-
+}
+
+void resetFiltering()
+{
+}
 
 bool UIVMLogViewerFilterPanel::applyFilterTermsToString(const QString& string)

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerFilterPanel.h

@@ -61 +61 @@
 public slots:
 
-    /** Applies filter settings and filters the current log-page.
-      * @param  iCurrentIndex  Specifies index of current log-page, but it is actually not used in the method. */
-    void applyFilter(const int iCurrentIndex = 0);
+    /** Applies filter settings and filters the current log-page. */
+    void applyFilter();
 
 protected:
@@ -97 +96 @@
     bool applyFilterTermsToString(const QString& string);
     void filter();
+    /** Revert the document to original. */
+    void resetFiltering();
 
     QLabel              *m_pFilterLabel;

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.cpp

@@ -400 +400 @@
 }
 
-void UIVMLogViewerWidget::sltTabIndexChange(int tabIndex)
+void UIVMLogViewerWidget::sltCurrentTabChanged(int tabIndex)
 {
     Q_UNUSED(tabIndex);
@@ -406 +406 @@
     /* Dont refresh the search here as it is refreshed by the filtering mechanism
        which is updated as tab current index changes: */
+    if (m_pFilterPanel)
+        m_pFilterPanel->applyFilter();
 
     /* We keep a separate QVector<LogBookmark> for each log page: */
@@ -586 +588 @@
             /* Add into layout: */
             m_pMainLayout->addWidget(m_pTabWidget);
+            connect(m_pTabWidget, &QITabWidget::currentChanged, this, &UIVMLogViewerWidget::sltCurrentTabChanged);
 #if 0
             m_pCornerButton = new QIToolButton(m_pTabWidget);

trunk/src/VBox/Frontends/VirtualBox/src/logviewer/UIVMLogViewerWidget.h

@@ -119 +119 @@
     void sltHandleSearchUpdated();
     /** Handles the tab change of the logviewer. */
-    void sltTabIndexChange(int tabIndex);
+    void sltCurrentTabChanged(int tabIndex);
     /* if @a isOriginal true than the result of the filtering is equal to
        the original log file for some reason. */