Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* src/DataViews/_PersonView.py: removal of inversion

Browse Source 
* src/GenericFilter.py: Interface changes for filtering


svn: r6355
This commit is contained in:
Don Allingham 2006-04-18 22:12:19 +00:00
parent 6b54577315
commit 0bfac09cef
3 changed files with 16 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,4 +1,6 @@
2006-04-18 Don Allingham <don@gramps-project.org> 2006-04-18 Don Allingham <don@gramps-project.org>
* src/DataViews/_PersonView.py: removal of inversion
* src/GenericFilter.py: Interface changes for filtering
* src/Editors/__init__.py: added EditChildRef * src/Editors/__init__.py: added EditChildRef
* src/Editors/Makefile.am: added EditChildRef * src/Editors/Makefile.am: added EditChildRef
* src/Editors/_EditChildRef.py: added * src/Editors/_EditChildRef.py: added

2
src/DataViews/_PersonView.py
View File

@ -355,7 +355,7 @@ class PersonView(PageView.PersonNavView):
if self.active: if self.active:
self.model = PeopleModel.PeopleModel( self.model = PeopleModel.PeopleModel(
self.dbstate.db, self.generic_filter_widget.get_filter(), self.dbstate.db, self.generic_filter_widget.get_filter(),
self.generic_filter_widget.inverted()) False)
self.tree.set_model(self.model) self.tree.set_model(self.model)
if const.use_tips and self.model.tooltip_column != None: if const.use_tips and self.model.tooltip_column != None:

52
src/GenericFilter.py
View File

