Skip to content

Commit b0a628d

Browse files
committed
feat(lazy-images): add PyQt6 compatibility
1 parent c89b89c commit b0a628d

7 files changed

Lines changed: 420 additions & 20 deletions

File tree

‎sqlite3__examples/view_many_images__lazy__delegates__async_load_images/main.py‎

Lines changed: 44 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,50 @@
44
__author__ = "ipetrash"
55

66

7-
from PyQt5.QtWidgets import QApplication, QWidget, QVBoxLayout, QLabel
8-
from PyQt5.QtCore import Qt, QModelIndex
9-
from PyQt5.QtSql import QSqlDatabase, QSqlQueryModel, QSqlQuery
7+
try:
8+
from PyQt6.QtWidgets import QApplication, QWidget, QVBoxLayout, QLabel
9+
from PyQt6.QtCore import Qt, QModelIndex
10+
from PyQt6.QtSql import QSqlDatabase, QSqlQueryModel, QSqlQuery
1011

11-
from db import DB_FILE_NAME
12-
from utils.FileListModel import FileListModel
13-
from utils.ListImagesWidget import ListImagesWidget
12+
Qt_Horizontal = Qt.Orientation.Horizontal
1413

14+
class SqlQueryModel(QSqlQueryModel):
15+
def data(
16+
self,
17+
item: QModelIndex,
18+
role: Qt.ItemDataRole = Qt.ItemDataRole.DisplayRole,
19+
) -> object:
20+
if role == Qt.ItemDataRole.ToolTipRole:
21+
return item.model().data(item.model().index(item.row(), column=1))
1522

16-
ICON_WIDTH, ICON_HEIGHT = 128, 128
17-
IMAGE_CACHE = dict()
23+
return super().data(item, role)
24+
25+
from utils_PyQt6.FileListModel import FileListModel
26+
from utils_PyQt6.ListImagesWidget import ListImagesWidget
27+
28+
except ImportError as e:
1829

30+
from PyQt5.QtWidgets import QApplication, QWidget, QVBoxLayout, QLabel
31+
from PyQt5.QtCore import Qt, QModelIndex
32+
from PyQt5.QtSql import QSqlDatabase, QSqlQueryModel, QSqlQuery
1933

20-
class SqlQueryModel(QSqlQueryModel):
21-
def data(self, index: QModelIndex, role: int = Qt.DisplayRole) -> object:
22-
if role == Qt.ToolTipRole:
23-
return index.model().data(index.model().index(index.row(), 1))
34+
from utils.FileListModel import FileListModel
35+
from utils.ListImagesWidget import ListImagesWidget
2436

25-
return super().data(index, role)
37+
class SqlQueryModel(QSqlQueryModel):
38+
def data(self, index: QModelIndex, role: int = Qt.DisplayRole) -> object:
39+
if role == Qt.ToolTipRole:
40+
return index.model().data(index.model().index(index.row(), 1))
41+
42+
return super().data(index, role)
43+
44+
Qt_Horizontal = Qt.Horizontal
45+
46+
47+
from db import DB_FILE_NAME
48+
49+
ICON_WIDTH, ICON_HEIGHT = 128, 128
50+
IMAGE_CACHE = dict()
2651

2752

2853
class MainWindow(QWidget):
@@ -36,8 +61,8 @@ def __init__(self) -> None:
3661
self.model_sql = SqlQueryModel()
3762
self.model_sql.rowsInserted.connect(self._on_added_new_items)
3863
self.model_sql.modelReset.connect(self._on_added_new_items)
39-
self.model_sql.setHeaderData(0, Qt.Horizontal, "ID")
40-
self.model_sql.setHeaderData(1, Qt.Horizontal, "FILE_NAME")
64+
self.model_sql.setHeaderData(0, Qt_Horizontal, "ID")
65+
self.model_sql.setHeaderData(1, Qt_Horizontal, "FILE_NAME")
4166

