diff --git a/base/qt/details_table.py b/base/qt/details_table.py index b568e459..532e3549 100644 --- a/base/qt/details_table.py +++ b/base/qt/details_table.py @@ -16,7 +16,6 @@ class DetailsModel(QAbstractTableModel): def __init__(self, app): QAbstractTableModel.__init__(self) self._app = app - self._data = app.data self._dupe_data = None self._ref_data = None self.connect(app, SIGNAL('duplicateSelected()'), self.duplicateSelected) @@ -32,7 +31,7 @@ class DetailsModel(QAbstractTableModel): column = index.column() row = index.row() if column == 0: - return QVariant(self._data.COLUMNS[row]['display']) + return QVariant(self._app.data.COLUMNS[row]['display']) elif column == 1 and self._dupe_data: return QVariant(self._dupe_data[row]) elif column == 2 and self._ref_data: @@ -45,7 +44,7 @@ class DetailsModel(QAbstractTableModel): return QVariant() def rowCount(self, parent): - return len(self._data.COLUMNS) + return len(self._app.data.COLUMNS) #--- Events def duplicateSelected(self): @@ -56,8 +55,8 @@ class DetailsModel(QAbstractTableModel): else: group = self._app.results.get_group_of_duplicate(dupe) ref = group.ref if group.ref is not dupe else None - self._dupe_data = self._data.GetDisplayInfo(dupe, group) - self._ref_data = self._data.GetDisplayInfo(ref, group) + self._dupe_data = self._app._get_display_info(dupe, group) + self._ref_data = self._app._get_display_info(ref, group) self.reset() diff --git a/base/qt/results_model.py b/base/qt/results_model.py index 004fca10..3ec8a095 100644 --- a/base/qt/results_model.py +++ b/base/qt/results_model.py @@ -35,13 +35,13 @@ class ResultNode(TreeNode): @property def normalData(self): if self._normalData is None: - self._normalData = self.model._data.GetDisplayInfo(self.dupe, self.group, delta=False) + self._normalData = self.model._app._get_display_info(self.dupe, self.group, delta=False) return self._normalData @property def deltaData(self): if self._deltaData is None: - self._deltaData = self.model._data.GetDisplayInfo(self.dupe, self.group, delta=True) + self._deltaData = self.model._app._get_display_info(self.dupe, self.group, delta=True) return self._deltaData