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

* src/GrampsDBCallback.py: rewrite of new callback scheme using python signals

Browse Source 
* src/GrampsDbBase.py: handle signals instead of callback functions
* src/GrampsInMemDB.py: handle signals instead of callback functions
* src/Makefile.am: Add GrampsDBCallback.py
* src/PeopleView.py: handle signals instead of callback functions
* src/PlaceView.py: handle signals instead of callback functions
* src/SourceView.py: handle signals instead of callback functions


svn: r4277
This commit is contained in:
Don Allingham 2005-04-01 20:04:12 +00:00
parent 719727da75
commit c2b556d9f4
9 changed files with 93 additions and 214 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,3 +1,13 @@
2005-04-01 Richard Taylor <rjt-gramps@thegrindstone.me.uk>
* src/GrampsDBCallback.py: rewrite of new callback scheme using python signals
* src/GrampsBSDDB.py: handle signals instead of callback functions
* src/GrampsDbBase.py: handle signals instead of callback functions
* src/GrampsInMemDB.py: handle signals instead of callback functions
* src/Makefile.am: Add GrampsDBCallback.py
* src/PeopleView.py: handle signals instead of callback functions
* src/PlaceView.py: handle signals instead of callback functions
* src/SourceView.py: handle signals instead of callback functions
2005-04-01 Don Allingham <don@gramps-project.org> 2005-04-01 Don Allingham <don@gramps-project.org>
* src/gramps.glade: disable scrollbars in Pedigree View * src/gramps.glade: disable scrollbars in Pedigree View
* src/PedView.py: Apply Martin Hawlisch's canvas resize patch * src/PedView.py: Apply Martin Hawlisch's canvas resize patch

14
src/FamilyView.py
View File

@ -98,13 +98,15 @@ class FamilyView:
self.change_db() self.change_db()
def change_db(self): def change_db(self):
self.parent.db.add_family_callbacks( self.parent.db.connect('family-add', self.update_callback)
'family_view', self.update_callback, self.update_callback, self.parent.db.connect('family-update', self.update_callback)
self.update_callback, self.load_family) self.parent.db.connect('family-delete', self.update_callback)
self.parent.db.connect('family-rebuild', self.load_family)
self.parent.db.add_person_callbacks( self.parent.db.connect('person-add', self.update_callback)
'family_view', self.update_callback, self.update_callback, self.parent.db.connect('person-update', self.update_callback)
self.update_callback, self.load_family) self.parent.db.connect('person-delete', self.update_callback)
self.parent.db.connect('person-rebuild', self.load_family)
def update_callback(self,handle): def update_callback(self,handle):
self.load_family() self.load_family()

8
src/GrampsBSDDB.py
View File

@ -278,7 +278,7 @@ class GrampsBSDDB(GrampsDbBase):
if transaction != None: if transaction != None:
transaction.add(PERSON_KEY,handle,person.serialize()) transaction.add(PERSON_KEY,handle,person.serialize())
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_person_delete_callbacks([str(handle)]) self.emit('person-delete',([str(handle)],))
self.person_map.delete(str(handle)) self.person_map.delete(str(handle))
def remove_source(self,handle,transaction): def remove_source(self,handle,transaction):
@ -287,7 +287,7 @@ class GrampsBSDDB(GrampsDbBase):
old_data = self.source_map.get(str(handle)) old_data = self.source_map.get(str(handle))
transaction.add(SOURCE_KEY,handle,old_data) transaction.add(SOURCE_KEY,handle,old_data)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_source_delete_callbacks([handle]) self.emit('source-delete',([handle],))
self.source_map.delete(str(handle)) self.source_map.delete(str(handle))
def remove_family(self,handle,transaction): def remove_family(self,handle,transaction):
@ -296,7 +296,7 @@ class GrampsBSDDB(GrampsDbBase):
old_data = self.family_map.get(str(handle)) old_data = self.family_map.get(str(handle))
transaction.add(FAMILY_KEY,handle,old_data) transaction.add(FAMILY_KEY,handle,old_data)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_family_delete_callbacks([str(handle)]) self.emit('family-delete',([str(handle)],))
self.family_map.delete(str(handle)) self.family_map.delete(str(handle))
def remove_event(self,handle,transaction): def remove_event(self,handle,transaction):
@ -312,7 +312,7 @@ class GrampsBSDDB(GrampsDbBase):
old_data = self.place_map.get(handle) old_data = self.place_map.get(handle)
transaction.add(PLACE_KEY,handle,old_data) transaction.add(PLACE_KEY,handle,old_data)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_person_delete_callbacks([handle]) self.emit('place-delete',([handle],))
self.place_map.delete(str(handle)) self.place_map.delete(str(handle))
def remove_object(self,handle,transaction): def remove_object(self,handle,transaction):

