Optimize thumbnail loading for large PDFs
This commit is contained in:
@@ -53,6 +53,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目
|
|||||||
- 加密 PDF 权限选项
|
- 加密 PDF 权限选项
|
||||||
- 页面渲染缓存
|
- 页面渲染缓存
|
||||||
- 分批加载缩略图
|
- 分批加载缩略图
|
||||||
|
- 大文件缩略图按可见区域懒加载
|
||||||
- 异常日志
|
- 异常日志
|
||||||
- 窗口大小与布局记忆
|
- 窗口大小与布局记忆
|
||||||
- 启动时恢复上次文件提示
|
- 启动时恢复上次文件提示
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重
|
|||||||
|
|
||||||
## V4:打包与体验优化
|
## V4:打包与体验优化
|
||||||
|
|
||||||
- 大文件性能优化
|
- 大文件性能优化(已完成缩略图可见区域懒加载与缩略图独立缓存)
|
||||||
- Acrobat 风格右侧工具面板(已完成)
|
- Acrobat 风格右侧工具面板(已完成)
|
||||||
- 页面缓存(已完成基础缓存)
|
- 页面缓存(已完成基础缓存)
|
||||||
- 后台渲染(已完成缩略图分批加载)
|
- 后台渲染(已完成缩略图分批加载)
|
||||||
|
|||||||
@@ -65,6 +65,10 @@ class PdfDocument:
|
|||||||
def is_dirty(self) -> bool:
|
def is_dirty(self) -> bool:
|
||||||
return self._dirty
|
return self._dirty
|
||||||
|
|
||||||
|
@property
|
||||||
|
def revision(self) -> int:
|
||||||
|
return self._revision
|
||||||
|
|
||||||
def open(self, path: str | Path, password: str | None = None) -> None:
|
def open(self, path: str | Path, password: str | None = None) -> None:
|
||||||
self.close()
|
self.close()
|
||||||
self.path = Path(path)
|
self.path = Path(path)
|
||||||
@@ -114,7 +118,15 @@ class PdfDocument:
|
|||||||
page = self._page(page_index)
|
page = self._page(page_index)
|
||||||
rect = page.rect
|
rect = page.rect
|
||||||
zoom = width / rect.width
|
zoom = width / rect.width
|
||||||
thumbnail = self.render_page(page_index, zoom)
|
pixmap = page.get_pixmap(matrix=fitz.Matrix(zoom, zoom), alpha=False)
|
||||||
|
image = QImage(
|
||||||
|
pixmap.samples,
|
||||||
|
pixmap.width,
|
||||||
|
pixmap.height,
|
||||||
|
pixmap.stride,
|
||||||
|
QImage.Format.Format_RGB888,
|
||||||
|
)
|
||||||
|
thumbnail = image.copy()
|
||||||
self._remember_cache_item(self._thumbnail_cache, cache_key, thumbnail, max_items=80)
|
self._remember_cache_item(self._thumbnail_cache, cache_key, thumbnail, max_items=80)
|
||||||
return thumbnail.copy()
|
return thumbnail.copy()
|
||||||
|
|
||||||
|
|||||||
+64
-11
@@ -1,5 +1,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
|
from collections import deque
|
||||||
|
|
||||||
from PySide6.QtCore import QSize, Qt, QTimer, Signal
|
from PySide6.QtCore import QSize, Qt, QTimer, Signal
|
||||||
from PySide6.QtGui import QIcon, QPixmap
|
from PySide6.QtGui import QIcon, QPixmap
|
||||||
from PySide6.QtWidgets import QListWidget, QListWidgetItem, QTabWidget, QWidget, QVBoxLayout
|
from PySide6.QtWidgets import QListWidget, QListWidgetItem, QTabWidget, QWidget, QVBoxLayout
|
||||||
@@ -13,9 +15,13 @@ class ThumbnailList(QListWidget):
|
|||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
super().__init__()
|
super().__init__()
|
||||||
self.document: PdfDocument | None = None
|
self.document: PdfDocument | None = None
|
||||||
self._next_thumbnail_index = 0
|
self._thumbnail_queue: deque[int] = deque()
|
||||||
|
self._queued_pages: set[int] = set()
|
||||||
|
self._rendered_keys: set[tuple[int, int]] = set()
|
||||||
self._thumbnail_timer = QTimer(self)
|
self._thumbnail_timer = QTimer(self)
|
||||||
self._thumbnail_timer.timeout.connect(self._render_next_thumbnail)
|
self._thumbnail_timer.timeout.connect(self._render_next_thumbnail)
|
||||||
|
self.verticalScrollBar().valueChanged.connect(lambda _: self.schedule_visible_thumbnails())
|
||||||
|
|
||||||
self.setIconSize(QSize(132, 176))
|
self.setIconSize(QSize(132, 176))
|
||||||
self.setViewMode(QListWidget.ViewMode.ListMode)
|
self.setViewMode(QListWidget.ViewMode.ListMode)
|
||||||
self.setSpacing(8)
|
self.setSpacing(8)
|
||||||
@@ -23,32 +29,79 @@ class ThumbnailList(QListWidget):
|
|||||||
|
|
||||||
def load_document(self, document: PdfDocument) -> None:
|
def load_document(self, document: PdfDocument) -> None:
|
||||||
self._thumbnail_timer.stop()
|
self._thumbnail_timer.stop()
|
||||||
|
same_document = self.document is document
|
||||||
self.document = document
|
self.document = document
|
||||||
self._next_thumbnail_index = 0
|
self._thumbnail_queue.clear()
|
||||||
self.clear()
|
self._queued_pages.clear()
|
||||||
for page_index in range(document.page_count):
|
|
||||||
item = QListWidgetItem(f"第 {page_index + 1} 页")
|
if not same_document or self.count() != document.page_count:
|
||||||
item.setData(Qt.ItemDataRole.UserRole, page_index)
|
self.clear()
|
||||||
self.addItem(item)
|
self._rendered_keys.clear()
|
||||||
self._thumbnail_timer.start(1)
|
for page_index in range(document.page_count):
|
||||||
|
item = QListWidgetItem(f"第 {page_index + 1} 页")
|
||||||
|
item.setData(Qt.ItemDataRole.UserRole, page_index)
|
||||||
|
self.addItem(item)
|
||||||
|
|
||||||
|
QTimer.singleShot(0, self.schedule_visible_thumbnails)
|
||||||
|
|
||||||
def select_page(self, page_index: int) -> None:
|
def select_page(self, page_index: int) -> None:
|
||||||
if 0 <= page_index < self.count():
|
if 0 <= page_index < self.count():
|
||||||
self.setCurrentRow(page_index)
|
self.setCurrentRow(page_index)
|
||||||
|
for nearby_page in range(page_index - 2, page_index + 3):
|
||||||
|
self._queue_thumbnail(nearby_page)
|
||||||
|
self._start_thumbnail_timer()
|
||||||
|
|
||||||
|
def schedule_visible_thumbnails(self) -> None:
|
||||||
|
if not self.document or self.count() == 0:
|
||||||
|
return
|
||||||
|
first = self.indexAt(self.viewport().rect().topLeft()).row()
|
||||||
|
if first < 0:
|
||||||
|
first = max(0, self.currentRow())
|
||||||
|
last = self.indexAt(self.viewport().rect().bottomLeft()).row()
|
||||||
|
if last < 0:
|
||||||
|
last = min(self.count() - 1, first + 8)
|
||||||
|
|
||||||
|
first = max(0, first - 3)
|
||||||
|
last = min(self.count() - 1, last + 3)
|
||||||
|
for page_index in range(first, last + 1):
|
||||||
|
self._queue_thumbnail(page_index)
|
||||||
|
self._start_thumbnail_timer()
|
||||||
|
|
||||||
def _emit_page(self, item: QListWidgetItem) -> None:
|
def _emit_page(self, item: QListWidgetItem) -> None:
|
||||||
page_index = item.data(Qt.ItemDataRole.UserRole)
|
page_index = item.data(Qt.ItemDataRole.UserRole)
|
||||||
self.page_selected.emit(page_index)
|
self.page_selected.emit(page_index)
|
||||||
|
|
||||||
def _render_next_thumbnail(self) -> None:
|
def _render_next_thumbnail(self) -> None:
|
||||||
if not self.document or self._next_thumbnail_index >= self.count():
|
if not self.document or not self._thumbnail_queue:
|
||||||
self._thumbnail_timer.stop()
|
self._thumbnail_timer.stop()
|
||||||
return
|
return
|
||||||
page_index = self._next_thumbnail_index
|
|
||||||
|
page_index = self._thumbnail_queue.popleft()
|
||||||
|
self._queued_pages.discard(page_index)
|
||||||
|
if page_index < 0 or page_index >= self.count():
|
||||||
|
return
|
||||||
|
|
||||||
|
render_key = (self.document.revision, page_index)
|
||||||
|
if render_key in self._rendered_keys:
|
||||||
|
return
|
||||||
|
|
||||||
item = self.item(page_index)
|
item = self.item(page_index)
|
||||||
image = self.document.render_thumbnail(page_index)
|
image = self.document.render_thumbnail(page_index)
|
||||||
item.setIcon(QIcon(QPixmap.fromImage(image)))
|
item.setIcon(QIcon(QPixmap.fromImage(image)))
|
||||||
self._next_thumbnail_index += 1
|
self._rendered_keys.add(render_key)
|
||||||
|
|
||||||
|
def _queue_thumbnail(self, page_index: int) -> None:
|
||||||
|
if page_index < 0 or page_index >= self.count() or not self.document:
|
||||||
|
return
|
||||||
|
render_key = (self.document.revision, page_index)
|
||||||
|
if render_key in self._rendered_keys or page_index in self._queued_pages:
|
||||||
|
return
|
||||||
|
self._thumbnail_queue.append(page_index)
|
||||||
|
self._queued_pages.add(page_index)
|
||||||
|
|
||||||
|
def _start_thumbnail_timer(self) -> None:
|
||||||
|
if self._thumbnail_queue and not self._thumbnail_timer.isActive():
|
||||||
|
self._thumbnail_timer.start(16)
|
||||||
|
|
||||||
|
|
||||||
class Sidebar(QTabWidget):
|
class Sidebar(QTabWidget):
|
||||||
|
|||||||
Reference in New Issue
Block a user