From bf9e8fb7cdb2c4d0b80b945964fe7ec0dcb5138f Mon Sep 17 00:00:00 2001 From: shen Date: Mon, 29 Jun 2026 16:44:45 +0800 Subject: [PATCH] Add click placement for PDF objects --- README.md | 1 + docs/development_plan.md | 10 ++--- pdfreaderlite/core/document.py | 44 ++++++++++++++----- pdfreaderlite/ui/main_window.py | 78 +++++++++++++++++++++++++++++++++ pdfreaderlite/ui/pdf_viewer.py | 20 +++++++++ scripts/smoke_test.py | 3 ++ 6 files changed, 139 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index b717f40..495b2cc 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目 - 网格缩略图拖拽重排页面 - 页面自由画笔 - 手写签名 +- 点击页面放置文本、图片、签名 - 加密 PDF 权限选项 - 页面渲染缓存 - 分批加载缩略图 diff --git a/docs/development_plan.md b/docs/development_plan.md index 81f7446..00ed812 100644 --- a/docs/development_plan.md +++ b/docs/development_plan.md @@ -14,8 +14,8 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 - 文本搜索 - 高亮 - 批注 -- 添加文本 -- 插入图片 +- 添加文本(已支持默认位置与鼠标点击放置) +- 插入图片(已支持默认位置与鼠标点击放置) - 页面旋转 - 页面删除 - 保存 @@ -32,7 +32,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 - 矩形、圆形、线条、箭头 - 注释列表(已完成) - 删除注释(已完成) -- 移动、缩放、删除新增对象 +- 移动、缩放、删除新增对象(待开发;当前已完成鼠标点击放置) - 遮盖区域 - 插入空白页 - 插入其他 PDF 页面 @@ -46,8 +46,8 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 - 填写已有 PDF 表单(已完成基础字段填写) - 基础文本框、复选框、单选按钮 - 手写签名(已完成) -- 图片签名(已完成基础放置) -- 签名拖拽放置 +- 图片签名(已完成基础放置与鼠标点击放置) +- 签名拖拽移动/缩放(待开发) - 导出页面为图片(已完成) - 导出指定页面(已完成) - 图片转 PDF(已完成) diff --git a/pdfreaderlite/core/document.py b/pdfreaderlite/core/document.py index a62bc91..c51b30b 100644 --- a/pdfreaderlite/core/document.py +++ b/pdfreaderlite/core/document.py @@ -181,36 +181,56 @@ class PdfDocument: annot.update() self.mark_changed() - def add_text(self, page_index: int, text: str) -> None: + def add_text( + self, + page_index: int, + text: str, + point: tuple[float, float] | None = None, + ) -> None: self.snapshot() page = self._page(page_index) - point = fitz.Point(72, 96) - page.insert_text(point, text, fontsize=14, fontname="china-s", color=(0, 0, 0)) + text_point = fitz.Point(*(point or (72, 96))) + page.insert_text(text_point, text, fontsize=14, fontname="china-s", color=(0, 0, 0)) self.mark_changed() - def insert_image(self, page_index: int, image_path: str | Path) -> None: + def insert_image( + self, + page_index: int, + image_path: str | Path, + point: tuple[float, float] | None = None, + ) -> None: self.snapshot() page = self._page(page_index) page_rect = page.rect width = page_rect.width * 0.35 height = width * 0.75 - rect = fitz.Rect(72, 120, 72 + width, 120 + height) + x0, y0 = point or (72, 120) + rect = fitz.Rect(x0, y0, x0 + width, y0 + height) page.insert_image(rect, filename=str(image_path), keep_proportion=True) self.mark_changed() - def add_signature(self, page_index: int, image_path: str | Path) -> None: + def add_signature( + self, + page_index: int, + image_path: str | Path, + point: tuple[float, float] | None = None, + ) -> None: self.snapshot() page = self._page(page_index) page_rect = page.rect width = page_rect.width * 0.28 height = width * 0.42 margin = 54 - rect = fitz.Rect( - page_rect.width - width - margin, - page_rect.height - height - margin, - page_rect.width - margin, - page_rect.height - margin, - ) + if point: + x0, y0 = point + rect = fitz.Rect(x0, y0, x0 + width, y0 + height) + else: + rect = fitz.Rect( + page_rect.width - width - margin, + page_rect.height - height - margin, + page_rect.width - margin, + page_rect.height - margin, + ) page.insert_image(rect, filename=str(image_path), keep_proportion=True) self.mark_changed() diff --git a/pdfreaderlite/ui/main_window.py b/pdfreaderlite/ui/main_window.py index b1380db..ca016b7 100644 --- a/pdfreaderlite/ui/main_window.py +++ b/pdfreaderlite/ui/main_window.py @@ -52,6 +52,7 @@ class MainWindow(QMainWindow): self.search_box = QLineEdit() self.search_results = QListWidget() self.right_tools = RightToolsPanel(self.search_box, self.search_results) + self.pending_placement: dict[str, object] | None = None self._build_window() self._build_actions() @@ -711,8 +712,11 @@ class MainWindow(QMainWindow): self.freehand_action = QAction("自由画笔", self) self.freehand_action.setCheckable(True) self.add_text_action = QAction("添加文本", self) + self.place_text_action = QAction("点击放置文本", self) self.insert_image_action = QAction("插入图片", self) + self.place_image_action = QAction("点击放置图片", self) self.signature_action = QAction("图片签名", self) + self.place_signature_action = QAction("点击放置签名", self) self.draw_signature_action = QAction("手写签名", self) self.rectangle_action = QAction("矩形", self) self.circle_action = QAction("圆形", self) @@ -779,8 +783,11 @@ class MainWindow(QMainWindow): edit_menu.addAction(self.note_action) edit_menu.addAction(self.freehand_action) edit_menu.addAction(self.add_text_action) + edit_menu.addAction(self.place_text_action) edit_menu.addAction(self.insert_image_action) + edit_menu.addAction(self.place_image_action) edit_menu.addAction(self.signature_action) + edit_menu.addAction(self.place_signature_action) edit_menu.addAction(self.draw_signature_action) edit_menu.addAction(self.rectangle_action) edit_menu.addAction(self.circle_action) @@ -802,7 +809,9 @@ class MainWindow(QMainWindow): "编辑 PDF", [ self.add_text_action, + self.place_text_action, self.insert_image_action, + self.place_image_action, self.cover_action, self.undo_action, self.redo_action, @@ -841,6 +850,7 @@ class MainWindow(QMainWindow): "签名与表单", [ self.signature_action, + self.place_signature_action, self.draw_signature_action, self.form_fill_action, ], @@ -893,8 +903,11 @@ class MainWindow(QMainWindow): self.note_action, self.freehand_action, self.add_text_action, + self.place_text_action, self.insert_image_action, + self.place_image_action, self.signature_action, + self.place_signature_action, self.draw_signature_action, self.rectangle_action, self.circle_action, @@ -951,8 +964,11 @@ class MainWindow(QMainWindow): 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.place_text_action.triggered.connect(self.prepare_place_text) self.insert_image_action.triggered.connect(self.insert_image) + self.place_image_action.triggered.connect(self.prepare_place_image) self.signature_action.triggered.connect(self.add_signature) + self.place_signature_action.triggered.connect(self.prepare_place_signature) self.draw_signature_action.triggered.connect(self.draw_signature) self.rectangle_action.triggered.connect(self.add_rectangle) self.circle_action.triggered.connect(self.add_circle) @@ -968,6 +984,7 @@ class MainWindow(QMainWindow): self.search_box.returnPressed.connect(self.search) self.search_results.itemClicked.connect(self._go_to_search_match) self.viewer.ink_stroke_finished.connect(self.add_ink_stroke) + self.viewer.placement_requested.connect(self.place_pending_object) def _go_to_search_match(self, item: QListWidgetItem) -> None: match: SearchMatch = item.data(Qt.ItemDataRole.UserRole) @@ -1017,6 +1034,9 @@ class MainWindow(QMainWindow): if enabled and not self._ensure_document(): self.freehand_action.setChecked(False) return + if enabled: + self.pending_placement = None + self.viewer.set_placement_enabled(False) self.viewer.set_drawing_enabled(enabled) if enabled: self.statusBar().showMessage("自由画笔已启用:在页面上按住鼠标绘制", 5000) @@ -1046,6 +1066,64 @@ class MainWindow(QMainWindow): except Exception as exc: QMessageBox.critical(self, "添加失败", f"无法添加文本:\n{exc}") + def prepare_place_text(self) -> None: + if not self._ensure_document(): + return + text, ok = QInputDialog.getMultiLineText(self, "点击放置文本", "文本内容:") + if not ok or not text.strip(): + return + self._start_placement({"type": "text", "text": text}, "点击页面位置放置文本") + + def prepare_place_image(self) -> None: + if not self._ensure_document(): + return + selected, _ = QFileDialog.getOpenFileName( + self, "点击放置图片", "", "图片文件 (*.png *.jpg *.jpeg *.bmp *.tif *.tiff)" + ) + if not selected: + return + self._start_placement({"type": "image", "path": selected}, "点击页面位置放置图片") + + def prepare_place_signature(self) -> None: + if not self._ensure_document(): + return + selected, _ = QFileDialog.getOpenFileName( + self, + "点击放置签名", + "", + "图片文件 (*.png *.jpg *.jpeg *.bmp *.tif *.tiff)", + ) + if not selected: + return + self._start_placement({"type": "signature", "path": selected}, "点击页面位置放置签名") + + def _start_placement(self, payload: dict[str, object], message: str) -> None: + self.pending_placement = payload + self.freehand_action.setChecked(False) + self.viewer.set_placement_enabled(True) + self.statusBar().showMessage(message, 5000) + + def place_pending_object(self, page_index: int, point: tuple[float, float]) -> None: + if not self.pending_placement: + return + payload = self.pending_placement + self.pending_placement = None + self.viewer.set_placement_enabled(False) + try: + kind = payload.get("type") + if kind == "text": + self.document.add_text(page_index, str(payload["text"]), point) + elif kind == "image": + self.document.insert_image(page_index, str(payload["path"]), point) + elif kind == "signature": + self.document.add_signature(page_index, str(payload["path"]), point) + else: + raise ValueError("未知的放置类型") + self.viewer.render() + self.statusBar().showMessage("已放置,记得保存", 3000) + except Exception as exc: + QMessageBox.critical(self, "放置失败", f"无法放置内容:\n{exc}") + def insert_image(self) -> None: if not self._ensure_document(): return diff --git a/pdfreaderlite/ui/pdf_viewer.py b/pdfreaderlite/ui/pdf_viewer.py index c0d5781..4831aff 100644 --- a/pdfreaderlite/ui/pdf_viewer.py +++ b/pdfreaderlite/ui/pdf_viewer.py @@ -9,14 +9,19 @@ from pdfreaderlite.core.document import PdfDocument class PageLabel(QLabel): stroke_finished = Signal(list) + placement_requested = Signal(QPointF) def __init__(self, text: str) -> None: super().__init__(text) self.drawing_enabled = False + self.placement_enabled = False self._drawing = False self._stroke: list[QPointF] = [] def mousePressEvent(self, event: QMouseEvent) -> None: + if self.placement_enabled and event.button() == Qt.MouseButton.LeftButton: + self.placement_requested.emit(event.position()) + return if self.drawing_enabled and event.button() == Qt.MouseButton.LeftButton: self._drawing = True self._stroke = [event.position()] @@ -56,6 +61,7 @@ class PdfViewer(QScrollArea): page_changed = Signal(int) zoom_changed = Signal(float) ink_stroke_finished = Signal(int, list) + placement_requested = Signal(int, tuple) def __init__(self) -> None: super().__init__() @@ -74,6 +80,7 @@ class PdfViewer(QScrollArea): self.setWidgetResizable(True) self.setAlignment(Qt.AlignmentFlag.AlignCenter) self.page_label.stroke_finished.connect(self._emit_ink_stroke) + self.page_label.placement_requested.connect(self._emit_placement) def set_document(self, document: PdfDocument) -> None: self.document = document @@ -118,10 +125,20 @@ class PdfViewer(QScrollArea): self.render() def set_drawing_enabled(self, enabled: bool) -> None: + if enabled: + self.set_placement_enabled(False) 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 set_placement_enabled(self, enabled: bool) -> None: + if enabled: + self.page_label.drawing_enabled = False + self.page_label.placement_enabled = enabled + cursor = Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor + self.viewport().setCursor(cursor) + self.page_label.setCursor(cursor) + def fit_width(self) -> None: if not self.document or not self.document.is_open: return @@ -140,3 +157,6 @@ class PdfViewer(QScrollArea): 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) + + def _emit_placement(self, point: QPointF) -> None: + self.placement_requested.emit(self.page_index, (point.x() / self.zoom, point.y() / self.zoom)) diff --git a/scripts/smoke_test.py b/scripts/smoke_test.py index a73eb8f..a0a4695 100644 --- a/scripts/smoke_test.py +++ b/scripts/smoke_test.py @@ -78,8 +78,11 @@ def main() -> int: assert annotations assert document.delete_annotation(annotations[0].page_index, annotations[0].xref) document.add_text(0, "PDFReaderLite") + document.add_text(0, "Placed text", (150, 160)) document.insert_image(0, image_path) + document.insert_image(0, image_path, (180, 200)) document.add_signature(0, image_path) + document.add_signature(0, image_path, (220, 260)) document.add_rectangle(0) document.add_circle(0) document.add_line(0)