Add freehand ink annotation tool
This commit is contained in:
@@ -45,6 +45,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目
|
|||||||
- 页面移动重排
|
- 页面移动重排
|
||||||
- 独立页面管理视图
|
- 独立页面管理视图
|
||||||
- 网格缩略图拖拽重排页面
|
- 网格缩略图拖拽重排页面
|
||||||
|
- 页面自由画笔
|
||||||
- 手写签名
|
- 手写签名
|
||||||
- 加密 PDF 权限选项
|
- 加密 PDF 权限选项
|
||||||
- 页面渲染缓存
|
- 页面渲染缓存
|
||||||
|
|||||||
@@ -28,7 +28,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重
|
|||||||
|
|
||||||
- 撤销/重做(已完成基础快照)
|
- 撤销/重做(已完成基础快照)
|
||||||
- 下划线、删除线
|
- 下划线、删除线
|
||||||
- 画笔
|
- 画笔(已完成页面自由画笔,画完后作为墨迹注释)
|
||||||
- 矩形、圆形、线条、箭头
|
- 矩形、圆形、线条、箭头
|
||||||
- 注释列表(已完成)
|
- 注释列表(已完成)
|
||||||
- 删除注释(已完成)
|
- 删除注释(已完成)
|
||||||
|
|||||||
@@ -248,6 +248,18 @@ class PdfDocument:
|
|||||||
annot.update()
|
annot.update()
|
||||||
self.mark_changed()
|
self.mark_changed()
|
||||||
|
|
||||||
|
def add_ink(self, page_index: int, points: list[tuple[float, float]]) -> None:
|
||||||
|
if len(points) < 2:
|
||||||
|
return
|
||||||
|
self.snapshot()
|
||||||
|
page = self._page(page_index)
|
||||||
|
stroke = [(float(x), float(y)) for x, y in points]
|
||||||
|
annot = page.add_ink_annot([stroke])
|
||||||
|
annot.set_colors(stroke=(0.05, 0.05, 0.05))
|
||||||
|
annot.set_border(width=2)
|
||||||
|
annot.update()
|
||||||
|
self.mark_changed()
|
||||||
|
|
||||||
def add_cover_area(self, page_index: int) -> None:
|
def add_cover_area(self, page_index: int) -> None:
|
||||||
self.snapshot()
|
self.snapshot()
|
||||||
page = self._page(page_index)
|
page = self._page(page_index)
|
||||||
|
|||||||
@@ -708,6 +708,8 @@ class MainWindow(QMainWindow):
|
|||||||
self.underline_action = QAction("下划线", self)
|
self.underline_action = QAction("下划线", self)
|
||||||
self.strikeout_action = QAction("删除线", self)
|
self.strikeout_action = QAction("删除线", self)
|
||||||
self.note_action = QAction("批注", self)
|
self.note_action = QAction("批注", self)
|
||||||
|
self.freehand_action = QAction("自由画笔", self)
|
||||||
|
self.freehand_action.setCheckable(True)
|
||||||
self.add_text_action = QAction("添加文本", self)
|
self.add_text_action = QAction("添加文本", self)
|
||||||
self.insert_image_action = QAction("插入图片", self)
|
self.insert_image_action = QAction("插入图片", self)
|
||||||
self.signature_action = QAction("图片签名", self)
|
self.signature_action = QAction("图片签名", self)
|
||||||
@@ -775,6 +777,7 @@ class MainWindow(QMainWindow):
|
|||||||
edit_menu.addAction(self.underline_action)
|
edit_menu.addAction(self.underline_action)
|
||||||
edit_menu.addAction(self.strikeout_action)
|
edit_menu.addAction(self.strikeout_action)
|
||||||
edit_menu.addAction(self.note_action)
|
edit_menu.addAction(self.note_action)
|
||||||
|
edit_menu.addAction(self.freehand_action)
|
||||||
edit_menu.addAction(self.add_text_action)
|
edit_menu.addAction(self.add_text_action)
|
||||||
edit_menu.addAction(self.insert_image_action)
|
edit_menu.addAction(self.insert_image_action)
|
||||||
edit_menu.addAction(self.signature_action)
|
edit_menu.addAction(self.signature_action)
|
||||||
@@ -812,6 +815,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.underline_action,
|
self.underline_action,
|
||||||
self.strikeout_action,
|
self.strikeout_action,
|
||||||
self.note_action,
|
self.note_action,
|
||||||
|
self.freehand_action,
|
||||||
self.rectangle_action,
|
self.rectangle_action,
|
||||||
self.circle_action,
|
self.circle_action,
|
||||||
self.line_action,
|
self.line_action,
|
||||||
@@ -887,6 +891,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.underline_action,
|
self.underline_action,
|
||||||
self.strikeout_action,
|
self.strikeout_action,
|
||||||
self.note_action,
|
self.note_action,
|
||||||
|
self.freehand_action,
|
||||||
self.add_text_action,
|
self.add_text_action,
|
||||||
self.insert_image_action,
|
self.insert_image_action,
|
||||||
self.signature_action,
|
self.signature_action,
|
||||||
@@ -944,6 +949,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.underline_action.triggered.connect(self.underline_current_page)
|
self.underline_action.triggered.connect(self.underline_current_page)
|
||||||
self.strikeout_action.triggered.connect(self.strikeout_current_page)
|
self.strikeout_action.triggered.connect(self.strikeout_current_page)
|
||||||
self.note_action.triggered.connect(self.add_note)
|
self.note_action.triggered.connect(self.add_note)
|
||||||
|
self.freehand_action.toggled.connect(self.toggle_freehand_drawing)
|
||||||
self.add_text_action.triggered.connect(self.add_text)
|
self.add_text_action.triggered.connect(self.add_text)
|
||||||
self.insert_image_action.triggered.connect(self.insert_image)
|
self.insert_image_action.triggered.connect(self.insert_image)
|
||||||
self.signature_action.triggered.connect(self.add_signature)
|
self.signature_action.triggered.connect(self.add_signature)
|
||||||
@@ -961,6 +967,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.viewer.zoom_changed.connect(lambda _: self._update_status())
|
self.viewer.zoom_changed.connect(lambda _: self._update_status())
|
||||||
self.search_box.returnPressed.connect(self.search)
|
self.search_box.returnPressed.connect(self.search)
|
||||||
self.search_results.itemClicked.connect(self._go_to_search_match)
|
self.search_results.itemClicked.connect(self._go_to_search_match)
|
||||||
|
self.viewer.ink_stroke_finished.connect(self.add_ink_stroke)
|
||||||
|
|
||||||
def _go_to_search_match(self, item: QListWidgetItem) -> None:
|
def _go_to_search_match(self, item: QListWidgetItem) -> None:
|
||||||
match: SearchMatch = item.data(Qt.ItemDataRole.UserRole)
|
match: SearchMatch = item.data(Qt.ItemDataRole.UserRole)
|
||||||
@@ -1006,6 +1013,26 @@ class MainWindow(QMainWindow):
|
|||||||
self.viewer.render()
|
self.viewer.render()
|
||||||
self.statusBar().showMessage("批注已添加,记得保存", 3000)
|
self.statusBar().showMessage("批注已添加,记得保存", 3000)
|
||||||
|
|
||||||
|
def toggle_freehand_drawing(self, enabled: bool) -> None:
|
||||||
|
if enabled and not self._ensure_document():
|
||||||
|
self.freehand_action.setChecked(False)
|
||||||
|
return
|
||||||
|
self.viewer.set_drawing_enabled(enabled)
|
||||||
|
if enabled:
|
||||||
|
self.statusBar().showMessage("自由画笔已启用:在页面上按住鼠标绘制", 5000)
|
||||||
|
else:
|
||||||
|
self.statusBar().showMessage("自由画笔已关闭", 3000)
|
||||||
|
|
||||||
|
def add_ink_stroke(self, page_index: int, points: list[tuple[float, float]]) -> None:
|
||||||
|
try:
|
||||||
|
self.document.add_ink(page_index, points)
|
||||||
|
self.viewer.render()
|
||||||
|
self.freehand_action.setChecked(False)
|
||||||
|
self.statusBar().showMessage("画笔注释已添加,记得保存", 3000)
|
||||||
|
except Exception as exc:
|
||||||
|
self.freehand_action.setChecked(False)
|
||||||
|
QMessageBox.critical(self, "画笔失败", f"无法添加画笔注释:\n{exc}")
|
||||||
|
|
||||||
def add_text(self) -> None:
|
def add_text(self) -> None:
|
||||||
if not self._ensure_document():
|
if not self._ensure_document():
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -1,15 +1,61 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from PySide6.QtCore import Qt, Signal
|
from PySide6.QtCore import QPointF, Qt, Signal
|
||||||
from PySide6.QtGui import QPixmap
|
from PySide6.QtGui import QMouseEvent, QPainter, QPen, QPixmap
|
||||||
from PySide6.QtWidgets import QLabel, QScrollArea, QSizePolicy
|
from PySide6.QtWidgets import QLabel, QScrollArea, QSizePolicy
|
||||||
|
|
||||||
from pdfreaderlite.core.document import PdfDocument
|
from pdfreaderlite.core.document import PdfDocument
|
||||||
|
|
||||||
|
|
||||||
|
class PageLabel(QLabel):
|
||||||
|
stroke_finished = Signal(list)
|
||||||
|
|
||||||
|
def __init__(self, text: str) -> None:
|
||||||
|
super().__init__(text)
|
||||||
|
self.drawing_enabled = False
|
||||||
|
self._drawing = False
|
||||||
|
self._stroke: list[QPointF] = []
|
||||||
|
|
||||||
|
def mousePressEvent(self, event: QMouseEvent) -> None:
|
||||||
|
if self.drawing_enabled and event.button() == Qt.MouseButton.LeftButton:
|
||||||
|
self._drawing = True
|
||||||
|
self._stroke = [event.position()]
|
||||||
|
self.update()
|
||||||
|
return
|
||||||
|
super().mousePressEvent(event)
|
||||||
|
|
||||||
|
def mouseMoveEvent(self, event: QMouseEvent) -> None:
|
||||||
|
if self._drawing:
|
||||||
|
self._stroke.append(event.position())
|
||||||
|
self.update()
|
||||||
|
return
|
||||||
|
super().mouseMoveEvent(event)
|
||||||
|
|
||||||
|
def mouseReleaseEvent(self, event: QMouseEvent) -> None:
|
||||||
|
if self._drawing and event.button() == Qt.MouseButton.LeftButton:
|
||||||
|
self._drawing = False
|
||||||
|
if len(self._stroke) > 1:
|
||||||
|
self.stroke_finished.emit(self._stroke)
|
||||||
|
self._stroke = []
|
||||||
|
self.update()
|
||||||
|
return
|
||||||
|
super().mouseReleaseEvent(event)
|
||||||
|
|
||||||
|
def paintEvent(self, event) -> None:
|
||||||
|
super().paintEvent(event)
|
||||||
|
if not self._stroke:
|
||||||
|
return
|
||||||
|
painter = QPainter(self)
|
||||||
|
painter.setRenderHint(QPainter.RenderHint.Antialiasing)
|
||||||
|
painter.setPen(QPen(Qt.GlobalColor.black, 2, Qt.PenStyle.SolidLine, Qt.PenCapStyle.RoundCap))
|
||||||
|
for index in range(1, len(self._stroke)):
|
||||||
|
painter.drawLine(self._stroke[index - 1], self._stroke[index])
|
||||||
|
|
||||||
|
|
||||||
class PdfViewer(QScrollArea):
|
class PdfViewer(QScrollArea):
|
||||||
page_changed = Signal(int)
|
page_changed = Signal(int)
|
||||||
zoom_changed = Signal(float)
|
zoom_changed = Signal(float)
|
||||||
|
ink_stroke_finished = Signal(int, list)
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
super().__init__()
|
super().__init__()
|
||||||
@@ -17,7 +63,7 @@ class PdfViewer(QScrollArea):
|
|||||||
self.page_index = 0
|
self.page_index = 0
|
||||||
self.zoom = 1.2
|
self.zoom = 1.2
|
||||||
|
|
||||||
self.page_label = QLabel("打开一个 PDF 文件开始阅读")
|
self.page_label = PageLabel("打开一个 PDF 文件开始阅读")
|
||||||
self.page_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
self.page_label.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||||
self.page_label.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
|
self.page_label.setSizePolicy(QSizePolicy.Policy.Ignored, QSizePolicy.Policy.Ignored)
|
||||||
self.page_label.setStyleSheet(
|
self.page_label.setStyleSheet(
|
||||||
@@ -27,6 +73,7 @@ class PdfViewer(QScrollArea):
|
|||||||
self.setWidget(self.page_label)
|
self.setWidget(self.page_label)
|
||||||
self.setWidgetResizable(True)
|
self.setWidgetResizable(True)
|
||||||
self.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
self.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||||
|
self.page_label.stroke_finished.connect(self._emit_ink_stroke)
|
||||||
|
|
||||||
def set_document(self, document: PdfDocument) -> None:
|
def set_document(self, document: PdfDocument) -> None:
|
||||||
self.document = document
|
self.document = document
|
||||||
@@ -40,6 +87,7 @@ class PdfViewer(QScrollArea):
|
|||||||
|
|
||||||
image = self.document.render_page(self.page_index, self.zoom)
|
image = self.document.render_page(self.page_index, self.zoom)
|
||||||
self.page_label.setPixmap(QPixmap.fromImage(image))
|
self.page_label.setPixmap(QPixmap.fromImage(image))
|
||||||
|
self.page_label.setStyleSheet("QLabel { background: #f4f4f4; color: #575757; padding: 0; }")
|
||||||
self.page_label.adjustSize()
|
self.page_label.adjustSize()
|
||||||
self.page_changed.emit(self.page_index)
|
self.page_changed.emit(self.page_index)
|
||||||
self.zoom_changed.emit(self.zoom)
|
self.zoom_changed.emit(self.zoom)
|
||||||
@@ -69,6 +117,11 @@ class PdfViewer(QScrollArea):
|
|||||||
self.zoom = zoom
|
self.zoom = zoom
|
||||||
self.render()
|
self.render()
|
||||||
|
|
||||||
|
def set_drawing_enabled(self, enabled: bool) -> None:
|
||||||
|
self.page_label.drawing_enabled = enabled
|
||||||
|
self.viewport().setCursor(Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor)
|
||||||
|
self.page_label.setCursor(Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor)
|
||||||
|
|
||||||
def fit_width(self) -> None:
|
def fit_width(self) -> None:
|
||||||
if not self.document or not self.document.is_open:
|
if not self.document or not self.document.is_open:
|
||||||
return
|
return
|
||||||
@@ -83,3 +136,7 @@ class PdfViewer(QScrollArea):
|
|||||||
available_width = max(320, self.viewport().width() - 36)
|
available_width = max(320, self.viewport().width() - 36)
|
||||||
available_height = max(320, self.viewport().height() - 36)
|
available_height = max(320, self.viewport().height() - 36)
|
||||||
self.set_zoom(min(available_width / image.width(), available_height / image.height()))
|
self.set_zoom(min(available_width / image.width(), available_height / image.height()))
|
||||||
|
|
||||||
|
def _emit_ink_stroke(self, stroke: list[QPointF]) -> None:
|
||||||
|
points = [(point.x() / self.zoom, point.y() / self.zoom) for point in stroke]
|
||||||
|
self.ink_stroke_finished.emit(self.page_index, points)
|
||||||
|
|||||||
@@ -84,6 +84,7 @@ def main() -> int:
|
|||||||
document.add_circle(0)
|
document.add_circle(0)
|
||||||
document.add_line(0)
|
document.add_line(0)
|
||||||
document.add_line(0, arrow=True)
|
document.add_line(0, arrow=True)
|
||||||
|
document.add_ink(0, [(80, 120), (120, 140), (160, 130)])
|
||||||
document.add_cover_area(0)
|
document.add_cover_area(0)
|
||||||
|
|
||||||
blank_index = document.insert_blank_page(0)
|
blank_index = document.insert_blank_page(0)
|
||||||
|
|||||||
Reference in New Issue
Block a user