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

Add filter progress to export assistant

Browse Source
This commit is contained in:
Nick Hall 2017-01-26 22:12:32 +00:00
parent 4912cc08e4
commit 1e54054953
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gramps/gen/proxy/filter.py
View File

@ -42,7 +42,7 @@ class FilterProxyDb(ProxyDbBase):
""" """
def __init__(self, db, person_filter=None, event_filter=None, def __init__(self, db, person_filter=None, event_filter=None,
note_filter=None): note_filter=None, user=None):
""" """
Create a new FilterProxyDb instance. Create a new FilterProxyDb instance.
""" """
@ -50,19 +50,19 @@ class FilterProxyDb(ProxyDbBase):
self.person_filter = person_filter self.person_filter = person_filter
if person_filter: if person_filter:
self.plist = set(person_filter.apply( self.plist = set(person_filter.apply(
self.db, self.db.iter_person_handles())) self.db, self.db.iter_person_handles(), user=user))
else: else:
self.plist = set(self.db.iter_person_handles()) self.plist = set(self.db.iter_person_handles())
if event_filter: if event_filter:
self.elist = set(event_filter.apply( self.elist = set(event_filter.apply(
self.db, self.db.iter_event_handles())) self.db, self.db.iter_event_handles(), user=user))
else: else:
self.elist = set(self.db.iter_event_handles()) self.elist = set(self.db.iter_event_handles())
if note_filter: if note_filter:
self.nlist = set(note_filter.apply( self.nlist = set(note_filter.apply(
self.db, self.db.iter_note_handles())) self.db, self.db.iter_note_handles(), user=user))
else: else:
self.nlist = set(self.db.iter_note_handles()) self.nlist = set(self.db.iter_note_handles())

9
gramps/gui/plug/export/_exportoptions.py
View File

@ -40,6 +40,7 @@ from gramps.gen.config import config
from gramps.gen.display.name import displayer as name_displayer from gramps.gen.display.name import displayer as name_displayer
from gramps.gen.filters import GenericFilter, rules from gramps.gen.filters import GenericFilter, rules
from ...utils import ProgressMeter from ...utils import ProgressMeter
from ...user import User
from gramps.gen.proxy import (PrivateProxyDb, from gramps.gen.proxy import (PrivateProxyDb,
LivingProxyDb, LivingProxyDb,
FilterProxyDb, FilterProxyDb,
@ -615,8 +616,8 @@ class WriterOptionBox:
progress.reset(_("Applying selected person filter")) progress.reset(_("Applying selected person filter"))
progress.update(progress.progress_cnt) progress.update(progress.progress_cnt)
progress.progress_cnt += 1 progress.progress_cnt += 1
dbase = FilterProxyDb( dbase = FilterProxyDb(dbase, self.cfilter,
dbase, self.cfilter) user=User())
# Apply the Note Filter # Apply the Note Filter
elif proxy_name == "note": elif proxy_name == "note":
@ -625,8 +626,8 @@ class WriterOptionBox:
progress.reset(_("Applying selected note filter")) progress.reset(_("Applying selected note filter"))
progress.update(progress.progress_cnt) progress.update(progress.progress_cnt)
progress.progress_cnt += 1 progress.progress_cnt += 1
dbase = FilterProxyDb( dbase = FilterProxyDb(dbase, note_filter=self.nfilter,
dbase, note_filter=self.nfilter) user=User())
# Apply the ReferencedBySelection # Apply the ReferencedBySelection
elif proxy_name == "reference": elif proxy_name == "reference":