Add adjustable raster placement layer
This commit is contained in:
+133
-13
@@ -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()
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user