4267
self.list_view_sql = ListImagesWidget(
4368
ICON_WIDTH, ICON_HEIGHT, IMAGE_CACHE, file_name_index=1
@@ -46,7 +71,7 @@ def __init__(self) -> None:
4671

4772
list_files = []
4873
query = QSqlQuery("SELECT file_name FROM File")
49-
while query.next():
74+
while query.next(): # TODO: В поток
5075
file_name = query.value(0)
5176
list_files.append(file_name)
5277

@@ -59,7 +84,7 @@ def __init__(self) -> None:
5984
self.list_view_files.setModel(self.model_files)
6085

6186
self.model_sql.setQuery("SELECT id, file_name FROM File")
62-
self.model_files.setFileList(list_files)
87+
self.model_files.set_file_list(list_files)
6388

6489
layout = QVBoxLayout()
6590
layout.addWidget(QLabel("SQL:"))
@@ -78,13 +103,13 @@ def _on_added_new_items(self) -> None:
78103

79104

80105
if __name__ == "__main__":
106+
app = QApplication([])
107+
81108
db = QSqlDatabase.addDatabase("QSQLITE")
82109
db.setDatabaseName(DB_FILE_NAME)
83110
if not db.open():
84111
raise Exception(db.lastError().text())
85112

86-
app = QApplication([])
87-
88113
mw = MainWindow()
89114
mw.move(100, 100)
90115
mw.resize(800, 600)

‎sqlite3__examples/view_many_images__lazy__delegates__async_load_images/utils/FileListModel.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def fetchMore(self, parent: QModelIndex = None):
5959

6060
self.numberPopulated.emit(itemsToFetch)
6161

62-
def setFileList(self, fileList: list):
62+
def set_file_list(self, fileList: list):
6363
self.beginResetModel()
6464

6565
self.fileList = fileList
Lines changed: 116 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,116 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
4+
__author__ = "ipetrash"
5+
6+
7+
from PyQt6.QtCore import (
8+
QObject,
9+
QAbstractListModel,
10+
QModelIndex,
11+
Qt,
12+
pyqtSignal,
13+
QVariant,
14+
)
15+
16+
17+
class FileListModel(QAbstractListModel):
18+
numberPopulated = pyqtSignal(int)
19+
20+
IsMainRole: int = Qt.ItemDataRole.UserRole
21+
IsMatchedRole: int = Qt.ItemDataRole.UserRole + 1
22+
23+
def __init__(self, batch_size: int = 50, parent: QObject | None = None) -> None:
24+
super().__init__(parent)
25+
26+
self.batch_size: int = batch_size
27+
28+
self.fileList: list[str] = []
29+
self.fileCount: int = 0
30+
31+
self.main_file: str | None = None
32+
self.matched_files: list[str] = []
33+
self.mark_matching: bool = True
34+
35+
def rowCount(self, parent: QModelIndex | None = None) -> int:
36+
return self.fileCount
37+
38+
def data(
39+
self,
40+
index: QModelIndex,
41+
role: int = Qt.ItemDataRole.DisplayRole,
42+
) -> QVariant:
43+
if not index.isValid():
44+
return QVariant()
45+
46+
if index.row() >= len(self.fileList) or index.row() < 0:
47+
return QVariant()
48+
49+
file_name = self.fileList[index.row()]
50+
51+
if role == Qt.ItemDataRole.DisplayRole or role == Qt.ItemDataRole.ToolTipRole:
52+
return file_name
53+
54+
if role in [self.IsMainRole, self.IsMatchedRole]:
55+
if self.mark_matching:
56+
if role == self.IsMainRole:
57+
return self.main_file is not None and file_name == self.main_file
58+
else:
59+
return file_name in self.matched_files
60+
61+
else:
62+
return False
63+
64+
# elif role == Qt.BackgroundRole:
65+
# batch = (index.row() // self.batch_size) % 2
66+
# if batch == 0:
67+
# return QApplication.instance().palette().base()
68+
# else:
69+
# return QApplication.instance().palette().alternateBase()
70+
71+
return QVariant()
72+
73+
def canFetchMore(self, parent: QModelIndex | None = None) -> bool:
74+
return self.fileCount < len(self.fileList)
75+
76+
def fetchMore(self, parent: QModelIndex | None = None) -> None:
77+
remainder = len(self.fileList) - self.fileCount
78+
itemsToFetch = min(self.batch_size, remainder)
79+
if itemsToFetch <= 0:
80+
return
81+
82+
self.beginInsertRows(
83+
QModelIndex(), self.fileCount, self.fileCount + itemsToFetch - 1
84+
)
85+
86+
self.fileCount += itemsToFetch
87+
88+
self.endInsertRows()
89+
90+
self.numberPopulated.emit(itemsToFetch)
91+
92+
def set_file_list(self, file_list: list[str]) -> None:
93+
self.beginResetModel()
94+
95+
self.fileList = file_list
96+
self.fileCount = 0
97+
98+
self.endResetModel()
99+
100+
def set_matched_files(self, main_file: str, file_list: list[str]) -> None:
101+
self.main_file = main_file
102+
103+
self.matched_files.clear()
104+
self.matched_files.extend(file_list)
105+
106+
def set_mark_matching(self, mark_matching: bool) -> None:
107+
self.mark_matching = mark_matching
108+
109+
def get_index_by_file_name(self, file_name: str, column: int = 0) -> QModelIndex:
110+
try:
111+
row = self.fileList.index(file_name)
112+
return self.index(row, column)
113+
except ValueError:
114+
pass
115+
116+
return QModelIndex()
Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
#!/usr/bin/env python3
2+
# -*- coding: utf-8 -*-
3+
4+
__author__ = "ipetrash"
5+
6+
7+
from PyQt6.QtGui import QImage
8+
from PyQt6.QtWidgets import QListView
9+
from PyQt6.QtCore import Qt
10+
11+
from .ThumbnailDelegate import ThumbnailDelegate
12+
13+
14+
class ListImagesWidget(QListView):
15+
def __init__(
16+
self,
17+
icon_width: int,
18+
icon_height: int,
19+
image_cache: dict[str, QImage | None],
20+
file_name_index: int,
21+
) -> None:
22+
super().__init__()
23+
24+
self.setMovement(QListView.Movement.Static)
25+
self.setDragEnabled(False)
26+
self.setDragDropMode(QListView.DragDropMode.NoDragDrop)
27+
self.setDropIndicatorShown(False)
28+
self.setViewMode(QListView.ViewMode.IconMode)
29+
self.setResizeMode(QListView.ResizeMode.Adjust)
30+
self.setSpacing(5)
31+
self.setUniformItemSizes(True)
32+
self.setItemDelegate(
33+
ThumbnailDelegate(
34+
self, icon_width, icon_height, image_cache, file_name_index
35+
)
36+
)
37+
38+
def currentFileName(self) -> str | None:
39+
index = self.currentIndex()
40+
if not index.isValid():
41+
return None
42+
43+
return index.data(Qt.ItemDataRole.DisplayRole)

0 commit comments

Comments
 (0)