@ -1905,14 +1905,12 @@ class GenericFilter:
self.name = source.name self.name = source.name
self.comment = source.comment self.comment = source.comment
self.logical_op = source.logical_op self.logical_op = source.logical_op
self.invert = source.invert
else: else:
self.need_param = 0 self.need_param = 0
self.flist = [] self.flist = []
self.name = '' self.name = ''
self.comment = '' self.comment = ''
self.logical_op = 'and' self.logical_op = 'and'
self.invert = False
def match(self,handle): def match(self,handle):
return True return True
@ -1929,12 +1927,6 @@ class GenericFilter:
def get_logical_op(self): def get_logical_op(self):
return self.logical_op return self.logical_op
def set_invert(self, val):
self.invert = not not val
def get_invert(self):
return self.invert
def get_name(self): def get_name(self):
return self.name return self.name
@ -1968,13 +1960,13 @@ class GenericFilter:
while data: while data:
person = RelLib.Person() person = RelLib.Person()
person.unserialize(data[1]) person.unserialize(data[1])
if self.invert ^ task(db,person): if not task(db,person):
final_list.append(data[0]) final_list.append(data[0])
data = cursor.next() data = cursor.next()
else: else:
for handle in id_list: for handle in id_list:
person = db.get_person_from_handle(handle) person = db.get_person_from_handle(handle)
if self.invert ^ task(db,person): if not task(db,person):
final_list.append(handle) final_list.append(handle)
return final_list return final_list
@ -1984,7 +1976,6 @@ class GenericFilter:
def check_and(self,db,id_list): def check_and(self,db,id_list):
final_list = [] final_list = []
flist = self.flist flist = self.flist
invert = self.invert
if id_list == None: if id_list == None:
cursor = db.get_person_cursor() cursor = db.get_person_cursor()
data = cursor.next() data = cursor.next()
@ -1996,7 +1987,7 @@ class GenericFilter:
if not rule.apply(db,person): if not rule.apply(db,person):
val = False val = False
break break
if invert ^ val: if not val:
final_list.append(data[0]) final_list.append(data[0])
data = cursor.next() data = cursor.next()
else: else:
@ -2006,7 +1997,7 @@ class GenericFilter:
for rule in flist: for rule in flist:
if not rule.apply(db,person): if not rule.apply(db,person):
val = False val = False
if invert ^ val: if not val:
final_list.append(handle) final_list.append(handle)
return final_list return final_list
@ -2339,8 +2330,6 @@ class GenericFilterList:
print namespace print namespace
for i in namespace: for i in namespace:
f.write(' <filter name="%s"' % self.fix(i.get_name())) f.write(' <filter name="%s"' % self.fix(i.get_name()))
if i.get_invert():
f.write(' invert="1"')
f.write(' function="%s"' % i.get_logical_op()) f.write(' function="%s"' % i.get_logical_op())
comment = i.get_comment() comment = i.get_comment()
if comment: if comment:
@ -2399,11 +2388,6 @@ class FilterParser(handler.ContentHandler):
self.f.set_logical_op(op) self.f.set_logical_op(op)
if attrs.has_key('comment'): if attrs.has_key('comment'):
self.f.set_comment(attrs['comment']) self.f.set_comment(attrs['comment'])
if attrs.has_key('invert'):
try:
self.f.set_invert(int(attrs['invert']))
except ValueError:
pass
self.gfilter_list.add(self.namespace,self.f) self.gfilter_list.add(self.namespace,self.f)
elif tag == "rule": elif tag == "rule":
save_name = attrs['class'] save_name = attrs['class']
@ -2598,18 +2582,14 @@ class FilterWidget:
self.filterbar = gtk.HBox() self.filterbar = gtk.HBox()
self.filterbar.set_spacing(4) self.filterbar.set_spacing(4)
self.filter_text = gtk.Entry() self.filter_text = gtk.Entry()
self.filter_label = gtk.Label('Label:')
self.filter_list = gtk.ComboBox() self.filter_list = gtk.ComboBox()
self.filter_invert = gtk.CheckButton('Invert') self.filter_button = gtk.Button(stock=gtk.STOCK_FIND)
self.filter_button = gtk.Button('Apply')
self.filter_button.connect( 'clicked',self.apply_filter_clicked) self.filter_button.connect( 'clicked',self.apply_filter_clicked)
self.filterbar.pack_start(self.filter_list,False) self.filterbar.pack_start(self.filter_list,False)
self.filterbar.pack_start(self.filter_label,False)
self.filterbar.pack_start(self.filter_text,True) self.filterbar.pack_start(self.filter_text,True)
self.filterbar.pack_start(self.filter_invert,False)
self.filterbar.pack_end(self.filter_button,False) self.filterbar.pack_end(self.filter_button,False)
self.filter_text.set_sensitive(False) # self.filter_text.set_sensitive(False)
return self.filterbar return self.filterbar
@ -2633,7 +2613,7 @@ class FilterWidget:
self.filter_list.set_model(self.filter_model) self.filter_list.set_model(self.filter_model)
self.filter_list.set_active(self.filter_model.default_index()) self.filter_list.set_active(self.filter_model.default_index())
self.filter_list.connect('changed',self.on_filter_name_changed) self.filter_list.connect('changed',self.on_filter_name_changed)
self.filter_text.set_sensitive(False) # self.filter_text.set_sensitive(False)
self.DataFilter = filter_list[self.filter_model.default_index()] self.DataFilter = filter_list[self.filter_model.default_index()]
def apply_filter_clicked(self,ev=None): def apply_filter_clicked(self,ev=None):
@ -2652,15 +2632,12 @@ class FilterWidget:
index = self.filter_list.get_active() index = self.filter_list.get_active()
mime_filter = self.filter_model.get_filter(index) mime_filter = self.filter_model.get_filter(index)
qual = mime_filter.need_param qual = mime_filter.need_param
if qual: # if qual:
self.filter_text.show() # self.filter_text.show()
self.filter_text.set_sensitive(True) # self.filter_text.set_sensitive(True)
self.filter_label.show() # else:
self.filter_label.set_text(mime_filter.get_rules()[0].labels[0]) # self.filter_text.hide()
else: # self.filter_text.set_sensitive(False)
self.filter_text.hide()
self.filter_text.set_sensitive(False)
self.filter_label.hide()
def apply_filter(self,current_model=None): def apply_filter(self,current_model=None):
self.uistate.status_text(_('Updating display...')) self.uistate.status_text(_('Updating display...'))
@ -2672,9 +2649,6 @@ class FilterWidget:
#print self.DataFilter.flist[0] #print self.DataFilter.flist[0]
return self.DataFilter return self.DataFilter
def inverted( self):
return self.filter_invert.get_active()
def show( self): def show( self):
self.filterbar.show() self.filterbar.show()