Add annotation object selection editing
This commit is contained in:
@@ -48,6 +48,7 @@ PDFReaderLite 是一个面向 Windows 的轻量 PDF 阅读与编辑工具,目
|
|||||||
- 页面自由画笔
|
- 页面自由画笔
|
||||||
- 手写签名
|
- 手写签名
|
||||||
- 点击页面放置文本、图片、签名
|
- 点击页面放置文本、图片、签名
|
||||||
|
- 选择对象、拖动、右下角缩放、Delete/右键删除注释对象
|
||||||
- 加密 PDF 权限选项
|
- 加密 PDF 权限选项
|
||||||
- 页面渲染缓存
|
- 页面渲染缓存
|
||||||
- 分批加载缩略图
|
- 分批加载缩略图
|
||||||
|
|||||||
@@ -32,7 +32,7 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重
|
|||||||
- 矩形、圆形、线条、箭头
|
- 矩形、圆形、线条、箭头
|
||||||
- 注释列表(已完成)
|
- 注释列表(已完成)
|
||||||
- 删除注释(已完成)
|
- 删除注释(已完成)
|
||||||
- 移动、缩放、删除新增对象(待开发;当前已完成鼠标点击放置)
|
- 移动、缩放、删除新增对象(已完成注释对象选择、拖动、右下角缩放、Delete/右键删除;图片/签名按稳定路线保存后固化)
|
||||||
- 遮盖区域
|
- 遮盖区域
|
||||||
- 插入空白页
|
- 插入空白页
|
||||||
- 插入其他 PDF 页面
|
- 插入其他 PDF 页面
|
||||||
@@ -46,8 +46,8 @@ PDFReaderLite 是 Windows 平台的轻量 PDF 阅读与编辑工具。功能重
|
|||||||
- 填写已有 PDF 表单(已完成基础字段填写)
|
- 填写已有 PDF 表单(已完成基础字段填写)
|
||||||
- 基础文本框、复选框、单选按钮
|
- 基础文本框、复选框、单选按钮
|
||||||
- 手写签名(已完成)
|
- 手写签名(已完成)
|
||||||
- 图片签名(已完成基础放置与鼠标点击放置)
|
- 图片签名(已完成基础放置与鼠标点击放置;保存后固化进 PDF)
|
||||||
- 签名拖拽移动/缩放(待开发)
|
- 签名拖拽移动/缩放(采用当前会话调整层,待继续完善)
|
||||||
- 导出页面为图片(已完成)
|
- 导出页面为图片(已完成)
|
||||||
- 导出指定页面(已完成)
|
- 导出指定页面(已完成)
|
||||||
- 图片转 PDF(已完成)
|
- 图片转 PDF(已完成)
|
||||||
|
|||||||
@@ -29,6 +29,7 @@ class AnnotationInfo:
|
|||||||
xref: int
|
xref: int
|
||||||
annotation_type: str
|
annotation_type: str
|
||||||
content: str
|
content: str
|
||||||
|
rect: tuple[float, float, float, float] | None = None
|
||||||
|
|
||||||
|
|
||||||
class EncryptedPdfError(RuntimeError):
|
class EncryptedPdfError(RuntimeError):
|
||||||
@@ -189,8 +190,22 @@ class PdfDocument:
|
|||||||
) -> None:
|
) -> None:
|
||||||
self.snapshot()
|
self.snapshot()
|
||||||
page = self._page(page_index)
|
page = self._page(page_index)
|
||||||
text_point = fitz.Point(*(point or (72, 96)))
|
x0, y0 = point or (72, 96)
|
||||||
page.insert_text(text_point, text, fontsize=14, fontname="china-s", color=(0, 0, 0))
|
line_count = max(1, len(text.splitlines()))
|
||||||
|
max_line = max((len(line) for line in text.splitlines()), default=len(text))
|
||||||
|
width = max(160, min(page.rect.width - x0 - 24, max_line * 10 + 32))
|
||||||
|
height = max(42, line_count * 22 + 20)
|
||||||
|
rect = fitz.Rect(x0, y0, x0 + width, y0 + height)
|
||||||
|
annot = page.add_freetext_annot(
|
||||||
|
rect,
|
||||||
|
text,
|
||||||
|
fontsize=14,
|
||||||
|
fontname="china-s",
|
||||||
|
text_color=(0, 0, 0),
|
||||||
|
border_width=0,
|
||||||
|
)
|
||||||
|
annot.set_info(content=text)
|
||||||
|
annot.update()
|
||||||
self.mark_changed()
|
self.mark_changed()
|
||||||
|
|
||||||
def insert_image(
|
def insert_image(
|
||||||
@@ -443,11 +458,65 @@ class PdfDocument:
|
|||||||
xref=annot.xref,
|
xref=annot.xref,
|
||||||
annotation_type=annot.type[1],
|
annotation_type=annot.type[1],
|
||||||
content=content,
|
content=content,
|
||||||
|
rect=self._rect_tuple(annot.rect),
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
annot = annot.next
|
annot = annot.next
|
||||||
return items
|
return items
|
||||||
|
|
||||||
|
def annotation_at_point(
|
||||||
|
self,
|
||||||
|
page_index: int,
|
||||||
|
point: tuple[float, float],
|
||||||
|
) -> AnnotationInfo | None:
|
||||||
|
page = self._page(page_index)
|
||||||
|
hit = fitz.Point(*point)
|
||||||
|
matches: list[AnnotationInfo] = []
|
||||||
|
annot = page.first_annot
|
||||||
|
while annot:
|
||||||
|
if annot.rect.contains(hit):
|
||||||
|
content = annot.info.get("content", "") if annot.info else ""
|
||||||
|
matches.append(
|
||||||
|
AnnotationInfo(
|
||||||
|
page_index=page_index,
|
||||||
|
xref=annot.xref,
|
||||||
|
annotation_type=annot.type[1],
|
||||||
|
content=content,
|
||||||
|
rect=self._rect_tuple(annot.rect),
|
||||||
|
)
|
||||||
|
)
|
||||||
|
annot = annot.next
|
||||||
|
return matches[-1] if matches else None
|
||||||
|
|
||||||
|
def annotation_rect(self, page_index: int, xref: int) -> tuple[float, float, float, float] | None:
|
||||||
|
annot = self._annotation(page_index, xref)
|
||||||
|
return self._rect_tuple(annot.rect) if annot else None
|
||||||
|
|
||||||
|
def update_annotation_rect(
|
||||||
|
self,
|
||||||
|
page_index: int,
|
||||||
|
xref: int,
|
||||||
|
rect: tuple[float, float, float, float],
|
||||||
|
) -> bool:
|
||||||
|
annot = self._annotation(page_index, xref)
|
||||||
|
if not annot:
|
||||||
|
return False
|
||||||
|
x0, y0, x1, y1 = rect
|
||||||
|
if x1 - x0 < 12 or y1 - y0 < 12:
|
||||||
|
return False
|
||||||
|
self.snapshot()
|
||||||
|
annot.set_rect(fitz.Rect(x0, y0, x1, y1))
|
||||||
|
annot.update()
|
||||||
|
self.mark_changed()
|
||||||
|
return True
|
||||||
|
|
||||||
|
def move_annotation(self, page_index: int, xref: int, dx: float, dy: float) -> bool:
|
||||||
|
annot = self._annotation(page_index, xref)
|
||||||
|
if not annot:
|
||||||
|
return False
|
||||||
|
rect = annot.rect + (dx, dy, dx, dy)
|
||||||
|
return self.update_annotation_rect(page_index, xref, self._rect_tuple(rect))
|
||||||
|
|
||||||
def delete_annotation(self, page_index: int, xref: int) -> bool:
|
def delete_annotation(self, page_index: int, xref: int) -> bool:
|
||||||
page = self._page(page_index)
|
page = self._page(page_index)
|
||||||
annot = page.first_annot
|
annot = page.first_annot
|
||||||
@@ -612,6 +681,15 @@ class PdfDocument:
|
|||||||
raise IndexError("页码超出范围")
|
raise IndexError("页码超出范围")
|
||||||
return self._doc.load_page(page_index)
|
return self._doc.load_page(page_index)
|
||||||
|
|
||||||
|
def _annotation(self, page_index: int, xref: int):
|
||||||
|
page = self._page(page_index)
|
||||||
|
annot = page.first_annot
|
||||||
|
while annot:
|
||||||
|
if annot.xref == xref:
|
||||||
|
return annot
|
||||||
|
annot = annot.next
|
||||||
|
return None
|
||||||
|
|
||||||
def mark_changed(self) -> None:
|
def mark_changed(self) -> None:
|
||||||
self._revision += 1
|
self._revision += 1
|
||||||
self.clear_cache()
|
self.clear_cache()
|
||||||
@@ -679,3 +757,7 @@ class PdfDocument:
|
|||||||
x0 = max(36, page.rect.width * 0.12)
|
x0 = max(36, page.rect.width * 0.12)
|
||||||
y0 = max(36, page.rect.height * 0.16)
|
y0 = max(36, page.rect.height * 0.16)
|
||||||
return fitz.Rect(x0, y0, x0 + width, y0 + height)
|
return fitz.Rect(x0, y0, x0 + width, y0 + height)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def _rect_tuple(rect: fitz.Rect) -> tuple[float, float, float, float]:
|
||||||
|
return (float(rect.x0), float(rect.y0), float(rect.x1), float(rect.y1))
|
||||||
|
|||||||
@@ -18,6 +18,7 @@ from PySide6.QtWidgets import (
|
|||||||
QListWidget,
|
QListWidget,
|
||||||
QListWidgetItem,
|
QListWidgetItem,
|
||||||
QMainWindow,
|
QMainWindow,
|
||||||
|
QMenu,
|
||||||
QMessageBox,
|
QMessageBox,
|
||||||
QSplitter,
|
QSplitter,
|
||||||
QStatusBar,
|
QStatusBar,
|
||||||
@@ -30,7 +31,7 @@ from pdfreaderlite.core.file_association import (
|
|||||||
register_pdf_association,
|
register_pdf_association,
|
||||||
unregister_pdf_association,
|
unregister_pdf_association,
|
||||||
)
|
)
|
||||||
from pdfreaderlite.core.document import EncryptedPdfError, FormField, PdfDocument, SearchMatch
|
from pdfreaderlite.core.document import AnnotationInfo, EncryptedPdfError, FormField, PdfDocument, SearchMatch
|
||||||
from pdfreaderlite.resources import pdf_icon_path, software_icon_path
|
from pdfreaderlite.resources import pdf_icon_path, software_icon_path
|
||||||
from pdfreaderlite.ui.page_manager import PageManagerDialog
|
from pdfreaderlite.ui.page_manager import PageManagerDialog
|
||||||
from pdfreaderlite.ui.pdf_viewer import PdfViewer
|
from pdfreaderlite.ui.pdf_viewer import PdfViewer
|
||||||
@@ -53,6 +54,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.search_results = QListWidget()
|
self.search_results = QListWidget()
|
||||||
self.right_tools = RightToolsPanel(self.search_box, self.search_results)
|
self.right_tools = RightToolsPanel(self.search_box, self.search_results)
|
||||||
self.pending_placement: dict[str, object] | None = None
|
self.pending_placement: dict[str, object] | None = None
|
||||||
|
self.selected_annotation: AnnotationInfo | None = None
|
||||||
|
|
||||||
self._build_window()
|
self._build_window()
|
||||||
self._build_actions()
|
self._build_actions()
|
||||||
@@ -709,6 +711,9 @@ 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.select_object_action = QAction("选择对象", self)
|
||||||
|
self.select_object_action.setCheckable(True)
|
||||||
|
self.select_object_action.setShortcut(QKeySequence("V"))
|
||||||
self.freehand_action = QAction("自由画笔", self)
|
self.freehand_action = QAction("自由画笔", self)
|
||||||
self.freehand_action.setCheckable(True)
|
self.freehand_action.setCheckable(True)
|
||||||
self.add_text_action = QAction("添加文本", self)
|
self.add_text_action = QAction("添加文本", self)
|
||||||
@@ -781,6 +786,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.select_object_action)
|
||||||
edit_menu.addAction(self.freehand_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.place_text_action)
|
edit_menu.addAction(self.place_text_action)
|
||||||
@@ -824,6 +830,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.underline_action,
|
self.underline_action,
|
||||||
self.strikeout_action,
|
self.strikeout_action,
|
||||||
self.note_action,
|
self.note_action,
|
||||||
|
self.select_object_action,
|
||||||
self.freehand_action,
|
self.freehand_action,
|
||||||
self.rectangle_action,
|
self.rectangle_action,
|
||||||
self.circle_action,
|
self.circle_action,
|
||||||
@@ -901,6 +908,7 @@ class MainWindow(QMainWindow):
|
|||||||
self.underline_action,
|
self.underline_action,
|
||||||
self.strikeout_action,
|
self.strikeout_action,
|
||||||
self.note_action,
|
self.note_action,
|
||||||
|
self.select_object_action,
|
||||||
self.freehand_action,
|
self.freehand_action,
|
||||||
self.add_text_action,
|
self.add_text_action,
|
||||||
self.place_text_action,
|
self.place_text_action,
|
||||||
@@ -962,6 +970,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.select_object_action.toggled.connect(self.toggle_object_selection)
|
||||||
self.freehand_action.toggled.connect(self.toggle_freehand_drawing)
|
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.place_text_action.triggered.connect(self.prepare_place_text)
|
self.place_text_action.triggered.connect(self.prepare_place_text)
|
||||||
@@ -985,6 +994,9 @@ class MainWindow(QMainWindow):
|
|||||||
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)
|
self.viewer.ink_stroke_finished.connect(self.add_ink_stroke)
|
||||||
self.viewer.placement_requested.connect(self.place_pending_object)
|
self.viewer.placement_requested.connect(self.place_pending_object)
|
||||||
|
self.viewer.object_select_requested.connect(self.select_object_at_point)
|
||||||
|
self.viewer.object_rect_changed.connect(self.update_selected_object_rect)
|
||||||
|
self.viewer.object_context_requested.connect(self.show_object_context_menu)
|
||||||
|
|
||||||
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)
|
||||||
@@ -1030,6 +1042,84 @@ class MainWindow(QMainWindow):
|
|||||||
self.viewer.render()
|
self.viewer.render()
|
||||||
self.statusBar().showMessage("批注已添加,记得保存", 3000)
|
self.statusBar().showMessage("批注已添加,记得保存", 3000)
|
||||||
|
|
||||||
|
def toggle_object_selection(self, enabled: bool) -> None:
|
||||||
|
if enabled and not self._ensure_document():
|
||||||
|
self.select_object_action.setChecked(False)
|
||||||
|
return
|
||||||
|
if enabled:
|
||||||
|
self.pending_placement = None
|
||||||
|
self.freehand_action.setChecked(False)
|
||||||
|
self.viewer.set_placement_enabled(False)
|
||||||
|
else:
|
||||||
|
self.selected_annotation = None
|
||||||
|
self.viewer.set_object_edit_enabled(enabled)
|
||||||
|
if enabled:
|
||||||
|
self.statusBar().showMessage("选择对象已启用:点击注释对象后可拖动或拖右下角缩放", 5000)
|
||||||
|
else:
|
||||||
|
self.statusBar().showMessage("选择对象已关闭", 3000)
|
||||||
|
|
||||||
|
def select_object_at_point(self, page_index: int, point: tuple[float, float]) -> None:
|
||||||
|
annotation = self.document.annotation_at_point(page_index, point)
|
||||||
|
self.selected_annotation = annotation
|
||||||
|
self.viewer.set_selected_object_rect(annotation.rect if annotation else None)
|
||||||
|
if annotation:
|
||||||
|
self.statusBar().showMessage("已选中对象,可拖动、缩放或按 Delete 删除", 5000)
|
||||||
|
else:
|
||||||
|
self.statusBar().showMessage("未选中对象", 3000)
|
||||||
|
|
||||||
|
def update_selected_object_rect(self, page_index: int, rect: tuple[float, float, float, float]) -> None:
|
||||||
|
if not self.selected_annotation or self.selected_annotation.page_index != page_index:
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
if self.document.update_annotation_rect(page_index, self.selected_annotation.xref, rect):
|
||||||
|
updated_rect = self.document.annotation_rect(page_index, self.selected_annotation.xref)
|
||||||
|
self.selected_annotation = AnnotationInfo(
|
||||||
|
page_index=page_index,
|
||||||
|
xref=self.selected_annotation.xref,
|
||||||
|
annotation_type=self.selected_annotation.annotation_type,
|
||||||
|
content=self.selected_annotation.content,
|
||||||
|
rect=updated_rect,
|
||||||
|
)
|
||||||
|
self.viewer.render()
|
||||||
|
self.viewer.set_selected_object_rect(updated_rect)
|
||||||
|
self.statusBar().showMessage("对象已更新,记得保存", 3000)
|
||||||
|
except Exception as exc:
|
||||||
|
QMessageBox.critical(self, "对象更新失败", f"无法更新对象:\n{exc}")
|
||||||
|
self.viewer.render()
|
||||||
|
|
||||||
|
def delete_selected_object(self) -> None:
|
||||||
|
if not self.selected_annotation:
|
||||||
|
self.statusBar().showMessage("没有选中的对象", 3000)
|
||||||
|
return
|
||||||
|
try:
|
||||||
|
if self.document.delete_annotation(self.selected_annotation.page_index, self.selected_annotation.xref):
|
||||||
|
self.selected_annotation = None
|
||||||
|
self.viewer.clear_object_selection()
|
||||||
|
self.viewer.render()
|
||||||
|
self.statusBar().showMessage("对象已删除,记得保存", 3000)
|
||||||
|
except Exception as exc:
|
||||||
|
QMessageBox.critical(self, "删除失败", f"无法删除对象:\n{exc}")
|
||||||
|
|
||||||
|
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)
|
||||||
|
menu = QMenu(self)
|
||||||
|
delete_action = menu.addAction("删除对象")
|
||||||
|
delete_action.setEnabled(self.selected_annotation is not None)
|
||||||
|
chosen = menu.exec(self.cursor().pos())
|
||||||
|
if chosen == delete_action:
|
||||||
|
self.delete_selected_object()
|
||||||
|
|
||||||
|
def keyPressEvent(self, event) -> None:
|
||||||
|
if event.key() == Qt.Key.Key_Delete and self.selected_annotation:
|
||||||
|
self.delete_selected_object()
|
||||||
|
return
|
||||||
|
super().keyPressEvent(event)
|
||||||
|
|
||||||
def toggle_freehand_drawing(self, enabled: bool) -> None:
|
def toggle_freehand_drawing(self, enabled: bool) -> None:
|
||||||
if enabled and not self._ensure_document():
|
if enabled and not self._ensure_document():
|
||||||
self.freehand_action.setChecked(False)
|
self.freehand_action.setChecked(False)
|
||||||
@@ -1037,6 +1127,7 @@ class MainWindow(QMainWindow):
|
|||||||
if enabled:
|
if enabled:
|
||||||
self.pending_placement = None
|
self.pending_placement = None
|
||||||
self.viewer.set_placement_enabled(False)
|
self.viewer.set_placement_enabled(False)
|
||||||
|
self.select_object_action.setChecked(False)
|
||||||
self.viewer.set_drawing_enabled(enabled)
|
self.viewer.set_drawing_enabled(enabled)
|
||||||
if enabled:
|
if enabled:
|
||||||
self.statusBar().showMessage("自由画笔已启用:在页面上按住鼠标绘制", 5000)
|
self.statusBar().showMessage("自由画笔已启用:在页面上按住鼠标绘制", 5000)
|
||||||
@@ -1100,6 +1191,7 @@ class MainWindow(QMainWindow):
|
|||||||
def _start_placement(self, payload: dict[str, object], message: str) -> None:
|
def _start_placement(self, payload: dict[str, object], message: str) -> None:
|
||||||
self.pending_placement = payload
|
self.pending_placement = payload
|
||||||
self.freehand_action.setChecked(False)
|
self.freehand_action.setChecked(False)
|
||||||
|
self.select_object_action.setChecked(False)
|
||||||
self.viewer.set_placement_enabled(True)
|
self.viewer.set_placement_enabled(True)
|
||||||
self.statusBar().showMessage(message, 5000)
|
self.statusBar().showMessage(message, 5000)
|
||||||
|
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from PySide6.QtCore import QPointF, Qt, Signal
|
from PySide6.QtCore import QPointF, QRectF, Qt, Signal
|
||||||
from PySide6.QtGui import QMouseEvent, QPainter, QPen, QPixmap
|
from PySide6.QtGui import QContextMenuEvent, 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
|
||||||
@@ -10,18 +10,40 @@ from pdfreaderlite.core.document import PdfDocument
|
|||||||
class PageLabel(QLabel):
|
class PageLabel(QLabel):
|
||||||
stroke_finished = Signal(list)
|
stroke_finished = Signal(list)
|
||||||
placement_requested = Signal(QPointF)
|
placement_requested = Signal(QPointF)
|
||||||
|
object_select_requested = Signal(QPointF)
|
||||||
|
object_rect_changed = Signal(QRectF)
|
||||||
|
object_context_requested = Signal(QPointF)
|
||||||
|
|
||||||
def __init__(self, text: str) -> None:
|
def __init__(self, text: str) -> None:
|
||||||
super().__init__(text)
|
super().__init__(text)
|
||||||
self.drawing_enabled = False
|
self.drawing_enabled = False
|
||||||
self.placement_enabled = False
|
self.placement_enabled = False
|
||||||
|
self.object_edit_enabled = False
|
||||||
|
self.selected_rect: QRectF | None = None
|
||||||
self._drawing = False
|
self._drawing = False
|
||||||
self._stroke: list[QPointF] = []
|
self._stroke: list[QPointF] = []
|
||||||
|
self._dragging_object = False
|
||||||
|
self._resizing_object = False
|
||||||
|
self._drag_start = QPointF()
|
||||||
|
self._drag_origin_rect = QRectF()
|
||||||
|
|
||||||
def mousePressEvent(self, event: QMouseEvent) -> None:
|
def mousePressEvent(self, event: QMouseEvent) -> None:
|
||||||
if self.placement_enabled and event.button() == Qt.MouseButton.LeftButton:
|
if self.placement_enabled and event.button() == Qt.MouseButton.LeftButton:
|
||||||
self.placement_requested.emit(event.position())
|
self.placement_requested.emit(event.position())
|
||||||
return
|
return
|
||||||
|
if self.object_edit_enabled and event.button() == Qt.MouseButton.LeftButton:
|
||||||
|
if self.selected_rect and self._resize_handle_rect().contains(event.position()):
|
||||||
|
self._resizing_object = True
|
||||||
|
self._drag_start = event.position()
|
||||||
|
self._drag_origin_rect = QRectF(self.selected_rect)
|
||||||
|
return
|
||||||
|
if self.selected_rect and self.selected_rect.contains(event.position()):
|
||||||
|
self._dragging_object = True
|
||||||
|
self._drag_start = event.position()
|
||||||
|
self._drag_origin_rect = QRectF(self.selected_rect)
|
||||||
|
return
|
||||||
|
self.object_select_requested.emit(event.position())
|
||||||
|
return
|
||||||
if self.drawing_enabled and event.button() == Qt.MouseButton.LeftButton:
|
if self.drawing_enabled and event.button() == Qt.MouseButton.LeftButton:
|
||||||
self._drawing = True
|
self._drawing = True
|
||||||
self._stroke = [event.position()]
|
self._stroke = [event.position()]
|
||||||
@@ -30,6 +52,19 @@ class PageLabel(QLabel):
|
|||||||
super().mousePressEvent(event)
|
super().mousePressEvent(event)
|
||||||
|
|
||||||
def mouseMoveEvent(self, event: QMouseEvent) -> None:
|
def mouseMoveEvent(self, event: QMouseEvent) -> None:
|
||||||
|
if self._dragging_object and self.selected_rect:
|
||||||
|
delta = event.position() - self._drag_start
|
||||||
|
self.selected_rect = self._drag_origin_rect.translated(delta)
|
||||||
|
self.update()
|
||||||
|
return
|
||||||
|
if self._resizing_object and self.selected_rect:
|
||||||
|
rect = QRectF(self._drag_origin_rect)
|
||||||
|
bottom_right = self._drag_origin_rect.bottomRight() + (event.position() - self._drag_start)
|
||||||
|
rect.setBottomRight(bottom_right)
|
||||||
|
if rect.width() >= 12 and rect.height() >= 12:
|
||||||
|
self.selected_rect = rect.normalized()
|
||||||
|
self.update()
|
||||||
|
return
|
||||||
if self._drawing:
|
if self._drawing:
|
||||||
self._stroke.append(event.position())
|
self._stroke.append(event.position())
|
||||||
self.update()
|
self.update()
|
||||||
@@ -37,6 +72,16 @@ class PageLabel(QLabel):
|
|||||||
super().mouseMoveEvent(event)
|
super().mouseMoveEvent(event)
|
||||||
|
|
||||||
def mouseReleaseEvent(self, event: QMouseEvent) -> None:
|
def mouseReleaseEvent(self, event: QMouseEvent) -> None:
|
||||||
|
if self._dragging_object and event.button() == Qt.MouseButton.LeftButton:
|
||||||
|
self._dragging_object = False
|
||||||
|
if self.selected_rect:
|
||||||
|
self.object_rect_changed.emit(self.selected_rect)
|
||||||
|
return
|
||||||
|
if self._resizing_object and event.button() == Qt.MouseButton.LeftButton:
|
||||||
|
self._resizing_object = False
|
||||||
|
if self.selected_rect:
|
||||||
|
self.object_rect_changed.emit(self.selected_rect)
|
||||||
|
return
|
||||||
if self._drawing and event.button() == Qt.MouseButton.LeftButton:
|
if self._drawing and event.button() == Qt.MouseButton.LeftButton:
|
||||||
self._drawing = False
|
self._drawing = False
|
||||||
if len(self._stroke) > 1:
|
if len(self._stroke) > 1:
|
||||||
@@ -46,15 +91,35 @@ class PageLabel(QLabel):
|
|||||||
return
|
return
|
||||||
super().mouseReleaseEvent(event)
|
super().mouseReleaseEvent(event)
|
||||||
|
|
||||||
|
def contextMenuEvent(self, event: QContextMenuEvent) -> None:
|
||||||
|
if self.object_edit_enabled:
|
||||||
|
self.object_context_requested.emit(QPointF(event.pos()))
|
||||||
|
return
|
||||||
|
super().contextMenuEvent(event)
|
||||||
|
|
||||||
def paintEvent(self, event) -> None:
|
def paintEvent(self, event) -> None:
|
||||||
super().paintEvent(event)
|
super().paintEvent(event)
|
||||||
if not self._stroke:
|
|
||||||
return
|
|
||||||
painter = QPainter(self)
|
painter = QPainter(self)
|
||||||
painter.setRenderHint(QPainter.RenderHint.Antialiasing)
|
painter.setRenderHint(QPainter.RenderHint.Antialiasing)
|
||||||
painter.setPen(QPen(Qt.GlobalColor.black, 2, Qt.PenStyle.SolidLine, Qt.PenCapStyle.RoundCap))
|
if self.selected_rect:
|
||||||
for index in range(1, len(self._stroke)):
|
painter.setPen(QPen(Qt.GlobalColor.blue, 2, Qt.PenStyle.DashLine))
|
||||||
painter.drawLine(self._stroke[index - 1], self._stroke[index])
|
painter.drawRect(self.selected_rect)
|
||||||
|
painter.fillRect(self._resize_handle_rect(), Qt.GlobalColor.blue)
|
||||||
|
if self._stroke:
|
||||||
|
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])
|
||||||
|
|
||||||
|
def _resize_handle_rect(self) -> QRectF:
|
||||||
|
if not self.selected_rect:
|
||||||
|
return QRectF()
|
||||||
|
size = 10
|
||||||
|
return QRectF(
|
||||||
|
self.selected_rect.right() - size,
|
||||||
|
self.selected_rect.bottom() - size,
|
||||||
|
size,
|
||||||
|
size,
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class PdfViewer(QScrollArea):
|
class PdfViewer(QScrollArea):
|
||||||
@@ -62,6 +127,9 @@ class PdfViewer(QScrollArea):
|
|||||||
zoom_changed = Signal(float)
|
zoom_changed = Signal(float)
|
||||||
ink_stroke_finished = Signal(int, list)
|
ink_stroke_finished = Signal(int, list)
|
||||||
placement_requested = Signal(int, tuple)
|
placement_requested = Signal(int, tuple)
|
||||||
|
object_select_requested = Signal(int, tuple)
|
||||||
|
object_rect_changed = Signal(int, tuple)
|
||||||
|
object_context_requested = Signal(int, tuple)
|
||||||
|
|
||||||
def __init__(self) -> None:
|
def __init__(self) -> None:
|
||||||
super().__init__()
|
super().__init__()
|
||||||
@@ -81,6 +149,9 @@ class PdfViewer(QScrollArea):
|
|||||||
self.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
self.setAlignment(Qt.AlignmentFlag.AlignCenter)
|
||||||
self.page_label.stroke_finished.connect(self._emit_ink_stroke)
|
self.page_label.stroke_finished.connect(self._emit_ink_stroke)
|
||||||
self.page_label.placement_requested.connect(self._emit_placement)
|
self.page_label.placement_requested.connect(self._emit_placement)
|
||||||
|
self.page_label.object_select_requested.connect(self._emit_object_select)
|
||||||
|
self.page_label.object_rect_changed.connect(self._emit_object_rect_changed)
|
||||||
|
self.page_label.object_context_requested.connect(self._emit_object_context)
|
||||||
|
|
||||||
def set_document(self, document: PdfDocument) -> None:
|
def set_document(self, document: PdfDocument) -> None:
|
||||||
self.document = document
|
self.document = document
|
||||||
@@ -96,6 +167,7 @@ class PdfViewer(QScrollArea):
|
|||||||
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.setStyleSheet("QLabel { background: #f4f4f4; color: #575757; padding: 0; }")
|
||||||
self.page_label.adjustSize()
|
self.page_label.adjustSize()
|
||||||
|
self.page_label.update()
|
||||||
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)
|
||||||
|
|
||||||
@@ -134,11 +206,40 @@ class PdfViewer(QScrollArea):
|
|||||||
def set_placement_enabled(self, enabled: bool) -> None:
|
def set_placement_enabled(self, enabled: bool) -> None:
|
||||||
if enabled:
|
if enabled:
|
||||||
self.page_label.drawing_enabled = False
|
self.page_label.drawing_enabled = False
|
||||||
|
self.set_object_edit_enabled(False)
|
||||||
self.page_label.placement_enabled = enabled
|
self.page_label.placement_enabled = enabled
|
||||||
cursor = Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor
|
cursor = Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor
|
||||||
self.viewport().setCursor(cursor)
|
self.viewport().setCursor(cursor)
|
||||||
self.page_label.setCursor(cursor)
|
self.page_label.setCursor(cursor)
|
||||||
|
|
||||||
|
def set_object_edit_enabled(self, enabled: bool) -> None:
|
||||||
|
if enabled:
|
||||||
|
self.page_label.drawing_enabled = False
|
||||||
|
self.page_label.placement_enabled = False
|
||||||
|
else:
|
||||||
|
self.clear_object_selection()
|
||||||
|
self.page_label.object_edit_enabled = enabled
|
||||||
|
cursor = Qt.CursorShape.SizeAllCursor if enabled else Qt.CursorShape.ArrowCursor
|
||||||
|
self.viewport().setCursor(cursor)
|
||||||
|
self.page_label.setCursor(cursor)
|
||||||
|
|
||||||
|
def set_selected_object_rect(self, rect: tuple[float, float, float, float] | None) -> None:
|
||||||
|
if not rect:
|
||||||
|
self.clear_object_selection()
|
||||||
|
return
|
||||||
|
x0, y0, x1, y1 = rect
|
||||||
|
self.page_label.selected_rect = QRectF(
|
||||||
|
x0 * self.zoom,
|
||||||
|
y0 * self.zoom,
|
||||||
|
(x1 - x0) * self.zoom,
|
||||||
|
(y1 - y0) * self.zoom,
|
||||||
|
)
|
||||||
|
self.page_label.update()
|
||||||
|
|
||||||
|
def clear_object_selection(self) -> None:
|
||||||
|
self.page_label.selected_rect = None
|
||||||
|
self.page_label.update()
|
||||||
|
|
||||||
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
|
||||||
@@ -160,3 +261,20 @@ class PdfViewer(QScrollArea):
|
|||||||
|
|
||||||
def _emit_placement(self, point: QPointF) -> None:
|
def _emit_placement(self, point: QPointF) -> None:
|
||||||
self.placement_requested.emit(self.page_index, (point.x() / self.zoom, point.y() / self.zoom))
|
self.placement_requested.emit(self.page_index, (point.x() / self.zoom, point.y() / self.zoom))
|
||||||
|
|
||||||
|
def _emit_object_select(self, point: QPointF) -> None:
|
||||||
|
self.object_select_requested.emit(self.page_index, (point.x() / self.zoom, point.y() / self.zoom))
|
||||||
|
|
||||||
|
def _emit_object_rect_changed(self, rect: QRectF) -> None:
|
||||||
|
self.object_rect_changed.emit(
|
||||||
|
self.page_index,
|
||||||
|
(
|
||||||
|
rect.left() / self.zoom,
|
||||||
|
rect.top() / self.zoom,
|
||||||
|
rect.right() / self.zoom,
|
||||||
|
rect.bottom() / self.zoom,
|
||||||
|
),
|
||||||
|
)
|
||||||
|
|
||||||
|
def _emit_object_context(self, point: QPointF) -> None:
|
||||||
|
self.object_context_requested.emit(self.page_index, (point.x() / self.zoom, point.y() / self.zoom))
|
||||||
|
|||||||
@@ -79,6 +79,10 @@ def main() -> int:
|
|||||||
assert document.delete_annotation(annotations[0].page_index, annotations[0].xref)
|
assert document.delete_annotation(annotations[0].page_index, annotations[0].xref)
|
||||||
document.add_text(0, "PDFReaderLite")
|
document.add_text(0, "PDFReaderLite")
|
||||||
document.add_text(0, "Placed text", (150, 160))
|
document.add_text(0, "Placed text", (150, 160))
|
||||||
|
selected = document.annotation_at_point(0, (155, 165))
|
||||||
|
assert selected and selected.rect
|
||||||
|
x0, y0, x1, y1 = selected.rect
|
||||||
|
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)
|
||||||
document.insert_image(0, image_path, (180, 200))
|
document.insert_image(0, image_path, (180, 200))
|
||||||
document.add_signature(0, image_path)
|
document.add_signature(0, image_path)
|
||||||
|
|||||||
Reference in New Issue
Block a user