From 642ac41a5788f941e2f335458f68dc48deb2a3e9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sun, 7 Dec 2008 03:43:51 -0800 Subject: [PATCH] Fix #1352 (problem with configuration page) --- src/calibre/ebooks/metadata/epub.py | 2 +- src/calibre/gui2/dialogs/config.py | 1 + src/calibre/trac/donations/server.py | 18 +++++++----------- 3 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/calibre/ebooks/metadata/epub.py b/src/calibre/ebooks/metadata/epub.py index 9e384fdf98..a7114c48d8 100644 --- a/src/calibre/ebooks/metadata/epub.py +++ b/src/calibre/ebooks/metadata/epub.py @@ -113,7 +113,7 @@ class CoverRenderer(QObject): pal = self.page.palette() pal.setBrush(QPalette.Background, Qt.white) self.page.setPalette(pal) - self.page.setViewportSize(QSize(self.WIDTH, self.HEIGHT)) + self.page.setViewportSize(QSize(600, 800)) self.page.mainFrame().setScrollBarPolicy(Qt.Vertical, Qt.ScrollBarAlwaysOff) self.page.mainFrame().setScrollBarPolicy(Qt.Horizontal, Qt.ScrollBarAlwaysOff) QObject.connect(self.page, SIGNAL('loadFinished(bool)'), self.render_html) diff --git a/src/calibre/gui2/dialogs/config.py b/src/calibre/gui2/dialogs/config.py index 91a8a1d2f8..4db64e465a 100644 --- a/src/calibre/gui2/dialogs/config.py +++ b/src/calibre/gui2/dialogs/config.py @@ -44,6 +44,7 @@ class ConfigDialog(QDialog, Ui_Dialog): self._category_model = CategoryModel() self.connect(self.category_view, SIGNAL('activated(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row())) + self.connect(self.category_view, SIGNAL('clicked(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row())) self.category_view.setModel(self._category_model) self.db = db self.server = server diff --git a/src/calibre/trac/donations/server.py b/src/calibre/trac/donations/server.py index ce44dc0438..a251206df7 100644 --- a/src/calibre/trac/donations/server.py +++ b/src/calibre/trac/donations/server.py @@ -105,7 +105,7 @@ class Stats: mean = sum(amounts)/l return sqrt( sum([i**2 for i in amounts])/l - mean**2 ) - def __init__(self, records): + def __init__(self, records, start, end): self.total = sum([r.amount for r in records]) self.days = {} l, rg = date.max, date.min @@ -117,15 +117,15 @@ class Stats: self.days[r.date] = [] self.days[r.date].append(r) - self.min, self.max = l, rg - self.period = self.max - self.min + self.min, self.max = start, end + self.period = (self.max - self.min) + timedelta(days=1) daily_totals = [] day = self.min while day <= self.max: x = self.days.get(day, []) daily_totals.append(sum([y.amount for y in x])) day += timedelta(days=1) - self.daily_average = self.total/len(daily_totals) if len(daily_totals) else 0. + self.daily_average = self.total/self.period.days self.daily_deviation = self.get_deviation(daily_totals) self.average = self.total/len(records) if len(records) else 0. self.average_deviation = self.get_deviation(self.totals) @@ -237,12 +237,8 @@ class Server(object): self.calculate_trend() def get_slice(self, start_date, end_date): - stats = Stats([r for r in self.records if r.date >= start_date and r.date <= end_date]) - if start_date > date.min and end_date < date.max: - stats.period = end_date - start_date - stats.period += timedelta(days=1) - stats.min = start_date - stats.max = end_date + stats = Stats([r for r in self.records if r.date >= start_date and r.date <= end_date], + start_date, end_date) return stats def month(self, year, month): @@ -496,4 +492,4 @@ def main(args=sys.argv): return 0 if __name__ == '__main__': - sys.exit(main()) \ No newline at end of file + sys.exit(main())