From: Randy Baumgarte <randy@fbn.cx>
Date: Wed, 18 Aug 2010 12:36:04 +0000 (-0400)
Subject: Performance improvements when switching notebooks or selecting tags by removing the... 
X-Git-Tag: version0.1.1~408
X-Git-Url: http://git.sourceforge.jp/view?a=commitdiff_plain;h=968d8fb9168500412472b2d32936858c5b31b47a;p=neighbornote%2FNeighborNote.git

Performance improvements when switching notebooks or selecting tags by removing the resize on each table row and by altering the attribute selection logic.
---

diff --git a/src/cx/fbn/nevernote/NeverNote.java b/src/cx/fbn/nevernote/NeverNote.java
index 1f3ca33..4e01def 100644
--- a/src/cx/fbn/nevernote/NeverNote.java
+++ b/src/cx/fbn/nevernote/NeverNote.java
@@ -393,7 +393,6 @@ public class NeverNote extends QMainWindow{
 			saveTimer.start();
 		}
 		
-//		Global.trace();
 		logger.log(logger.EXTREME, "Starting external file monitor timer");
 		externalFileSaveTimer = new QTimer();
 		externalFileSaveTimer.timeout.connect(this, "externalFileEditedSaver()");
@@ -957,7 +956,6 @@ public class NeverNote extends QMainWindow{
 			clearTagFilter();
 			searchField.clear();
 		}
-		
 		menuBar.noteRestoreAction.setVisible(false);		
     	menuBar.notebookEditAction.setEnabled(true);
     	menuBar.notebookDeleteAction.setEnabled(true);
diff --git a/src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java b/src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java
index f6e443e..ade50e2 100644
--- a/src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java
+++ b/src/cx/fbn/nevernote/gui/ContainsAttributeFilterTable.java
@@ -62,6 +62,14 @@ public class ContainsAttributeFilterTable {
 		return table.size();
 	}
 	
