From 8cec21191f699a2f67e22eef8c4e67d415987bdf Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Fri, 19 Sep 2014 23:16:34 +0200 Subject: [PATCH] Pass Document to GlyphDBEdit. --- pixelocr/gui/glyphdbedit.py | 10 ++++++---- pixelocr/gui/window.py | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pixelocr/gui/glyphdbedit.py b/pixelocr/gui/glyphdbedit.py index bacf69e..44ccf39 100644 --- a/pixelocr/gui/glyphdbedit.py +++ b/pixelocr/gui/glyphdbedit.py @@ -112,9 +112,10 @@ class GlyphDBModel(QAbstractTableModel): DateColumn('Date added', 'date_added'), ] - def __init__(self, glyphdb, parent=None): + def __init__(self, document, parent=None): super().__init__(parent) - self.glyphdb = glyphdb + self.document = document + self.glyphdb = document.glyphdb self.sortColumn = len(self.COLUMNS) - 1 # date_add ed self.sortOrder = Qt.DescendingOrder self.values = list(self.glyphdb.values()) @@ -188,9 +189,10 @@ class GlyphTableView(QTableView): class GlyphDBEdit(GlyphTableView): - def __init__(self, glyphdb, *args, **kwargs): + def __init__(self, document, *args, **kwargs): super().__init__(*args, **kwargs) - model = GlyphDBModel(glyphdb, parent=self) + self.document = document + model = GlyphDBModel(document, parent=self) self.horizontalHeader().setSortIndicator(model.sortColumn, model.sortOrder) self.setModel(model) self.resizeColumnsToContents() diff --git a/pixelocr/gui/window.py b/pixelocr/gui/window.py index 437d15b..2fd541a 100644 --- a/pixelocr/gui/window.py +++ b/pixelocr/gui/window.py @@ -55,7 +55,7 @@ class MainWindow(QMainWindow): self.page = PageView(self.pageScene, centralWidget) self.glyphEdit = GlyphEdit(centralWidget, document) self.glyphEdit.setEnabled(False) - self.glyphDBEdit = GlyphDBEdit(self.document.glyphdb) + self.glyphDBEdit = GlyphDBEdit(self.document) self.glyphEdit.glyphEntered.connect(self.unknownGlyphEntered) self.glyphEdit.glyphEntered.connect(self.pageScene.clearHighlight)