Add annotation object selection editing

This commit is contained in:
2026-06-29 17:48:48 +08:00
parent bf9e8fb7cd
commit a23b2cc366
6 changed files with 310 additions and 13 deletions
+93 -1
View File
@@ -18,6 +18,7 @@ from PySide6.QtWidgets import (
QListWidget,
QListWidgetItem,
QMainWindow,
QMenu,
QMessageBox,
QSplitter,
QStatusBar,
@@ -30,7 +31,7 @@ from pdfreaderlite.core.file_association import (
register_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.ui.page_manager import PageManagerDialog
from pdfreaderlite.ui.pdf_viewer import PdfViewer
@@ -53,6 +54,7 @@ class MainWindow(QMainWindow):
self.search_results = QListWidget()
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._build_window()
self._build_actions()
@@ -709,6 +711,9 @@ class MainWindow(QMainWindow):
self.underline_action = QAction("下划线", self)
self.strikeout_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.setCheckable(True)
self.add_text_action = QAction("添加文本", self)
@@ -781,6 +786,7 @@ class MainWindow(QMainWindow):
edit_menu.addAction(self.underline_action)
edit_menu.addAction(self.strikeout_action)
edit_menu.addAction(self.note_action)
edit_menu.addAction(self.select_object_action)
edit_menu.addAction(self.freehand_action)
edit_menu.addAction(self.add_text_action)
edit_menu.addAction(self.place_text_action)
@@ -824,6 +830,7 @@ class MainWindow(QMainWindow):
self.underline_action,
self.strikeout_action,
self.note_action,
self.select_object_action,
self.freehand_action,
self.rectangle_action,
self.circle_action,
@@ -901,6 +908,7 @@ class MainWindow(QMainWindow):
self.underline_action,
self.strikeout_action,
self.note_action,
self.select_object_action,
self.freehand_action,
self.add_text_action,
self.place_text_action,
@@ -962,6 +970,7 @@ class MainWindow(QMainWindow):
self.underline_action.triggered.connect(self.underline_current_page)
self.strikeout_action.triggered.connect(self.strikeout_current_page)
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.add_text_action.triggered.connect(self.add_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.viewer.ink_stroke_finished.connect(self.add_ink_stroke)
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:
match: SearchMatch = item.data(Qt.ItemDataRole.UserRole)
@@ -1030,6 +1042,84 @@ class MainWindow(QMainWindow):
self.viewer.render()
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:
if enabled and not self._ensure_document():
self.freehand_action.setChecked(False)
@@ -1037,6 +1127,7 @@ class MainWindow(QMainWindow):
if enabled:
self.pending_placement = None
self.viewer.set_placement_enabled(False)
self.select_object_action.setChecked(False)
self.viewer.set_drawing_enabled(enabled)
if enabled:
self.statusBar().showMessage("自由画笔已启用:在页面上按住鼠标绘制", 5000)
@@ -1100,6 +1191,7 @@ class MainWindow(QMainWindow):
def _start_placement(self, payload: dict[str, object], message: str) -> None:
self.pending_placement = payload
self.freehand_action.setChecked(False)
self.select_object_action.setChecked(False)
self.viewer.set_placement_enabled(True)
self.statusBar().showMessage(message, 5000)