235
src/GrampsDbBase.py
View File

@ -44,6 +44,7 @@ from gettext import gettext as _
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
from RelLib import * from RelLib import *
import GrampsKeys import GrampsKeys
import GrampsDBCallback
#------------------------------------------------------------------------- #-------------------------------------------------------------------------
# #
@ -104,12 +105,31 @@ class GrampsCursor:
""" """
pass pass
class GrampsDbBase: class GrampsDbBase(GrampsDBCallback.GrampsDBCallback):
""" """
GRAMPS database object. This object is a base class for all GRAMPS database object. This object is a base class for all
database interfaces. database interfaces.
""" """
__signals__ = {
'person-add' : (list,),
'person-update' : (list,),
'person-delete' : (list,),
'person-rebuild' : None,
'family-add' : (list,),
'family-update' : (list,),
'family-delete' : (list,),
'family-rebuild' : None,
'source-add' : (list,),
'source-update' : (list,),
'source-delete' : (list,),
'source-rebuild' : None,
'place-add' : (list,),
'place-update' : (list,),
'place-delete' : (list,),
'place-rebuild' : None
}
def __init__(self): def __init__(self):
""" """
Creates a new GrampsDbBase instance. A new GrampDbBase class should Creates a new GrampsDbBase instance. A new GrampDbBase class should
@ -117,6 +137,8 @@ class GrampsDbBase:
be created. be created.
""" """
GrampsDBCallback.GrampsDBCallback.__init__(self)
self.readonly = False self.readonly = False
self.rand = random.Random(time.time()) self.rand = random.Random(time.time())
self.smap_index = 0 self.smap_index = 0
@ -165,169 +187,6 @@ class GrampsDbBase:
self.place2title = {} self.place2title = {}
self.name_groups = {} self.name_groups = {}
self.person_add_callback = {}
self.person_update_callback = {}
self.person_delete_callback = {}
self.person_rebuild_callback = {}
self.family_add_callback = {}
self.family_update_callback = {}
self.family_delete_callback = {}
self.family_rebuild_callback = {}
self.place_add_callback = {}
self.place_update_callback = {}
self.place_delete_callback = {}
self.place_rebuild_callback = {}
self.source_add_callback = {}
self.source_update_callback = {}
self.source_delete_callback = {}
self.source_rebuild_callback = {}
def add_person_callbacks(self, key, add, update, delete, rebuild):
if add:
self.person_add_callback[key] = add
if update:
self.person_update_callback[key] = update
if delete:
self.person_delete_callback[key] = delete
if rebuild:
self.person_rebuild_callback[key] = rebuild
def add_place_callbacks(self, key, add, update, delete, rebuild):
if add:
self.place_add_callback[key] = add
if update:
self.place_update_callback[key] = update
if delete:
self.place_delete_callback[key] = delete
if rebuild:
self.place_rebuild_callback[key] = rebuild
def add_source_callbacks(self, key, add, update, delete, rebuild):
if add:
self.source_add_callback[key] = add
if update:
self.source_update_callback[key] = update
if delete:
self.source_delete_callback[key] = delete
if rebuild:
self.source_rebuild_callback[key] = rebuild
def add_family_callbacks(self, key, add, update, delete, rebuild):
if add:
self.family_add_callback[key] = add
if update:
self.family_update_callback[key] = update
if delete:
self.family_delete_callback[key] = delete
if rebuild:
self.family_rebuild_callback[key] = rebuild
def remove_person_callbacks(self, key):
if self.person_add_callback.has_key(key):
del self.person_add_callback[key]
if self.person_update_callback.has_key(key):
del self.person_update_callback[key]
if self.person_delete_callback.has_key(key):
del self.person_delete_callback[key]
if self.person_rebuild_callback.has_key(key):
del self.person_rebuild_callback[key]
def remove_place_callbacks(self, key):
if self.place_add_callback.has_key(key):
del self.place_add_callback[key]
if self.place_update_callback.has_key(key):
del self.place_update_callback[key]
if self.place_delete_callback.has_key(key):
del self.place_delete_callback[key]
if self.place_rebuild_callback.has_key(key):
del self.place_rebuild_callback[key]
def remove_family_callbacks(self, key):
if self.family_add_callback.has_key(key):
del self.family_add_callback[key]
if self.family_update_callback.has_key(key):
del self.family_update_callback[key]
if self.family_delete_callback.has_key(key):
del self.family_delete_callback[key]
if self.family_rebuild_callback.has_key(key):
del self.family_rebuild_callback[key]
def remove_source_callbacks(self, key):
if self.source_add_callback.has_key(key):
del self.source_add_callback[key]
if self.source_update_callback.has_key(key):
del self.source_update_callback[key]
if self.source_delete_callback.has_key(key):
del self.source_delete_callback[key]
if self.source_rebuild_callback.has_key(key):
del self.source_rebuild_callback[key]
def run_person_add_callbacks(self,handle_list):
for func in self.person_add_callback.values():
func(handle_list)
def run_person_update_callbacks(self,handle_list):
for func in self.person_update_callback.values():
func(handle_list)
def run_person_delete_callbacks(self,handle_list):
for func in self.person_delete_callback.values():
func(handle_list)
def run_person_rebuild_callbacks(self):
for func in self.person_rebuild_callback.values():
func()
def run_family_add_callbacks(self,handle_list):
for func in self.family_add_callback.values():
func(handle_list)
def run_family_update_callbacks(self,handle_list):
for func in self.family_update_callback.values():
func(handle_list)
def run_family_delete_callbacks(self,handle_list):
for func in self.family_delete_callback.values():
func(handle_list)
def run_family_rebuild_callbacks(self):
for func in self.family_rebuild_callback.values():
func()
def run_source_add_callbacks(self,handle_list):
for func in self.source_add_callback.values():
func(handle_list)
def run_source_update_callbacks(self,handle_list):
for func in self.source_update_callback.values():
func(handle_list)
def run_source_delete_callbacks(self,handle_list):
for func in self.source_delete_callback.values():
func(handle_list)
def run_source_rebuild_callbacks(self):
for func in self.source_rebuild_callback.values():
func()
def run_place_add_callbacks(self,handle_list):
for func in self.place_add_callback.values():
func(handle_list)
def run_place_update_callbacks(self,handle_list):
for func in self.place_update_callback.values():
func(handle_list)
def run_place_delete_callbacks(self,handle_list):
for func in self.place_delete_callback.values():
func(handle_list)
def run_place_rebuild_callbacks(self):
for func in self.place_rebuild_callback.values():
func()
def need_upgrade(self): def need_upgrade(self):
return False return False
@ -406,9 +265,9 @@ class GrampsDbBase:
self.person_map[handle] = person.serialize() self.person_map[handle] = person.serialize()
if transaction and not transaction.batch: if transaction and not transaction.batch:
if old_data: if old_data:
self.run_person_update_callbacks([handle]) self.emit('person-update',([handle],))
else: else:
self.run_person_add_callbacks([handle]) self.emit('person-add',([handle],))
def commit_media_object(self,obj,transaction,change_time=None): def commit_media_object(self,obj,transaction,change_time=None):
""" """
@ -445,9 +304,9 @@ class GrampsDbBase:
self.source_map[handle] = source.serialize() self.source_map[handle] = source.serialize()
if transaction and not transaction.batch: if transaction and not transaction.batch:
if old_data: if old_data:
self.run_source_update_callbacks([handle]) self.emit('source-update',([handle],))
else: else:
self.run_source_add_callbacks([handle]) self.emit('source-add',([handle],))
def commit_place(self,place,transaction,change_time=None): def commit_place(self,place,transaction,change_time=None):
""" """
@ -467,9 +326,9 @@ class GrampsDbBase:
self.place_map[handle] = place.serialize() self.place_map[handle] = place.serialize()
if transaction and not transaction.batch: if transaction and not transaction.batch:
if old_data: if old_data:
self.run_place_update_callbacks([handle]) self.emit('place-update',([handle],))
else: else:
self.run_place_add_callbacks([handle]) self.emit('place-add',([handle],))
def commit_event(self,event,transaction,change_time=None): def commit_event(self,event,transaction,change_time=None):
""" """
@ -507,9 +366,9 @@ class GrampsDbBase:
if transaction and not transaction.batch: if transaction and not transaction.batch:
if old_data: if old_data:
self.run_family_update_callbacks([handle]) self.emit('family-update',([handle],))
else: else:
self.run_family_add_callbacks([handle]) self.emit('family-add',([handle],))
def find_next_person_gramps_id(self): def find_next_person_gramps_id(self):
""" """
@ -660,7 +519,7 @@ class GrampsDbBase:
transaction.add(PERSON_KEY, val, None) transaction.add(PERSON_KEY, val, None)
self.person_map[str(val)] = person.serialize() self.person_map[str(val)] = person.serialize()
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_person_add_callbacks([str(val)]) self.emit('person-add', ([str(val)],))
self.genderStats.count_person (person, self) self.genderStats.count_person (person, self)
return person return person
@ -795,7 +654,7 @@ class GrampsDbBase:
family.set_handle(self.create_id()) family.set_handle(self.create_id())
self.commit_family(family,transaction) self.commit_family(family,transaction)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_family_add_callbacks(str(family.handle)) self.emit('family-add',([str(family.handle),]))
return family.get_handle() return family.get_handle()
def add_source(self,source,transaction): def add_source(self,source,transaction):
@ -809,7 +668,7 @@ class GrampsDbBase:
source.set_gramps_id(self.find_next_source_gramps_id()) source.set_gramps_id(self.find_next_source_gramps_id())
self.commit_source(source,transaction) self.commit_source(source,transaction)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_source_add_callbacks([source.handle]) self.emit('source-add',([source.handle],))
return source.get_handle() return source.get_handle()
def add_event(self,event,transaction): def add_event(self,event,transaction):
@ -836,7 +695,7 @@ class GrampsDbBase:
place.set_gramps_id(self.find_next_place_gramps_id()) place.set_gramps_id(self.find_next_place_gramps_id())
self.commit_place(place,transaction) self.commit_place(place,transaction)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_place_add_callbacks([source.handle]) self.emit('place-add',([place.handle],))
return place.get_handle() return place.get_handle()
def add_object(self,obj,transaction): def add_object(self,obj,transaction):
@ -1096,10 +955,10 @@ class GrampsDbBase:
self.undo_callback(_("_Undo %s") % transaction.get_description()) self.undo_callback(_("_Undo %s") % transaction.get_description())
if transaction and transaction.batch: if transaction and transaction.batch:
self.run_person_rebuild_callbacks() self.emit('person-rebuild')
self.run_family_rebuild_callbacks() self.emit('family-rebuild')
self.run_place_rebuild_callbacks() self.emit('place-rebuild')
self.run_source_rebuild_callbacks() self.emit('source-rebuild')
def undo(self): def undo(self):
""" """
@ -1117,25 +976,25 @@ class GrampsDbBase:
(key, handle, data) = transaction.get_record(record_id) (key, handle, data) = transaction.get_record(record_id)
if key == PERSON_KEY: if key == PERSON_KEY:
if data == None: if data == None:
self.run_person_delete_callbacks([str(handle)]) self.emit('person-delete',([str(handle),]))
del self.person_map[str(handle)] del self.person_map[str(handle)]
else: else:
self.person_map[str(handle)] = data self.person_map[str(handle)] = data
self.run_person_update_callbacks([str(handle)]) self.emit('person-update',([str(handle),]))
elif key == FAMILY_KEY: elif key == FAMILY_KEY:
if data == None: if data == None:
self.run_family_delete_callbacks([str(handle)]) self.emit('family-delete',([str(handle),]))
del self.family_map[str(handle)] del self.family_map[str(handle)]
else: else:
self.family_map[str(handle)] = data self.family_map[str(handle)] = data
self.run_family_update_callbacks([str(handle)]) self.emit('family-update',([str(handle),]))
elif key == SOURCE_KEY: elif key == SOURCE_KEY:
if data == None: if data == None:
self.run_source_delete_callbacks([str(handle)]) self.emit('source-delete',([str(handle),]))
del self.source_map[str(handle)] del self.source_map[str(handle)]
else: else:
self.source_map[str(handle)] = data self.source_map[str(handle)] = data
self.run_source_update_callbacks([str(handle)]) self.emit('source-update',([str(handle),]))
elif key == EVENT_KEY: elif key == EVENT_KEY:
if data == None: if data == None:
del self.event_map[str(handle)] del self.event_map[str(handle)]
@ -1143,11 +1002,11 @@ class GrampsDbBase:
self.event_map[str(handle)] = data self.event_map[str(handle)] = data
elif key == PLACE_KEY: elif key == PLACE_KEY:
if data == None: if data == None:
self.run_place_delete_callbacks([str(handle)]) self.emit('place-delete',([str(handle),]))
del self.place_map[str(handle)] del self.place_map[str(handle)]
else: else:
self.place_map[str(handle)] = data self.place_map[str(handle)] = data
self.run_place_update_callbacks([str(handle)]) self.emit('place-update',([str(handle),]))
elif key == MEDIA_KEY: elif key == MEDIA_KEY:
if data == None: if data == None:
del self.media_map[str(handle)] del self.media_map[str(handle)]

