* src/DbPrompter.py: remove unused functions

* src/DisplayModels.py: filtering support
* src/GenericFilter.py: filtering support
* src/PeopleModel.py: support for filtering
* src/PeopleView.py: support for filtering
* src/RelLib.py: filtering support
* src/Utils.py: filtering support
* src/gramps.glade: remove invert for filters
* src/gramps_main.py: filtering support


svn: r3114
This commit is contained in:
Don Allingham
2004-04-28 04:06:25 +00:00
parent 65d5b97a2d
commit a13eb68a88
32 changed files with 476 additions and 207 deletions

View File

@@ -18,30 +18,53 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
#-------------------------------------------------------------------------
#
# Standard python modules
#
#-------------------------------------------------------------------------
from gettext import gettext as _
#-------------------------------------------------------------------------
#
# GTK modules
#
#-------------------------------------------------------------------------
import gobject
import gtk
import gtk.glade
import gnome
import gnome.ui
COLUMN_NAME = 0
COLUMN_NAME_SORT = 7
import pango
#-------------------------------------------------------------------------
#
# GRAMPS modules
#
#-------------------------------------------------------------------------
from RelLib import *
#-------------------------------------------------------------------------
#
# constants
#
#-------------------------------------------------------------------------
COLUMN_NAME = 0
COLUMN_NAME_SORT = 7
COLUMN_VIEW = 8
COLUMN_BOLD = 9
#-------------------------------------------------------------------------
#
# PeopleModel
#
#-------------------------------------------------------------------------
class PeopleModel(gtk.GenericTreeModel):
def __init__(self,db,filter=None):
gtk.GenericTreeModel.__init__(self)
self.set_property("leak_references",0)
self.db = db
self.filter = filter
self.visible = {}
self.rebuild_data()
self.connect('row-inserted',self.on_row_inserted)
self.connect('row-deleted',self.on_row_deleted)
self.fmap = [
self.column_name,
self.column_id,
@@ -53,24 +76,52 @@ class PeopleModel(gtk.GenericTreeModel):
self.sort_name,
]
maps = self.db.get_people_view_maps()
if maps[0] != None:
self.top_iter2path = maps[0]
self.top_path2iter = maps[1]
self.iter2path = maps[2]
self.path2iter = maps[3]
self.sname_sub = maps[4]
else:
self.rebuild_data()
self.connect('row-deleted',self.on_row_deleted)
def on_row_deleted(self,model,path):
surname = self.top_path2iter[path[0]]
pid = self.path2iter[(surname,path[1])]
for idval in self.sname_sub[surname]:
key = self.iter2path[idval]
del self.iter2path[idval]
del self.path2iter[key]
self.sname_sub[surname].remove(pid)
val = 0
entries = self.sname_sub[surname]
entries.sort(self.byname)
for person_id in entries:
tpl = (surname,val)
self.iter2path[person_id] = tpl
self.path2iter[tpl] = person_id
val += 1
return 0
def rebuild_data(self):
self.top_iter2path = {}
self.top_path2iter = {}
self.iter2path = {}
self.path2iter = {}
self.sname_sub = {}
self.visible = {}
if not self.db.is_open():
return
import time
t = time.time()
for person_id in self.db.get_person_keys():
person = self.db.find_person_from_id(person_id)
if self.filter and not self.filter(person):
continue
surname = unicode(person.get_primary_name().get_surname())
if self.sname_sub.has_key(surname):
@@ -93,25 +144,55 @@ class PeopleModel(gtk.GenericTreeModel):
self.path2iter[tpl] = person_id
val += 1
sval += 1
print time.time() - t
def add_person(self,person):
pid = person.get_id()
surname = person.get_primary_name().get_surname()
if self.sname_sub.has_key(surname):
self.sname_sub[surname].append(pid)
else:
self.sname_sub[surname] = [pid]
inscol = 0
sval = 0
name_list = self.db.get_surnames()
for name in name_list:
if self.sname_sub.has_key(name):
self.top_iter2path[name] = (sval,)
self.top_path2iter[sval] = name
if name == surname:
inscol = (sval,)
sval += 1
self.row_inserted(inscol,self.get_iter(inscol))
inscol = 0
val = 0
entries = self.sname_sub[surname]
entries.sort(self.byname)
for person_id in entries:
tpl = (surname,val)
self.iter2path[person_id] = tpl
self.path2iter[tpl] = person_id
if person_id == pid:
inscol = val
val += 1
col = self.top_iter2path[surname]
mypath = (col[0],inscol)
self.row_inserted(mypath,self.get_iter(mypath))
def byname(self,f,s):
n1 = self.db.person_map.get(str(f))[2].get_sort_name()
n2 = self.db.person_map.get(str(s))[2].get_sort_name()
return cmp(n1,n2)
def on_row_inserted(self,obj,path,iter):
self.rebuild_data()
def on_row_deleted(self,obj,path):
self.rebuild_data()
def on_get_flags(self):
'''returns the GtkTreeModelFlags for this particular type of model'''
return 1
return gtk.TREE_MODEL_ITERS_PERSIST
def on_get_n_columns(self):
return 8
return 9
def on_get_path(self, node):
'''returns the tree path (a tuple of indices at the various
@@ -123,20 +204,36 @@ class PeopleModel(gtk.GenericTreeModel):
return (self.top_iter2path[surname][0],index)
def on_get_column_type(self,index):
return gobject.TYPE_STRING
"""The visibility column is a boolean, the weight column is an integer,
everthing else is a string"""
if index == COLUMN_VIEW:
return gobject.TYPE_BOOLEAN
elif index == COLUMN_BOLD:
return gobject.TYPE_INT
else:
return gobject.TYPE_STRING
def on_get_iter(self, path):
try:
if len(path)==1:
if len(path)==1: # Top Level
return self.top_path2iter[path[0]]
else:
else: # Sublevel
surname = self.top_path2iter[path[0]]
return self.path2iter[(surname,path[1])]
except:
return None
def on_get_value(self,iter,col):
if self.top_iter2path.has_key(iter):
if col == COLUMN_BOLD:
if self.top_iter2path.has_key(iter):
return pango.WEIGHT_BOLD
else:
return pango.WEIGHT_NORMAL
elif col == COLUMN_VIEW:
if self.top_iter2path.has_key(iter):
return 1
return self.visible.has_key(iter)
elif self.top_iter2path.has_key(iter):
if col == 0:
return iter
elif col == COLUMN_NAME_SORT:
@@ -147,6 +244,12 @@ class PeopleModel(gtk.GenericTreeModel):
val = self.fmap[col](self.db.person_map[str(iter)])
return val
def reset_visible(self):
self.visible = {}
def set_visible(self,iter,val):
self.visible[iter] = val
def on_iter_next(self, node):
'''returns the next node at this level of the tree'''
if self.top_iter2path.has_key(node):
@@ -160,15 +263,19 @@ class PeopleModel(gtk.GenericTreeModel):
"""Return the first child of the node"""
if node == None:
return self.top_path2iter[0]
return self.path2iter.get((node,0))
else:
return self.path2iter.get((node,0))
def on_iter_has_child(self, node):
'''returns true if this node has children'''
if node == None:
return len(top_iter2path) > 0
if len(self.top_iter2path) > 0:
return gtk.TRUE
else:
return gtk.FALSE
if self.sname_sub.has_key(node) and len(self.sname_sub[node]) > 0:
return 1
return 0
return gtk.TRUE
return gtk.FALSE
def on_iter_n_children(self,node):
if node == None:
@@ -178,6 +285,8 @@ class PeopleModel(gtk.GenericTreeModel):
return 0
def on_iter_nth_child(self,node,n):
if node == None:
return self.top_path2iter.get(n)
path = self.top_iter2path.get(node)
if path:
return self.path2iter.get((node,n))
@@ -233,4 +342,4 @@ class PeopleModel(gtk.GenericTreeModel):
return self.db.find_place_from_id(place_id).get_title()
return u""
_GENDER = [ _('female'), _('male'), _('unknown') ]
_GENDER = [ _(u'female'), _(u'male'), _(u'unknown') ]