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

* various: add explict calls to garbage collection

Browse Source 
svn: r5317
This commit is contained in:
Don Allingham
2005-10-14 04:30:47 +00:00
parent d1a7272342
commit b74de932ee
21 changed files with 71 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
gramps2/ChangeLog
View File

@@ -1,3 +1,6 @@
2005-10-13 Don Allingham <don@gramps-project.org>
* various: add explict calls to garbage collection
2005-10-13 Alex Roitman <shura@gramps-project.org>
* example/gramps/data.gramps: Update example data to conform with
the format changes and the DTD.

3
gramps2/src/AddMedia.py
View File

@@ -30,6 +30,7 @@ Provides the interface to allow a person to add a media object to the database.
#
#-------------------------------------------------------------------------
import os
import gc
#-------------------------------------------------------------------------
#
@@ -172,10 +173,12 @@ class AddMediaObject:
if val == gtk.RESPONSE_OK:
self.on_savephoto_clicked()
self.window.destroy()
gc.collect()
return self.object
elif val == gtk.RESPONSE_HELP:
self.on_help_imagesel_clicked(None)
else:
self.window.destroy()
gc.collect()
return None
return None

2
gramps2/src/AddSpouse.py
View File

@@ -34,6 +34,7 @@ __version__ = "$Revision$"
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -295,6 +296,7 @@ class AddSpouse:
self.db.transaction_commit(trans,_("Add Spouse"))
Utils.destroy_passed_object(obj)
gc.collect()
m = Marriage.Marriage(self.parent, self.active_family, self.parent.db)
m.on_add_clicked()

3
gramps2/src/AddrEdit.py
View File

@@ -31,6 +31,7 @@ mechanism for the user to edit address information.
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -154,11 +155,13 @@ class AddressEditor:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():

3
gramps2/src/AttrEdit.py
View File

@@ -34,6 +34,7 @@ __version__ = "$Revision$"
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -156,11 +157,13 @@ class AttributeEditor:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():

4
gramps2/src/ChooseParents.py
View File

@@ -34,6 +34,7 @@ __version__ = "$Revision$"
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -280,11 +281,13 @@ class ChooseParents:
def on_delete_event(self,obj,b):
self.remove_itself_from_menu()
self.close_child_windows()
gc.collect()
def close(self,obj):
self.remove_itself_from_menu()
self.close_child_windows()
self.window.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():
@@ -749,6 +752,7 @@ class ModifyParents:
if self.val == gtk.RESPONSE_OK:
self.save_parents_clicked()
self.window.destroy()
gc.collect()
def build_list(self,opt_menu,sel):
store = gtk.ListStore(str)

5
gramps2/src/ColumnOrder.py
View File

@@ -25,6 +25,9 @@
#-------------------------------------------------------------------------
import gobject
import gtk.glade
import gc
import const
from gettext import gettext as _
@@ -72,9 +75,11 @@ class ColumnOrder:
self.model.get_value(node,2)))
self.callback(newlist)
self.top.destroy()
gc.collect()
def cancel_clicked(self,obj):
self.top.destroy()
gc.collect()
def toggled(self, cell, path, model):
node = model.get_iter((int(path),))

2
gramps2/src/DateEdit.py
View File

@@ -42,6 +42,7 @@ __version__ = "$Revision$"
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -275,6 +276,7 @@ class DateEditorDialog:
else:
break
self.top_window.destroy()
gc.collect()
def build_date_from_ui(self):
"""

5
gramps2/src/EditPerson.py
View File

@@ -27,6 +27,7 @@
#-------------------------------------------------------------------------
import cPickle as pickle
import os
import gc
import locale
import sets
from gettext import gettext as _
@@ -136,7 +137,7 @@ class EditPerson:
self.top = gtk.glade.XML(const.editPersonFile, "editPerson","gramps")
self.window = self.get_widget("editPerson")
self.window.set_title("%s - GRAMPS" % _('Edit Person'))
self.icon_list = self.top.get_widget("iconlist")
self.gallery = ImageSelect.Gallery(person, self.db.commit_person,
self.path, self.icon_list,
@@ -622,6 +623,7 @@ class EditPerson:
self.child_windows = {}
def close(self):
event_list = []
for col in self.event_list.get_columns():
event_list.append(self.event_trans.find_key(col.get_title()))
@@ -632,6 +634,7 @@ class EditPerson:
self.close_child_windows()
self.remove_itself_from_winsmenu()
self.window.destroy()
gc.collect()
def add_itself_to_winsmenu(self):
self.parent.child_windows[self.orig_handle] = self

3
gramps2/src/EditPlace.py
View File

@@ -26,6 +26,7 @@
#
#-------------------------------------------------------------------------
import cPickle as pickle
import gc
from gettext import gettext as _
#-------------------------------------------------------------------------
@@ -267,12 +268,14 @@ class EditPlace:
self.glry.close()
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.glry.close()
self.close_child_windows()
self.remove_itself_from_menu()
self.top.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():

3
gramps2/src/EditSource.py
View File

@@ -26,6 +26,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -218,6 +219,7 @@ class EditSource:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def on_help_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual"""
@@ -228,6 +230,7 @@ class EditSource:
self.close_child_windows()
self.remove_itself_from_menu()
self.top.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():