8
src/GrampsInMemDB.py
View File

@ -143,7 +143,7 @@ class GrampsInMemDB(GrampsDbBase):
old_data = self.person_map.get(handle) old_data = self.person_map.get(handle)
transaction.add(PERSON_KEY,handle,old_data) transaction.add(PERSON_KEY,handle,old_data)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_person_delete_callbacks([handle]) self.emit('person-delete',([handle],))
del self.id_trans[person.get_gramps_id()] del self.id_trans[person.get_gramps_id()]
del self.person_map[handle] del self.person_map[handle]
@ -155,7 +155,7 @@ class GrampsInMemDB(GrampsDbBase):
old_data = self.source_map.get(str(handle)) old_data = self.source_map.get(str(handle))
transaction.add(SOURCE_KEY,handle,old_data) transaction.add(SOURCE_KEY,handle,old_data)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_source_delete_callbacks([handle]) self.emit('source-delete',([handle],))
del self.sid_trans[source.get_gramps_id()] del self.sid_trans[source.get_gramps_id()]
del self.source_map[str(handle)] del self.source_map[str(handle)]
@ -167,7 +167,7 @@ class GrampsInMemDB(GrampsDbBase):
old_data = self.place_map.get(str(handle)) old_data = self.place_map.get(str(handle))
transaction.add(PLACE_KEY,handle,old_data) transaction.add(PLACE_KEY,handle,old_data)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_person_delete_callbacks([handle]) self.emit('person-delete',([handle],))
del self.pid_trans[place.get_gramps_id()] del self.pid_trans[place.get_gramps_id()]
del self.place_map[str(handle)] del self.place_map[str(handle)]
@ -189,7 +189,7 @@ class GrampsInMemDB(GrampsDbBase):
old_data = self.family_map.get(str(handle)) old_data = self.family_map.get(str(handle))
transaction.add(FAMILY_KEY,handle,old_data) transaction.add(FAMILY_KEY,handle,old_data)
if transaction and not transaction.batch: if transaction and not transaction.batch:
self.run_family_delete_callbacks([str(handle)]) self.emit('family-delete',([str(handle),]))
del self.fid_trans[family.get_gramps_id()] del self.fid_trans[family.get_gramps_id()]
del self.family_map[str(handle)] del self.family_map[str(handle)]