+	public boolean hasSelection() {
+		for (int i=0; i<table.size(); i++) {
+			if (table.get(i).isSet() == true)
+				return true;
+		}
+		return false;
+	}
+	
 	public boolean check(NoteTable sqlTable, Note n) {
 		boolean result = true;
 		
diff --git a/src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java b/src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java
index 57bfdf5..3580541 100644
--- a/src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java
+++ b/src/cx/fbn/nevernote/gui/DateAttributeFilterTable.java
@@ -67,6 +67,14 @@ public class DateAttributeFilterTable {
 			table.get(i).set(false);
 	}
 	
+	public boolean hasSelection() {
+		for (int i=0; i<table.size(); i++) {
+			if (table.get(i).isSet() == true)
+				return true;
+		}
+		return false;
+	}
+	
 	public void select(String name) {
 		for (int i=0; i<table.size(); i++) 
 			if (table.get(i).getName().equals(name))
diff --git a/src/cx/fbn/nevernote/gui/TableView.java b/src/cx/fbn/nevernote/gui/TableView.java
index 25c43cf..2a88ad0 100644
--- a/src/cx/fbn/nevernote/gui/TableView.java
+++ b/src/cx/fbn/nevernote/gui/TableView.java
@@ -140,6 +140,8 @@ public class TableView extends QTableView {
 	public void load(boolean reload) {
 		proxyModel.clear();
 		setSortingEnabled(false);
+		QFontMetrics f = QApplication.fontMetrics();
+		verticalHeader().setDefaultSectionSize(f.height());
 		for (int i=0; i<runner.getNoteIndex().size(); i++) {
 			if (Global.showDeleted == true && !runner.getNoteIndex().get(i).isActive())
 				proxyModel.addGuid(runner.getNoteIndex().get(i).getGuid());
@@ -151,13 +153,6 @@ public class TableView extends QTableView {
 			logger.log(logger.EXTREME, "TableView.load() reload starting.");
 			proxyModel.filter();
 			logger.log(logger.EXTREME, "TableView.load() leaving reload.");
-			QFontMetrics f = QApplication.fontMetrics();
-			fontHeight = f.height();
-			for (int i=0; i<runner.getNoteTableModel().rowCount(); i++)
-				setRowHeight(i, fontHeight);
-			proxyModel.invalidate();
-			setSortingEnabled(true);
-			resetViewport.emit();
 			return;
 		}
 		logger.log(logger.EXTREME, "TableView.load() Filling table data from scratch");
@@ -229,11 +224,6 @@ public class TableView extends QTableView {
 
 		proxyModel.filter();
 		
-		QFontMetrics f = QApplication.fontMetrics();
-		fontHeight = f.height();
-		for (int i=0; i<runner.getNoteTableModel().rowCount(); i++)
-			setRowHeight(i, fontHeight);
-		
 		setSortingEnabled(true);
 		resetViewport.emit();
 	}
@@ -445,5 +435,4 @@ public class TableView extends QTableView {
         return verticalScrollBar().value();
     }
 */
-	
 }
diff --git a/src/cx/fbn/nevernote/sql/NoteTable.java b/src/cx/fbn/nevernote/sql/NoteTable.java
index 3ab759d..6ee42cb 100644
--- a/src/cx/fbn/nevernote/sql/NoteTable.java
+++ b/src/cx/fbn/nevernote/sql/NoteTable.java
@@ -499,7 +499,7 @@ public class NoteTable {
 		}
 	}
 
-	
+/*	
 	// Check a note to see if it passes the attribute selection criteria
 	public boolean checkAttributeSelection(Note n) {
 		if (Global.createdSinceFilter.check(n) &&
@@ -511,6 +511,7 @@ public class NoteTable {
 		
 		return false;
 	}
+*/
 	// Delete a note
 	public void deleteNote(String guid) {
         NSqlQuery query = new NSqlQuery(db.getConnection());
diff --git a/src/cx/fbn/nevernote/utilities/ListManager.java b/src/cx/fbn/nevernote/utilities/ListManager.java
index ed8d88a..e580d5c 100644
--- a/src/cx/fbn/nevernote/utilities/ListManager.java
+++ b/src/cx/fbn/nevernote/utilities/ListManager.java
@@ -824,7 +824,6 @@ public class ListManager  {
 			Note n = matches.get(i);
 			boolean goodNotebook = false;
 			boolean goodTag = false;
-			boolean goodAttribute = false;
 			boolean goodStatus = false;
 			
 			// Check note status
@@ -838,10 +837,41 @@ public class ListManager  {
 					goodNotebook = filterByNotebook(n.getNotebookGuid());
 				if (goodNotebook) 
 					goodTag = filterByTag(n.getTagGuids());
-				if (goodTag)
-					goodAttribute = conn.getNoteTable().checkAttributeSelection(n);
-				if (goodAttribute)
-					index.add(n);
+				if (goodTag) {
+					boolean goodCreatedBefore = false;
+					boolean goodCreatedSince = false;
+					boolean goodChangedBefore = false;
+					boolean goodChangedSince = false;
+					boolean goodContains = false;
+					
+					if (!Global.createdBeforeFilter.hasSelection())
+						goodCreatedBefore = true;
+					else
+						goodCreatedBefore = Global.createdBeforeFilter.check(n);
+					
+					if (!Global.createdSinceFilter.hasSelection())
+						goodCreatedSince = true;
+					else
+						goodCreatedSince = Global.createdSinceFilter.check(n);
+					
+					if (!Global.changedBeforeFilter.hasSelection())
+						goodChangedBefore = true;
+					else
+						goodChangedBefore = Global.changedBeforeFilter.check(n);
+
+					if (!Global.changedSinceFilter.hasSelection())
+						goodChangedSince = true;
+					else
+						goodChangedSince = Global.changedSinceFilter.check(n);
+
+					if (!Global.containsFilter.hasSelection())
+						goodContains = true;
+					else
+						goodContains = Global.containsFilter.check(conn.getNoteTable(), n);
+					
+					if (goodCreatedSince && goodCreatedBefore && goodChangedSince && goodChangedBefore && goodContains)
+						index.add(n);
+				}
 			}
 
 		}