3
gramps2/src/EventEdit.py
View File

@@ -27,6 +27,7 @@
#-------------------------------------------------------------------------
from gettext import gettext as _
import sets
import gc
#-------------------------------------------------------------------------
#
@@ -249,12 +250,14 @@ class EventEditor:
self.gallery.close()
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.gallery.close()
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():

6
gramps2/src/ImageSelect.py
View File

@@ -26,6 +26,7 @@
#
#-------------------------------------------------------------------------
import os
import gc
import urlparse
from gettext import gettext as _
@@ -140,6 +141,7 @@ class ImageSelect:
if self.val == gtk.RESPONSE_OK:
self.on_savephoto_clicked()
self.window.destroy()
gc.collect()
def on_help_imagesel_clicked(self,obj):
"""Display the relevant portion of GRAMPS manual"""
@@ -781,11 +783,13 @@ class LocalMediaProperties:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():
@@ -1055,11 +1059,13 @@ class GlobalMediaProperties:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():

3
gramps2/src/NameEdit.py
View File

@@ -26,6 +26,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -202,11 +203,13 @@ class NameEditor:
def on_delete_event(self,*obj):
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,*obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():

4
gramps2/src/NoteEdit.py
View File

@@ -34,6 +34,8 @@ import gtk.glade
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
import const
import Utils
import Spell
@@ -96,10 +98,12 @@ class NoteEditor:
def on_delete_event(self,*obj):
self.remove_itself_from_menu()
gc.collect()
def close(self,*obj):
self.remove_itself_from_menu()
self.top.destroy()
gc.collect()
def add_itself_to_menu(self):
self.parent.child_windows[self.win_key] = self

3
gramps2/src/SelectChild.py
View File

@@ -27,6 +27,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -143,10 +144,12 @@ class SelectChild:
def on_delete_event(self,obj,b):
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.remove_itself_from_menu()
self.top.destroy()
gc.collect()
def add_itself_to_menu(self):
self.parent.child_windows[self] = self

3
gramps2/src/SelectObject.py
View File

@@ -31,6 +31,7 @@
#
#-------------------------------------------------------------------------
import os
import gc
#-------------------------------------------------------------------------
#
@@ -148,7 +149,9 @@ class SelectObject:
else:
return_value = None
self.top.destroy()
gc.collect()
return return_value
else:
self.top.destroy()
gc.collect()
return None

3
gramps2/src/SelectPerson.py
View File

@@ -26,6 +26,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -109,7 +110,9 @@ class SelectPerson:
else:
return_value = None
self.top.destroy()
gc.collect()
return return_value
else:
self.top.destroy()
gc.collect()
return None

5
gramps2/src/Sources.py
View File

@@ -26,6 +26,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -130,11 +131,13 @@ class SourceSelector:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():
@@ -439,11 +442,13 @@ class SourceEditor:
def on_delete_event(self,obj,b):
self.close_child_windows()
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.close_child_windows()
self.remove_itself_from_menu()
self.sourceDisplay.destroy()
gc.collect()
def close_child_windows(self):
for child_window in self.child_windows.values():

3
gramps2/src/UrlEdit.py
View File

@@ -26,6 +26,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -97,10 +98,12 @@ class UrlEditor:
def on_delete_event(self,*obj):
self.remove_itself_from_menu()
gc.collect()
def close(self,*obj):
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def add_itself_to_menu(self):
self.parent.child_windows[self.win_key] = self

3
gramps2/src/Witness.py
View File

@@ -26,6 +26,7 @@
#
#-------------------------------------------------------------------------
from gettext import gettext as _
import gc
#-------------------------------------------------------------------------
#
@@ -184,10 +185,12 @@ class WitnessEditor:
def on_delete_event(self,obj,b):
self.remove_itself_from_menu()
gc.collect()
def close(self,obj):
self.remove_itself_from_menu()
self.window.destroy()
gc.collect()
def add_itself_to_menu(self):
self.parent.parent.child_windows[self.win_key] = self