1
src/Makefile.am
View File

@ -55,6 +55,7 @@ gdir_PYTHON = \
GrampsCfg.py\ GrampsCfg.py\
GrampsBSDDB.py\ GrampsBSDDB.py\
GrampsDbBase.py\ GrampsDbBase.py\
GrampsDBCallback.py\
GrampsInMemDB.py\ GrampsInMemDB.py\
GrampsXMLDB.py\ GrampsXMLDB.py\
GrampsGEDDB.py\ GrampsGEDDB.py\

16
src/PeopleView.py
View File

@ -88,9 +88,10 @@ class PeopleView:
self.person_tree.connect('button-press-event', self.person_tree.connect('button-press-event',
self.on_plist_button_press) self.on_plist_button_press)
self.parent.db.add_person_callbacks( self.parent.db.connect('person-add', self.person_added)
'person_view', self.person_added, self.person_updated, self.parent.db.connect('person-update', self.person_updated)
self.person_removed, self.redisplay_person_list) self.parent.db.connect('person-delete', self.person_removed)
self.parent.db.connect('person-rebuild', self.redisplay_person_list)
def sort_clicked(self,obj): def sort_clicked(self,obj):
for col in self.columns: for col in self.columns:
@ -164,9 +165,12 @@ class PeopleView:
self.build_columns() self.build_columns()
self.person_model = PeopleModel.PeopleModel(db,self.DataFilter) self.person_model = PeopleModel.PeopleModel(db,self.DataFilter)
self.person_tree.set_model(self.person_model) self.person_tree.set_model(self.person_model)
self.parent.db.add_person_callbacks(
'person_view', self.person_added, self.person_updated, self.parent.db.connect('person-add', self.person_added)
self.person_removed, self.redisplay_person_list) self.parent.db.connect('person-update', self.person_updated)
self.parent.db.connect('person-delete', self.person_removed)
self.parent.db.connect('person-rebuild', self.redisplay_person_list)
def remove_from_person_list(self,person): def remove_from_person_list(self,person):
"""Remove the selected person from the list. A person object is """Remove the selected person from the list. A person object is

8
src/PlaceView.py
View File

@ -120,9 +120,11 @@ class PlaceView:
self.model.delete_row_by_handle(handle) self.model.delete_row_by_handle(handle)
def change_db(self,db): def change_db(self,db):
db.add_place_callbacks( db.connect('place-add', self.place_add)
'place_view', self.place_add, self.place_update, db.connect('place-update', self.place_update)
self.place_delete, self.build_tree) db.connect('place-delete', self.place_delete)
db.connect('place-rebuild',self.build_tree)
self.build_columns() self.build_columns()
self.build_tree() self.build_tree()

7
src/SourceView.py
View File

@ -106,9 +106,10 @@ class SourceView:
self.click_col = column self.click_col = column
def change_db(self,db): def change_db(self,db):
db.add_source_callbacks( db.connect('source-add', self.source_add)
'source_view', self.source_add, self.source_update, db.connect('source-update', self.source_update)
self.source_delete, self.build_tree) db.connect('source-delete', self.source_delete)
db.connect('source-rebuild',self.build_tree)
self.build_columns() self.build_columns()
self.build_tree() self.build_tree()