Use binary flags for FilteredItemType

nickbnf · Jun 15, 2018 · 6cf165e · 6cf165e
1 parent 7b57a0c
commit 6cf165e
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 11 deletions.
diff --git a/src/crawlerwidget.cpp b/src/crawlerwidget.cpp
@@ -386,7 +386,7 @@ void CrawlerWidget::markLineFromFiltered( qint64 line )
     if ( line < logFilteredData_->getNbLine() ) {
         qint64 line_in_file = logFilteredData_->getMatchingLineNumber( line );
         if ( logFilteredData_->filteredLineTypeByIndex( line )
-                == LogFilteredData::Mark )
+                & LogFilteredData::Mark )
             logFilteredData_->deleteMark( line_in_file );
         else
             logFilteredData_->addMark( line_in_file );

diff --git a/src/data/logfiltereddata.cpp b/src/data/logfiltereddata.cpp
@@ -457,19 +457,21 @@ void LogFilteredData::regenerateFilteredItemsCache() const
             ( j != marks_.end() ) ? j->lineNumber() : std::numeric_limits<qint64>::max();
         qint64 next_match =
             ( i != matching_lines_.cend() ) ? i->lineNumber() : std::numeric_limits<qint64>::max();
-        // We choose a Mark over a Match if a line is both, just an arbitrary choice really.
+        FilteredLineType type = static_cast<FilteredLineType>( 0 );
+        LineNumber line;
         if ( next_mark <= next_match ) {
             // LOG(logDEBUG) << "Add mark at " << next_mark;
-            filteredItemsCache_.push_back( FilteredItem( next_mark, Mark ) );
+            type |= Mark;
+            line = next_mark;
             ++j;
-            if ( ( next_mark == next_match ) )
-                ++i;  // Case when it's both match and mark.
         }
-        else {
+        if ( next_mark >= next_match ) {
             // LOG(logDEBUG) << "Add match at " << next_match;
-            filteredItemsCache_.push_back( FilteredItem( next_match, Match ) );
+            type |= Match;
+            line = next_match;
             ++i;
         }
+        filteredItemsCache_.push_back( FilteredItem( line, type ) );
     }
 
     filteredItemsCacheDirty_ = false;

diff --git a/src/data/logfiltereddata.h b/src/data/logfiltereddata.h
@@ -80,9 +80,13 @@ class LogFilteredData : public AbstractLogData {
     // Returns the number of marks (independently of the visibility)
     LineNumber getNbMarks() const;
 
+    // Flags indicating why the line is filtered.
+    enum FilteredLineType {
+        Match = 0x1,
+        Mark  = 0x2,
+    };
     // Returns the reason why the line at the passed index is in the filtered
-    // data.  It can be because it is either a mark or a match.
-    enum FilteredLineType { Match, Mark };
+    // data.
     FilteredLineType filteredLineTypeByIndex( int index ) const;
 
     // Marks interface (delegated to a Marks object)
@@ -164,6 +168,23 @@ class LogFilteredData : public AbstractLogData {
     void regenerateFilteredItemsCache() const;
 };
 
+static LogFilteredData::FilteredLineType& operator|=(LogFilteredData::FilteredLineType& a, LogFilteredData::FilteredLineType b)
+{
+    a = LogFilteredData::FilteredLineType( a | b );
+    return a;
+}
+
+static LogFilteredData::FilteredLineType& operator&=(LogFilteredData::FilteredLineType& a, LogFilteredData::FilteredLineType b)
+{
+    a = LogFilteredData::FilteredLineType( a & b );
+    return a;
+}
+
+static LogFilteredData::FilteredLineType operator~(LogFilteredData::FilteredLineType a)
+{
+    return LogFilteredData::FilteredLineType( ~static_cast<int>( a ) );
+}
+
 // A class representing a Mark or Match.
 // Conceptually it should be a base class for Mark and MatchingLine,
 // but we implement it this way for performance reason as we create plenty of
@@ -183,6 +204,13 @@ class LogFilteredData::FilteredItem {
     FilteredLineType type() const
     { return type_; }
 
+    void add( FilteredLineType type )
+    { type_ |= type; }
+
+    // Returns whether any type-flag is left.
+    bool remove( FilteredLineType type )
+    { return type_ &= ~type; }
+
     bool operator <( const LogFilteredData::FilteredItem& other ) const
     { return lineNumber_ < other.lineNumber_; }
 

diff --git a/src/filteredview.cpp b/src/filteredview.cpp
@@ -61,7 +61,7 @@ AbstractLogView::LineType FilteredView::lineType( int lineNumber ) const
 {
     LogFilteredData::FilteredLineType type =
         logFilteredData_->filteredLineTypeByIndex( lineNumber );
-    if ( type == LogFilteredData::Mark )
+    if ( type & LogFilteredData::Mark ) // If both Mark and Match, Mark wins
         return Marked;
     else
         return Match;

diff --git a/src/overview.cpp b/src/overview.cpp
@@ -120,7 +120,7 @@ void Overview::recalculatesLines()
                     logFilteredData_->filteredLineTypeByIndex( i );
                 int line = (int) logFilteredData_->getMatchingLineNumber( i );
                 int position = (int)( (qint64)line * height_ / linesInFile_ );
-                if ( line_type == LogFilteredData::Match ) {
+                if ( line_type & LogFilteredData::Match ) {
                     if ( ( ! matchLines_.isEmpty() ) && matchLines_.last().position() == position ) {
                         // If the line is already there, we increase its weight
                         matchLines_.last().load();