From f6271eb12732510b4a8816eac4c3ab8695eab7bd Mon Sep 17 00:00:00 2001 From: "Rob G. Healey" Date: Sun, 1 Jan 2012 05:41:13 +0000 Subject: [PATCH] Adjusted the placement of the progress bar in event_pages() in an attemp to speed up the display of the progress bar. svn: r18677 --- src/plugins/webreport/NarrativeWeb.py | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/plugins/webreport/NarrativeWeb.py b/src/plugins/webreport/NarrativeWeb.py index b194723d2..2dc57d4cf 100644 --- a/src/plugins/webreport/NarrativeWeb.py +++ b/src/plugins/webreport/NarrativeWeb.py @@ -6962,19 +6962,29 @@ class NavWebReport(Report): """ self.dbase_ = self.database - # set up progress bar for event pages; using ind list - event_handle_list, event_types = build_event_data(self.dbase_, self.dbase_.iter_event_handles()) + # set up progress bar for event pages; using database event handles... self.user.begin_progress(_("Narrated Web Site Report"), _("Creating event pages"), len(self.dbase_.get_event_handles())) - # send all data to the events list page + # begin progress bar incremental step so as there is not so much wait time... + self.user.step_progress() + + # get event types and the handles that go with that type... + event_handle_list, event_types = build_event_data(self.dbase_, self.dbase_.iter_event_handles()) + + # send all data to class EventListPage EventListPage(self, self.title, event_types, event_handle_list, ind_list) for event_handle in event_handle_list: - # create individual event pages + + # send data to class EventPage EventPage(self, self.title, event_handle, ind_list) + + # increment progress bar self.user.step_progress() + + # terminate this progress bar instance... self.user.end_progress() def source_pages(self, source_list, ppl_handle_list):