From 3a448d16cb1824b06b80f6aeb8ba4c0c022955c6 Mon Sep 17 00:00:00 2001 From: shen Date: Mon, 29 Jun 2026 18:12:05 +0800 Subject: [PATCH] Add adjustable raster placement layer --- README.md | 1 + docs/development_plan.md | 4 +- pdfreaderlite/core/document.py | 55 +++++++++--- pdfreaderlite/ui/main_window.py | 146 +++++++++++++++++++++++++++++--- pdfreaderlite/ui/pdf_viewer.py | 26 ++++++ scripts/smoke_test.py | 2 + 6 files changed, 206 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index a15795d..5aa9710 100644 --- a/README.md +++ b/README.md @@ -48,6 +48,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目 - 页面自由画笔 - 手写签名 - 点击页面放置文本、图片、签名 +- 图片/签名当前会话内拖动缩放,保存时固化写入 PDF - 选择对象、拖动、右下角缩放、Delete/右键删除注释对象 - 加密 PDF 权限选项 - 页面渲染缓存 diff --git a/docs/development_plan.md b/docs/development_plan.md index 9be332d..22733b2 100644 --- a/docs/development_plan.md +++ b/docs/development_plan.md @@ -46,8 +46,8 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重 - 填写已有 PDF 表单(已完成基础字段填写) - 基础文本框、复选框、单选按钮 - 手写签名(已完成) -- 图片签名(已完成基础放置与鼠标点击放置;保存后固化进 PDF) -- 签名拖拽移动/缩放(采用当前会话调整层,待继续完善) +- 图片签名(已完成基础放置、鼠标点击放置、当前会话拖动缩放;保存后固化进 PDF) +- 签名拖拽移动/缩放(已完成当前会话调整层;重新打开后作为页面内容固定) - 导出页面为图片(已完成) - 导出指定页面(已完成) - 图片转 PDF(已完成) diff --git a/pdfreaderlite/core/document.py b/pdfreaderlite/core/document.py index 048f795..6f5f9d9 100644 --- a/pdfreaderlite/core/document.py +++ b/pdfreaderlite/core/document.py @@ -214,14 +214,29 @@ class PdfDocument: image_path: str | Path, point: tuple[float, float] | None = None, ) -> None: - self.snapshot() + self.insert_image_rect(page_index, image_path, self.image_rect(page_index, point)) + + def image_rect( + self, + page_index: int, + point: tuple[float, float] | None = None, + ) -> tuple[float, float, float, float]: page = self._page(page_index) page_rect = page.rect width = page_rect.width * 0.35 height = width * 0.75 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) + return (x0, y0, x0 + width, y0 + height) + + def insert_image_rect( + self, + page_index: int, + image_path: str | Path, + rect: tuple[float, float, float, float], + ) -> None: + self.snapshot() + page = self._page(page_index) + page.insert_image(fitz.Rect(*rect), filename=str(image_path), keep_proportion=True) self.mark_changed() def add_signature( @@ -230,7 +245,13 @@ class PdfDocument: image_path: str | Path, point: tuple[float, float] | None = None, ) -> None: - self.snapshot() + self.insert_image_rect(page_index, image_path, self.signature_rect(page_index, point)) + + def signature_rect( + self, + page_index: int, + point: tuple[float, float] | None = None, + ) -> tuple[float, float, float, float]: page = self._page(page_index) page_rect = page.rect width = page_rect.width * 0.28 @@ -238,15 +259,23 @@ class PdfDocument: margin = 54 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) + return (x0, y0, x0 + width, y0 + height) + return ( + page_rect.width - width - margin, + page_rect.height - height - margin, + page_rect.width - margin, + page_rect.height - margin, + ) + + def add_signature_rect( + self, + page_index: int, + image_path: str | Path, + rect: tuple[float, float, float, float], + ) -> None: + self.snapshot() + page = self._page(page_index) + page.insert_image(fitz.Rect(*rect), filename=str(image_path), keep_proportion=True) self.mark_changed() def add_rectangle(self, page_index: int) -> None: diff --git a/pdfreaderlite/ui/main_window.py b/pdfreaderlite/ui/main_window.py index 906d037..a52f9a2 100644 --- a/pdfreaderlite/ui/main_window.py +++ b/pdfreaderlite/ui/main_window.py @@ -55,6 +55,9 @@ class MainWindow(QMainWindow): self.right_tools = RightToolsPanel(self.search_box, self.search_results) self.pending_placement: dict[str, object] | None = None self.selected_annotation: AnnotationInfo | None = None + self.session_raster_objects: list[dict[str, object]] = [] + self.selected_raster_id: int | None = None + self.next_raster_id = 1 self._build_window() self._build_actions() @@ -93,6 +96,7 @@ class MainWindow(QMainWindow): path = selected try: + self._clear_session_raster_objects() self.document.open(path) self.viewer.set_document(self.document) self.sidebar.load_document(self.document) @@ -108,6 +112,7 @@ class MainWindow(QMainWindow): ) if ok and password: try: + self._clear_session_raster_objects() self.document.open(path, password) self.viewer.set_document(self.document) self.sidebar.load_document(self.document) @@ -123,6 +128,7 @@ class MainWindow(QMainWindow): if not self._ensure_document(): return try: + self._flush_session_raster_objects() self.document.save() self.statusBar().showMessage("已保存", 3000) except Exception as exc: @@ -139,6 +145,7 @@ class MainWindow(QMainWindow): if not selected.lower().endswith(".pdf"): selected += ".pdf" try: + self._flush_session_raster_objects() self.document.save_as(selected) self._remember_file(selected) self._update_title() @@ -184,6 +191,7 @@ class MainWindow(QMainWindow): if not selected.lower().endswith(".pdf"): selected += ".pdf" try: + self._flush_session_raster_objects() self.document.save_encrypted( selected, password, @@ -206,6 +214,7 @@ class MainWindow(QMainWindow): if not selected.lower().endswith(".pdf"): selected += ".pdf" try: + self._flush_session_raster_objects() self.document.save_as(selected) self.statusBar().showMessage("已另存为无密码 PDF", 3000) except Exception as exc: @@ -245,6 +254,7 @@ class MainWindow(QMainWindow): def rotate_page(self) -> None: if not self._ensure_document(): return + self._flush_session_raster_objects() self.document.rotate_page(self.viewer.page_index) self._refresh_document_view() self.statusBar().showMessage("页面已旋转,记得保存", 3000) @@ -263,6 +273,7 @@ class MainWindow(QMainWindow): ) if reply != QMessageBox.StandardButton.Yes: return + self._flush_session_raster_objects() self.document.delete_page(self.viewer.page_index) self.viewer.page_index = min(self.viewer.page_index, self.document.page_count - 1) self._refresh_document_view() @@ -294,6 +305,7 @@ class MainWindow(QMainWindow): ) if not ok: return + self._flush_session_raster_objects() self.document.move_page(source_page - 1, target_page - 1) self.viewer.go_to_page(target_page - 1) self._refresh_document_view() @@ -309,6 +321,7 @@ class MainWindow(QMainWindow): if dialog.exec() != QDialog.DialogCode.Accepted: return try: + self._flush_session_raster_objects() self.document.reorder_pages(dialog.page_order()) self.viewer.page_index = 0 self._refresh_document_view() @@ -339,6 +352,7 @@ class MainWindow(QMainWindow): def insert_blank_page(self) -> None: if not self._ensure_document(): return + self._flush_session_raster_objects() new_index = self.document.insert_blank_page(self.viewer.page_index) self.viewer.go_to_page(new_index) self._refresh_document_view() @@ -353,6 +367,7 @@ class MainWindow(QMainWindow): if not selected: return try: + self._flush_session_raster_objects() count = self.document.insert_pdf(selected, self.viewer.page_index) self._refresh_document_view() self.statusBar().showMessage(f"已插入 {count} 页,记得保存", 3000) @@ -989,6 +1004,7 @@ class MainWindow(QMainWindow): self.sidebar.page_selected.connect(self.viewer.go_to_page) self.viewer.page_changed.connect(self.sidebar.select_page) self.viewer.page_changed.connect(lambda _: self._update_status()) + self.viewer.page_changed.connect(lambda _: self._refresh_session_raster_overlays()) self.viewer.zoom_changed.connect(lambda _: self._update_status()) self.search_box.returnPressed.connect(self.search) self.search_results.itemClicked.connect(self._go_to_search_match) @@ -1052,6 +1068,7 @@ class MainWindow(QMainWindow): self.viewer.set_placement_enabled(False) else: self.selected_annotation = None + self.selected_raster_id = None self.viewer.set_object_edit_enabled(enabled) if enabled: self.statusBar().showMessage("选择对象已启用:点击注释对象后可拖动或拖右下角缩放", 5000) @@ -1059,8 +1076,16 @@ class MainWindow(QMainWindow): self.statusBar().showMessage("选择对象已关闭", 3000) def select_object_at_point(self, page_index: int, point: tuple[float, float]) -> None: + raster = self._session_raster_at_point(page_index, point) + if raster: + self.selected_raster_id = int(raster["id"]) + self.selected_annotation = None + self.viewer.set_selected_object_rect(raster["rect"]) + self.statusBar().showMessage("已选中图片/签名,可拖动、缩放或按 Delete 删除", 5000) + return annotation = self.document.annotation_at_point(page_index, point) self.selected_annotation = annotation + self.selected_raster_id = None self.viewer.set_selected_object_rect(annotation.rect if annotation else None) if annotation: self.statusBar().showMessage("已选中对象,可拖动、缩放或按 Delete 删除", 5000) @@ -1068,6 +1093,15 @@ class MainWindow(QMainWindow): self.statusBar().showMessage("未选中对象", 3000) def update_selected_object_rect(self, page_index: int, rect: tuple[float, float, float, float]) -> None: + if self.selected_raster_id is not None: + raster = self._session_raster_by_id(self.selected_raster_id) + if not raster or int(raster["page_index"]) != page_index: + return + raster["rect"] = rect + self._refresh_session_raster_overlays() + self.viewer.set_selected_object_rect(rect) + self.statusBar().showMessage("图片/签名已调整,保存时会写入 PDF", 3000) + return if not self.selected_annotation or self.selected_annotation.page_index != page_index: return try: @@ -1088,6 +1122,16 @@ class MainWindow(QMainWindow): self.viewer.render() def delete_selected_object(self) -> None: + if self.selected_raster_id is not None: + raster_id = self.selected_raster_id + self.session_raster_objects = [ + item for item in self.session_raster_objects if int(item["id"]) != raster_id + ] + self.selected_raster_id = None + self.viewer.clear_object_selection() + self._refresh_session_raster_overlays() + self.statusBar().showMessage("图片/签名已删除", 3000) + return if not self.selected_annotation: self.statusBar().showMessage("没有选中的对象", 3000) return @@ -1103,10 +1147,17 @@ class MainWindow(QMainWindow): def show_object_context_menu(self, page_index: int, point: tuple[float, float]) -> None: if not self.select_object_action.isChecked(): return - annotation = self.document.annotation_at_point(page_index, point) - if annotation: - self.selected_annotation = annotation - self.viewer.set_selected_object_rect(annotation.rect) + raster = self._session_raster_at_point(page_index, point) + if raster: + self.selected_raster_id = int(raster["id"]) + self.selected_annotation = None + self.viewer.set_selected_object_rect(raster["rect"]) + else: + self.selected_raster_id = None + annotation = self.document.annotation_at_point(page_index, point) + if annotation: + self.selected_annotation = annotation + self.viewer.set_selected_object_rect(annotation.rect) menu = QMenu(self) delete_action = menu.addAction("删除对象") delete_action.setEnabled(self.selected_annotation is not None) @@ -1115,7 +1166,7 @@ class MainWindow(QMainWindow): self.delete_selected_object() def keyPressEvent(self, event) -> None: - if event.key() == Qt.Key.Key_Delete and self.selected_annotation: + if event.key() == Qt.Key.Key_Delete and (self.selected_annotation or self.selected_raster_id is not None): self.delete_selected_object() return super().keyPressEvent(event) @@ -1188,6 +1239,73 @@ class MainWindow(QMainWindow): return self._start_placement({"type": "signature", "path": selected}, "点击页面位置放置签名") + def _add_session_raster_object( + self, + kind: str, + page_index: int, + image_path: str, + point: tuple[float, float] | None = None, + ) -> None: + rect = ( + self.document.signature_rect(page_index, point) + if kind == "signature" + else self.document.image_rect(page_index, point) + ) + item = { + "id": self.next_raster_id, + "type": kind, + "page_index": page_index, + "path": image_path, + "rect": rect, + } + self.next_raster_id += 1 + self.session_raster_objects.append(item) + self.selected_raster_id = int(item["id"]) + self.selected_annotation = None + self.select_object_action.setChecked(True) + self.viewer.set_selected_object_rect(rect) + + def _session_raster_by_id(self, raster_id: int) -> dict[str, object] | None: + for item in self.session_raster_objects: + if int(item["id"]) == raster_id: + return item + return None + + def _session_raster_at_point( + self, + page_index: int, + point: tuple[float, float], + ) -> dict[str, object] | None: + x, y = point + for item in reversed(self.session_raster_objects): + if int(item["page_index"]) != page_index: + continue + x0, y0, x1, y1 = item["rect"] + if float(x0) <= x <= float(x1) and float(y0) <= y <= float(y1): + return item + return None + + def _refresh_session_raster_overlays(self) -> None: + self.viewer.set_overlay_images(self.session_raster_objects) + + def _clear_session_raster_objects(self) -> None: + self.session_raster_objects.clear() + self.selected_raster_id = None + self.selected_annotation = None + self.viewer.set_overlay_images([]) + self.viewer.clear_object_selection() + + def _flush_session_raster_objects(self) -> None: + if not self.session_raster_objects: + return + for item in list(self.session_raster_objects): + rect = item["rect"] + if item["type"] == "signature": + self.document.add_signature_rect(int(item["page_index"]), str(item["path"]), rect) + else: + self.document.insert_image_rect(int(item["page_index"]), str(item["path"]), rect) + self._clear_session_raster_objects() + def _start_placement(self, payload: dict[str, object], message: str) -> None: self.pending_placement = payload self.freehand_action.setChecked(False) @@ -1206,12 +1324,13 @@ class MainWindow(QMainWindow): 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) + self._add_session_raster_object("image", page_index, str(payload["path"]), point) elif kind == "signature": - self.document.add_signature(page_index, str(payload["path"]), point) + self._add_session_raster_object("signature", page_index, str(payload["path"]), point) else: raise ValueError("未知的放置类型") self.viewer.render() + self._refresh_session_raster_overlays() self.statusBar().showMessage("已放置,记得保存", 3000) except Exception as exc: QMessageBox.critical(self, "放置失败", f"无法放置内容:\n{exc}") @@ -1225,8 +1344,8 @@ class MainWindow(QMainWindow): if not selected: return try: - self.document.insert_image(self.viewer.page_index, selected) - self.viewer.render() + self._add_session_raster_object("image", self.viewer.page_index, selected) + self._refresh_session_raster_overlays() self.statusBar().showMessage("图片已插入,记得保存", 3000) except Exception as exc: QMessageBox.critical(self, "插入失败", f"无法插入图片:\n{exc}") @@ -1243,8 +1362,8 @@ class MainWindow(QMainWindow): if not selected: return try: - self.document.add_signature(self.viewer.page_index, selected) - self.viewer.render() + self._add_session_raster_object("signature", self.viewer.page_index, selected) + self._refresh_session_raster_overlays() self.statusBar().showMessage("签名图片已放置,记得保存", 3000) except Exception as exc: QMessageBox.critical(self, "签名失败", f"无法添加签名:\n{exc}") @@ -1258,8 +1377,8 @@ class MainWindow(QMainWindow): signature_path = Path(self.settings.fileName()).parent / "last_signature.png" dialog.save_signature(signature_path) try: - self.document.add_signature(self.viewer.page_index, signature_path) - self.viewer.render() + self._add_session_raster_object("signature", self.viewer.page_index, str(signature_path)) + self._refresh_session_raster_overlays() self.statusBar().showMessage("手写签名已放置,记得保存", 3000) except Exception as exc: QMessageBox.critical(self, "签名失败", f"无法添加手写签名:\n{exc}") @@ -1339,6 +1458,7 @@ class MainWindow(QMainWindow): def _refresh_document_view(self) -> None: self.viewer.render() + self._refresh_session_raster_overlays() self.sidebar.load_document(self.document) self.sidebar.select_page(self.viewer.page_index) self._update_status() diff --git a/pdfreaderlite/ui/pdf_viewer.py b/pdfreaderlite/ui/pdf_viewer.py index 470263b..e57aa65 100644 --- a/pdfreaderlite/ui/pdf_viewer.py +++ b/pdfreaderlite/ui/pdf_viewer.py @@ -20,6 +20,7 @@ class PageLabel(QLabel): self.placement_enabled = False self.object_edit_enabled = False self.selected_rect: QRectF | None = None + self.overlay_images: list[dict[str, object]] = [] self._drawing = False self._stroke: list[QPointF] = [] self._dragging_object = False @@ -101,6 +102,18 @@ class PageLabel(QLabel): super().paintEvent(event) painter = QPainter(self) painter.setRenderHint(QPainter.RenderHint.Antialiasing) + for overlay in self.overlay_images: + pixmap = QPixmap(str(overlay["path"])) + if pixmap.isNull(): + continue + x0, y0, x1, y1 = overlay["rect"] + target = QRectF( + float(x0) * float(overlay["zoom"]), + float(y0) * float(overlay["zoom"]), + (float(x1) - float(x0)) * float(overlay["zoom"]), + (float(y1) - float(y0)) * float(overlay["zoom"]), + ) + painter.drawPixmap(target, pixmap, pixmap.rect()) if self.selected_rect: painter.setPen(QPen(Qt.GlobalColor.blue, 2, Qt.PenStyle.DashLine)) painter.drawRect(self.selected_rect) @@ -167,6 +180,7 @@ class PdfViewer(QScrollArea): self.page_label.setPixmap(QPixmap.fromImage(image)) self.page_label.setStyleSheet("QLabel { background: #f4f4f4; color: #575757; padding: 0; }") self.page_label.adjustSize() + self._refresh_overlay_zoom() self.page_label.update() self.page_changed.emit(self.page_index) self.zoom_changed.emit(self.zoom) @@ -236,6 +250,14 @@ class PdfViewer(QScrollArea): ) self.page_label.update() + def set_overlay_images(self, overlays: list[dict[str, object]]) -> None: + self.page_label.overlay_images = [ + {**overlay, "zoom": self.zoom} + for overlay in overlays + if int(overlay["page_index"]) == self.page_index + ] + self.page_label.update() + def clear_object_selection(self) -> None: self.page_label.selected_rect = None self.page_label.update() @@ -278,3 +300,7 @@ class PdfViewer(QScrollArea): def _emit_object_context(self, point: QPointF) -> None: self.object_context_requested.emit(self.page_index, (point.x() / self.zoom, point.y() / self.zoom)) + + def _refresh_overlay_zoom(self) -> None: + for overlay in self.page_label.overlay_images: + overlay["zoom"] = self.zoom diff --git a/scripts/smoke_test.py b/scripts/smoke_test.py index 5ad2b9c..8d84794 100644 --- a/scripts/smoke_test.py +++ b/scripts/smoke_test.py @@ -85,8 +85,10 @@ def main() -> int: assert document.update_annotation_rect(0, selected.xref, (x0 + 10, y0 + 10, x1 + 30, y1 + 30)) document.insert_image(0, image_path) document.insert_image(0, image_path, (180, 200)) + document.insert_image_rect(0, image_path, (220, 120, 280, 170)) document.add_signature(0, image_path) document.add_signature(0, image_path, (220, 260)) + document.add_signature_rect(0, image_path, (300, 220, 370, 260)) document.add_rectangle(0) document.add_circle(0) document.add_line(0)