Add V2 area markup and object editing enhancements
This commit is contained in:
@@ -206,6 +206,8 @@ class PdfDocument:
|
||||
page_index: int,
|
||||
text: str,
|
||||
point: tuple[float, float] | None = None,
|
||||
font_size: int = 14,
|
||||
text_color: tuple[float, float, float] = (0, 0, 0),
|
||||
) -> AnnotationInfo:
|
||||
self.snapshot()
|
||||
page = self._page(page_index)
|
||||
@@ -218,9 +220,9 @@ class PdfDocument:
|
||||
annot = page.add_freetext_annot(
|
||||
rect,
|
||||
text,
|
||||
fontsize=14,
|
||||
fontsize=max(8, min(72, int(font_size))),
|
||||
fontname="china-s",
|
||||
text_color=(0, 0, 0),
|
||||
text_color=text_color,
|
||||
border_width=0,
|
||||
)
|
||||
annot.set_info(content=text)
|
||||
@@ -234,6 +236,56 @@ class PdfDocument:
|
||||
rect=self._rect_tuple(annot.rect),
|
||||
)
|
||||
|
||||
def add_area_highlight(
|
||||
self,
|
||||
page_index: int,
|
||||
rect: tuple[float, float, float, float],
|
||||
color: tuple[float, float, float] = (1.0, 0.92, 0.2),
|
||||
opacity: float = 0.35,
|
||||
) -> AnnotationInfo:
|
||||
self.snapshot()
|
||||
page = self._page(page_index)
|
||||
annot = page.add_rect_annot(self._normalized_rect(rect))
|
||||
annot.set_colors(stroke=color, fill=color)
|
||||
annot.set_border(width=0)
|
||||
annot.set_opacity(max(0.1, min(1.0, float(opacity))))
|
||||
annot.set_info(content="区域高亮")
|
||||
annot.update()
|
||||
self.mark_changed()
|
||||
return AnnotationInfo(
|
||||
page_index=page_index,
|
||||
xref=annot.xref,
|
||||
annotation_type=annot.type[1],
|
||||
content="区域高亮",
|
||||
rect=self._rect_tuple(annot.rect),
|
||||
)
|
||||
|
||||
def add_area_line_mark(
|
||||
self,
|
||||
page_index: int,
|
||||
rect: tuple[float, float, float, float],
|
||||
strikeout: bool = False,
|
||||
color: tuple[float, float, float] = (0.9, 0.1, 0.1),
|
||||
border_width: float = 2,
|
||||
opacity: float = 1.0,
|
||||
) -> AnnotationInfo:
|
||||
self.snapshot()
|
||||
page = self._page(page_index)
|
||||
area = self._normalized_rect(rect)
|
||||
y = area.y0 + area.height * (0.55 if strikeout else 0.88)
|
||||
annot = page.add_line_annot(fitz.Point(area.x0, y), fitz.Point(area.x1, y))
|
||||
self._apply_annotation_style(annot, color, border_width, opacity)
|
||||
annot.set_info(content="区域删除线" if strikeout else "区域下划线")
|
||||
annot.update()
|
||||
self.mark_changed()
|
||||
return AnnotationInfo(
|
||||
page_index=page_index,
|
||||
xref=annot.xref,
|
||||
annotation_type=annot.type[1],
|
||||
content=annot.info.get("content", "") if annot.info else "",
|
||||
rect=self._rect_tuple(annot.rect),
|
||||
)
|
||||
|
||||
def add_text_stamp(
|
||||
self,
|
||||
page_index: int,
|
||||
@@ -656,6 +708,61 @@ class PdfDocument:
|
||||
annot = annot.next
|
||||
return False
|
||||
|
||||
def duplicate_annotation_info(
|
||||
self,
|
||||
annotation: AnnotationInfo,
|
||||
target_page_index: int,
|
||||
offset: tuple[float, float] = (18, 18),
|
||||
) -> AnnotationInfo | None:
|
||||
if not annotation.rect:
|
||||
return None
|
||||
dx, dy = offset
|
||||
rect = fitz.Rect(*annotation.rect) + (dx, dy, dx, dy)
|
||||
content = annotation.content or ""
|
||||
annot_type = annotation.annotation_type.lower()
|
||||
self.snapshot()
|
||||
page = self._page(target_page_index)
|
||||
|
||||
if annot_type == "freetext":
|
||||
duplicate = page.add_freetext_annot(
|
||||
rect,
|
||||
content,
|
||||
fontsize=14,
|
||||
fontname="china-s",
|
||||
text_color=(0, 0, 0),
|
||||
border_width=0,
|
||||
)
|
||||
elif annot_type == "text":
|
||||
duplicate = page.add_text_annot(rect.tl, content)
|
||||
elif annot_type in {"square", "rect"}:
|
||||
duplicate = page.add_rect_annot(rect)
|
||||
duplicate.set_colors(stroke=(0.1, 0.35, 0.85))
|
||||
duplicate.set_border(width=2)
|
||||
elif annot_type in {"circle", "ellipse"}:
|
||||
duplicate = page.add_circle_annot(rect)
|
||||
duplicate.set_colors(stroke=(0.1, 0.35, 0.85))
|
||||
duplicate.set_border(width=2)
|
||||
elif annot_type == "line":
|
||||
start = fitz.Point(rect.x0, rect.y0 + rect.height / 2)
|
||||
end = fitz.Point(rect.x1, rect.y0 + rect.height / 2)
|
||||
duplicate = page.add_line_annot(start, end)
|
||||
duplicate.set_colors(stroke=(0.1, 0.35, 0.85))
|
||||
duplicate.set_border(width=2)
|
||||
else:
|
||||
return None
|
||||
|
||||
if content:
|
||||
duplicate.set_info(content=content)
|
||||
duplicate.update()
|
||||
self.mark_changed()
|
||||
return AnnotationInfo(
|
||||
page_index=target_page_index,
|
||||
xref=duplicate.xref,
|
||||
annotation_type=duplicate.type[1],
|
||||
content=content,
|
||||
rect=self._rect_tuple(duplicate.rect),
|
||||
)
|
||||
|
||||
def delete_annotation(self, page_index: int, xref: int) -> bool:
|
||||
page = self._page(page_index)
|
||||
annot = page.first_annot
|
||||
@@ -915,6 +1022,16 @@ class PdfDocument:
|
||||
y0 = max(36, page.rect.height * 0.16)
|
||||
return fitz.Rect(x0, y0, x0 + width, y0 + height)
|
||||
|
||||
@staticmethod
|
||||
def _normalized_rect(rect: tuple[float, float, float, float]) -> fitz.Rect:
|
||||
x0, y0, x1, y1 = rect
|
||||
normalized = fitz.Rect(float(x0), float(y0), float(x1), float(y1)).normalize()
|
||||
if normalized.width < 2:
|
||||
normalized.x1 = normalized.x0 + 2
|
||||
if normalized.height < 2:
|
||||
normalized.y1 = normalized.y0 + 2
|
||||
return normalized
|
||||
|
||||
@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))
|
||||
|
||||
+312
-58
@@ -4,7 +4,7 @@ import math
|
||||
from dataclasses import dataclass
|
||||
from pathlib import Path
|
||||
|
||||
from PySide6.QtCore import QSize, QSignalBlocker, QSettings, QStandardPaths, Qt, QUrl
|
||||
from PySide6.QtCore import QRect, QSize, QSignalBlocker, QSettings, QStandardPaths, Qt, QUrl
|
||||
from PySide6.QtGui import (
|
||||
QAction,
|
||||
QColor,
|
||||
@@ -13,6 +13,7 @@ from PySide6.QtGui import (
|
||||
QDropEvent,
|
||||
QFont,
|
||||
QIcon,
|
||||
QImage,
|
||||
QIntValidator,
|
||||
QKeySequence,
|
||||
QPainter,
|
||||
@@ -91,6 +92,8 @@ class MainWindow(QMainWindow):
|
||||
self.annotation_opacity = float(self.settings.value("annotationStyle/opacity", 1.0, float))
|
||||
self.cover_color = QColor(self.settings.value("coverStyle/color", "#ffffff", str))
|
||||
self.cover_opacity = float(self.settings.value("coverStyle/opacity", 1.0, float))
|
||||
self.text_color = QColor(self.settings.value("textStyle/color", "#202124", str))
|
||||
self.text_font_size = int(self.settings.value("textStyle/fontSize", 14, int))
|
||||
|
||||
self.sessions: list[DocumentSession] = []
|
||||
self.active_session_index = -1
|
||||
@@ -111,11 +114,13 @@ class MainWindow(QMainWindow):
|
||||
self.main_splitter: QSplitter | None = None
|
||||
self._last_right_tools_width = 280
|
||||
self.pending_placement: dict[str, object] | None = None
|
||||
self.pending_area_markup: str | 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.copied_raster_object: dict[str, object] | None = None
|
||||
self.copied_annotation_object: AnnotationInfo | None = None
|
||||
self._create_document_session("未打开")
|
||||
|
||||
self._build_window()
|
||||
@@ -194,6 +199,7 @@ class MainWindow(QMainWindow):
|
||||
session.viewer.zoom_changed.connect(lambda zoom, watched=session: self._sync_zoom_controls(zoom, watched))
|
||||
session.viewer.ink_stroke_finished.connect(self.add_ink_stroke)
|
||||
session.viewer.placement_requested.connect(self.place_pending_object)
|
||||
session.viewer.area_selection_finished.connect(self.add_area_markup)
|
||||
session.viewer.object_select_requested.connect(self.select_object_at_point)
|
||||
session.viewer.object_rect_changed.connect(self.update_selected_object_rect)
|
||||
session.viewer.object_context_requested.connect(self.show_object_context_menu)
|
||||
@@ -1093,6 +1099,7 @@ class MainWindow(QMainWindow):
|
||||
self.paste_object_action = QAction("粘贴对象", self)
|
||||
self.paste_object_action.setShortcut(QKeySequence.StandardKey.Paste)
|
||||
self.replace_image_action = QAction("替换图片", self)
|
||||
self.image_properties_action = QAction("图片属性", self)
|
||||
self.bring_to_front_action = QAction("置顶", self)
|
||||
self.send_to_back_action = QAction("置底", self)
|
||||
self.bring_forward_action = QAction("上移一层", self)
|
||||
@@ -1101,6 +1108,7 @@ class MainWindow(QMainWindow):
|
||||
self.freehand_action.setCheckable(True)
|
||||
self.add_text_action = QAction("添加文本", self)
|
||||
self.place_text_action = QAction("点击放置文本", self)
|
||||
self.text_style_action = QAction("文本样式", self)
|
||||
self.insert_image_action = QAction("插入图片", self)
|
||||
self.place_image_action = QAction("点击放置图片", self)
|
||||
self.signature_action = QAction("图片签名", self)
|
||||
@@ -1187,6 +1195,7 @@ class MainWindow(QMainWindow):
|
||||
edit_menu.addAction(self.copy_object_action)
|
||||
edit_menu.addAction(self.paste_object_action)
|
||||
edit_menu.addAction(self.replace_image_action)
|
||||
edit_menu.addAction(self.image_properties_action)
|
||||
edit_menu.addAction(self.bring_to_front_action)
|
||||
edit_menu.addAction(self.send_to_back_action)
|
||||
edit_menu.addAction(self.bring_forward_action)
|
||||
@@ -1194,6 +1203,7 @@ class MainWindow(QMainWindow):
|
||||
edit_menu.addAction(self.freehand_action)
|
||||
edit_menu.addAction(self.add_text_action)
|
||||
edit_menu.addAction(self.place_text_action)
|
||||
edit_menu.addAction(self.text_style_action)
|
||||
edit_menu.addAction(self.insert_image_action)
|
||||
edit_menu.addAction(self.place_image_action)
|
||||
edit_menu.addAction(self.signature_action)
|
||||
@@ -1263,9 +1273,11 @@ class MainWindow(QMainWindow):
|
||||
self.text_stamp_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.image_stamp_action: QStyle.StandardPixmap.SP_FileIcon,
|
||||
self.select_object_action: QStyle.StandardPixmap.SP_ArrowRight,
|
||||
self.image_properties_action: QStyle.StandardPixmap.SP_FileDialogInfoView,
|
||||
self.freehand_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.add_text_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
self.place_text_action: QStyle.StandardPixmap.SP_FileDialogDetailedView,
|
||||
self.text_style_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
self.insert_image_action: QStyle.StandardPixmap.SP_FileIcon,
|
||||
self.place_image_action: QStyle.StandardPixmap.SP_FileIcon,
|
||||
self.signature_action: QStyle.StandardPixmap.SP_DialogApplyButton,
|
||||
@@ -1296,12 +1308,14 @@ class MainWindow(QMainWindow):
|
||||
[
|
||||
self.add_text_action,
|
||||
self.place_text_action,
|
||||
self.text_style_action,
|
||||
self.insert_image_action,
|
||||
self.place_image_action,
|
||||
self.cover_action,
|
||||
self.copy_object_action,
|
||||
self.paste_object_action,
|
||||
self.replace_image_action,
|
||||
self.image_properties_action,
|
||||
self.bring_to_front_action,
|
||||
self.send_to_back_action,
|
||||
self.bring_forward_action,
|
||||
@@ -1543,6 +1557,7 @@ class MainWindow(QMainWindow):
|
||||
self.copy_object_action.triggered.connect(self.copy_selected_object)
|
||||
self.paste_object_action.triggered.connect(self.paste_copied_object)
|
||||
self.replace_image_action.triggered.connect(self.replace_selected_image)
|
||||
self.image_properties_action.triggered.connect(self.edit_selected_image_properties)
|
||||
self.bring_to_front_action.triggered.connect(lambda: self.reorder_selected_raster("front"))
|
||||
self.send_to_back_action.triggered.connect(lambda: self.reorder_selected_raster("back"))
|
||||
self.bring_forward_action.triggered.connect(lambda: self.reorder_selected_raster("forward"))
|
||||
@@ -1550,6 +1565,7 @@ class MainWindow(QMainWindow):
|
||||
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.text_style_action.triggered.connect(self.configure_text_style)
|
||||
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)
|
||||
@@ -1793,43 +1809,47 @@ class MainWindow(QMainWindow):
|
||||
self.viewer.set_selected_object_rect(value.rect)
|
||||
|
||||
def highlight_current_page(self) -> None:
|
||||
if not self._ensure_document():
|
||||
return
|
||||
if not self._ensure_can_edit("高亮"):
|
||||
return
|
||||
text, ok = QInputDialog.getText(self, "高亮", "输入要在当前页高亮的文本:")
|
||||
if not ok or not text.strip():
|
||||
return
|
||||
count = self.document.highlight_text(self.viewer.page_index, text)
|
||||
self.viewer.render()
|
||||
self._refresh_annotation_panel()
|
||||
self.statusBar().showMessage(f"已高亮 {count} 处,记得保存", 3000)
|
||||
self._start_area_markup("highlight", "拖拽框选要高亮的区域")
|
||||
|
||||
def underline_current_page(self) -> None:
|
||||
if not self._ensure_document():
|
||||
return
|
||||
if not self._ensure_can_edit("下划线"):
|
||||
return
|
||||
text, ok = QInputDialog.getText(self, "下划线", "输入要在当前页标记的文本:")
|
||||
if not ok or not text.strip():
|
||||
return
|
||||
count = self.document.underline_text(self.viewer.page_index, text)
|
||||
self.viewer.render()
|
||||
self._refresh_annotation_panel()
|
||||
self.statusBar().showMessage(f"已添加下划线 {count} 处,记得保存", 3000)
|
||||
self._start_area_markup("underline", "拖拽框选要添加下划线的区域")
|
||||
|
||||
def strikeout_current_page(self) -> None:
|
||||
self._start_area_markup("strikeout", "拖拽框选要添加删除线的区域")
|
||||
|
||||
def _start_area_markup(self, markup: str, message: str) -> None:
|
||||
if not self._ensure_document():
|
||||
return
|
||||
if not self._ensure_can_edit("删除线"):
|
||||
if not self._ensure_can_edit("区域注释"):
|
||||
return
|
||||
text, ok = QInputDialog.getText(self, "删除线", "输入要在当前页标记的文本:")
|
||||
if not ok or not text.strip():
|
||||
self.pending_placement = None
|
||||
self.pending_area_markup = markup
|
||||
self.freehand_action.setChecked(False)
|
||||
self.select_object_action.setChecked(False)
|
||||
self.viewer.set_area_selection_enabled(True)
|
||||
self.statusBar().showMessage(message, 5000)
|
||||
|
||||
def add_area_markup(self, page_index: int, rect: tuple[float, float, float, float]) -> None:
|
||||
if not self.pending_area_markup:
|
||||
return
|
||||
count = self.document.strikeout_text(self.viewer.page_index, text)
|
||||
self.viewer.render()
|
||||
self._refresh_annotation_panel()
|
||||
self.statusBar().showMessage(f"已添加删除线 {count} 处,记得保存", 3000)
|
||||
markup = self.pending_area_markup
|
||||
self.pending_area_markup = None
|
||||
self.viewer.set_area_selection_enabled(False)
|
||||
try:
|
||||
color, line_width, opacity = self._annotation_style()
|
||||
if markup == "highlight":
|
||||
annotation = self.document.add_area_highlight(page_index, rect, color, min(0.55, opacity))
|
||||
elif markup == "underline":
|
||||
annotation = self.document.add_area_line_mark(page_index, rect, False, color, line_width, opacity)
|
||||
elif markup == "strikeout":
|
||||
annotation = self.document.add_area_line_mark(page_index, rect, True, color, line_width, opacity)
|
||||
else:
|
||||
return
|
||||
self.viewer.render()
|
||||
self._select_annotation_object(annotation)
|
||||
self.statusBar().showMessage("区域注释已添加,记得保存", 3000)
|
||||
except Exception as exc:
|
||||
QMessageBox.critical(self, "区域注释失败", f"无法添加区域注释:\n{exc}")
|
||||
|
||||
def add_note(self) -> None:
|
||||
if not self._ensure_document():
|
||||
@@ -1942,6 +1962,59 @@ class MainWindow(QMainWindow):
|
||||
self.annotation_opacity,
|
||||
)
|
||||
|
||||
def configure_text_style(self) -> None:
|
||||
dialog = QDialog(self)
|
||||
dialog.setWindowTitle("文本样式")
|
||||
layout = QFormLayout(dialog)
|
||||
|
||||
selected_color = QColor(self.text_color)
|
||||
color_button = QPushButton(selected_color.name().upper())
|
||||
|
||||
def update_color_button() -> None:
|
||||
color_button.setText(selected_color.name().upper())
|
||||
color_button.setStyleSheet(
|
||||
f"background: {selected_color.name()}; color: {'#ffffff' if selected_color.lightness() < 128 else '#202124'};"
|
||||
)
|
||||
|
||||
def choose_color() -> None:
|
||||
nonlocal selected_color
|
||||
color = QColorDialog.getColor(selected_color, self, "选择文本颜色")
|
||||
if color.isValid():
|
||||
selected_color = color
|
||||
update_color_button()
|
||||
|
||||
color_button.clicked.connect(choose_color)
|
||||
update_color_button()
|
||||
|
||||
font_size_input = QSpinBox()
|
||||
font_size_input.setRange(8, 72)
|
||||
font_size_input.setValue(self.text_font_size)
|
||||
font_size_input.setSuffix(" pt")
|
||||
|
||||
layout.addRow("颜色", color_button)
|
||||
layout.addRow("字号", font_size_input)
|
||||
|
||||
buttons = QDialogButtonBox(
|
||||
QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel
|
||||
)
|
||||
buttons.accepted.connect(dialog.accept)
|
||||
buttons.rejected.connect(dialog.reject)
|
||||
layout.addRow(buttons)
|
||||
if dialog.exec() != QDialog.DialogCode.Accepted:
|
||||
return
|
||||
|
||||
self.text_color = selected_color
|
||||
self.text_font_size = font_size_input.value()
|
||||
self.settings.setValue("textStyle/color", self.text_color.name())
|
||||
self.settings.setValue("textStyle/fontSize", self.text_font_size)
|
||||
self.statusBar().showMessage("文本样式已更新,新建文本会使用该样式", 3000)
|
||||
|
||||
def _text_style(self) -> tuple[int, tuple[float, float, float]]:
|
||||
return (
|
||||
self.text_font_size,
|
||||
(self.text_color.redF(), self.text_color.greenF(), self.text_color.blueF()),
|
||||
)
|
||||
|
||||
def toggle_object_selection(self, enabled: bool) -> None:
|
||||
if enabled and not self._ensure_document():
|
||||
self.select_object_action.setChecked(False)
|
||||
@@ -1953,8 +2026,10 @@ class MainWindow(QMainWindow):
|
||||
return
|
||||
if enabled:
|
||||
self.pending_placement = None
|
||||
self.pending_area_markup = None
|
||||
self.freehand_action.setChecked(False)
|
||||
self.viewer.set_placement_enabled(False)
|
||||
self.viewer.set_area_selection_enabled(False)
|
||||
else:
|
||||
self.selected_annotation = None
|
||||
self.selected_raster_id = None
|
||||
@@ -2044,36 +2119,49 @@ class MainWindow(QMainWindow):
|
||||
return None, None
|
||||
|
||||
def copy_selected_object(self) -> None:
|
||||
if self.selected_raster_id is None:
|
||||
self.statusBar().showMessage("当前只支持复制未保存的图片/签名对象", 3000)
|
||||
if self.selected_raster_id is not None:
|
||||
raster = self._session_raster_by_id(self.selected_raster_id)
|
||||
if not raster:
|
||||
self.statusBar().showMessage("没有可复制的对象", 3000)
|
||||
return
|
||||
self.copied_raster_object = {
|
||||
"type": raster["type"],
|
||||
"path": raster["path"],
|
||||
"rect": tuple(raster["rect"]),
|
||||
"rotation": int(raster.get("rotation", 0)),
|
||||
"opacity": float(raster.get("opacity", 1.0)),
|
||||
"crop": dict(raster.get("crop", {})),
|
||||
}
|
||||
self.copied_annotation_object = None
|
||||
self.statusBar().showMessage("对象已复制", 3000)
|
||||
return
|
||||
raster = self._session_raster_by_id(self.selected_raster_id)
|
||||
if not raster:
|
||||
self.statusBar().showMessage("没有可复制的对象", 3000)
|
||||
if self.selected_annotation is not None:
|
||||
self.copied_annotation_object = self.selected_annotation
|
||||
self.copied_raster_object = None
|
||||
self.statusBar().showMessage("注释对象已复制", 3000)
|
||||
return
|
||||
self.copied_raster_object = {
|
||||
"type": raster["type"],
|
||||
"path": raster["path"],
|
||||
"rect": tuple(raster["rect"]),
|
||||
}
|
||||
self.statusBar().showMessage("对象已复制", 3000)
|
||||
self.statusBar().showMessage("没有可复制的对象", 3000)
|
||||
|
||||
def paste_copied_object(self) -> None:
|
||||
if not self._ensure_document():
|
||||
return
|
||||
if not self._ensure_can_edit("粘贴对象"):
|
||||
return
|
||||
def _has_copied_object(self) -> bool:
|
||||
return self.copied_raster_object is not None or self.copied_annotation_object is not None
|
||||
|
||||
def _offset_rect(self, rect: tuple[float, float, float, float], offset: float = 18) -> tuple[float, float, float, float]:
|
||||
x0, y0, x1, y1 = rect
|
||||
return (x0 + offset, y0 + offset, x1 + offset, y1 + offset)
|
||||
|
||||
def _paste_copied_raster_object(self) -> None:
|
||||
if not self.copied_raster_object:
|
||||
self.statusBar().showMessage("没有可粘贴的对象", 3000)
|
||||
return
|
||||
x0, y0, x1, y1 = self.copied_raster_object["rect"]
|
||||
offset = 18
|
||||
item = {
|
||||
"id": self.next_raster_id,
|
||||
"type": self.copied_raster_object["type"],
|
||||
"page_index": self.viewer.page_index,
|
||||
"path": self.copied_raster_object["path"],
|
||||
"rect": (x0 + offset, y0 + offset, x1 + offset, y1 + offset),
|
||||
"rect": self._offset_rect((x0, y0, x1, y1)),
|
||||
"rotation": int(self.copied_raster_object.get("rotation", 0)),
|
||||
"opacity": float(self.copied_raster_object.get("opacity", 1.0)),
|
||||
"crop": dict(self.copied_raster_object.get("crop", {})),
|
||||
}
|
||||
self.next_raster_id += 1
|
||||
self.session_raster_objects.append(item)
|
||||
@@ -2082,7 +2170,30 @@ class MainWindow(QMainWindow):
|
||||
self.select_object_action.setChecked(True)
|
||||
self._refresh_session_raster_overlays()
|
||||
self.viewer.set_selected_object_rect(item["rect"])
|
||||
self.statusBar().showMessage("对象已粘贴,保存时会写入 PDF", 3000)
|
||||
|
||||
def paste_copied_object(self) -> None:
|
||||
if not self._ensure_document():
|
||||
return
|
||||
if not self._ensure_can_edit("粘贴对象"):
|
||||
return
|
||||
if not self._has_copied_object():
|
||||
self.statusBar().showMessage("没有可粘贴的对象", 3000)
|
||||
return
|
||||
if self.copied_raster_object:
|
||||
self._paste_copied_raster_object()
|
||||
self.statusBar().showMessage("对象已粘贴,保存时会写入 PDF", 3000)
|
||||
return
|
||||
if self.copied_annotation_object:
|
||||
annotation = self.document.duplicate_annotation_info(
|
||||
self.copied_annotation_object,
|
||||
self.viewer.page_index,
|
||||
)
|
||||
if not annotation:
|
||||
self.statusBar().showMessage("该注释暂不支持复制粘贴", 3000)
|
||||
return
|
||||
self.viewer.render()
|
||||
self._select_annotation_object(annotation)
|
||||
self.statusBar().showMessage("注释对象已粘贴,记得保存", 3000)
|
||||
|
||||
def replace_selected_image(self) -> None:
|
||||
if self.selected_raster_id is None:
|
||||
@@ -2104,6 +2215,70 @@ class MainWindow(QMainWindow):
|
||||
self.viewer.set_selected_object_rect(raster["rect"])
|
||||
self.statusBar().showMessage("图片已替换,保存时会写入 PDF", 3000)
|
||||
|
||||
def edit_selected_image_properties(self) -> None:
|
||||
if self.selected_raster_id is None:
|
||||
self.statusBar().showMessage("请选择未保存的图片/签名/图章对象", 3000)
|
||||
return
|
||||
raster = self._session_raster_by_id(self.selected_raster_id)
|
||||
if not raster:
|
||||
return
|
||||
dialog = QDialog(self)
|
||||
dialog.setWindowTitle("图片属性")
|
||||
layout = QFormLayout(dialog)
|
||||
|
||||
rotation_input = QComboBox()
|
||||
for value in [0, 90, 180, 270]:
|
||||
rotation_input.addItem(f"{value}°", value)
|
||||
rotation_index = rotation_input.findData(int(raster.get("rotation", 0)) % 360)
|
||||
rotation_input.setCurrentIndex(max(0, rotation_index))
|
||||
|
||||
opacity_input = QDoubleSpinBox()
|
||||
opacity_input.setRange(10, 100)
|
||||
opacity_input.setSingleStep(5)
|
||||
opacity_input.setDecimals(0)
|
||||
opacity_input.setSuffix("%")
|
||||
opacity_input.setValue(float(raster.get("opacity", 1.0)) * 100)
|
||||
|
||||
crop = raster.get("crop") if isinstance(raster.get("crop"), dict) else {}
|
||||
crop_inputs: dict[str, QDoubleSpinBox] = {}
|
||||
for key, label in [
|
||||
("left", "左裁剪"),
|
||||
("top", "上裁剪"),
|
||||
("right", "右裁剪"),
|
||||
("bottom", "下裁剪"),
|
||||
]:
|
||||
input_box = QDoubleSpinBox()
|
||||
input_box.setRange(0, 80)
|
||||
input_box.setSingleStep(2)
|
||||
input_box.setDecimals(0)
|
||||
input_box.setSuffix("%")
|
||||
input_box.setValue(float(crop.get(key, 0)) * 100 if crop else 0)
|
||||
crop_inputs[key] = input_box
|
||||
layout.addRow(label, input_box)
|
||||
|
||||
layout.insertRow(0, "旋转", rotation_input)
|
||||
layout.insertRow(1, "透明度", opacity_input)
|
||||
|
||||
buttons = QDialogButtonBox(
|
||||
QDialogButtonBox.StandardButton.Ok | QDialogButtonBox.StandardButton.Cancel
|
||||
)
|
||||
buttons.accepted.connect(dialog.accept)
|
||||
buttons.rejected.connect(dialog.reject)
|
||||
layout.addRow(buttons)
|
||||
if dialog.exec() != QDialog.DialogCode.Accepted:
|
||||
return
|
||||
|
||||
new_crop = {key: value.value() / 100 for key, value in crop_inputs.items()}
|
||||
if new_crop["left"] + new_crop["right"] >= 0.95 or new_crop["top"] + new_crop["bottom"] >= 0.95:
|
||||
QMessageBox.warning(self, "裁剪过大", "左右或上下裁剪总量过大,请保留至少 5% 的图片内容。")
|
||||
return
|
||||
raster["rotation"] = int(rotation_input.currentData())
|
||||
raster["opacity"] = opacity_input.value() / 100
|
||||
raster["crop"] = new_crop
|
||||
self._refresh_session_raster_overlays()
|
||||
self.viewer.set_selected_object_rect(raster["rect"])
|
||||
self.statusBar().showMessage("图片属性已更新,保存时会写入 PDF", 3000)
|
||||
|
||||
def reorder_selected_raster(self, direction: str) -> None:
|
||||
if self.selected_raster_id is None:
|
||||
self.statusBar().showMessage("请选择未保存的图片/签名/图章对象", 3000)
|
||||
@@ -2137,7 +2312,7 @@ class MainWindow(QMainWindow):
|
||||
def delete_selected_object(self) -> None:
|
||||
if self.selected_raster_id is not None:
|
||||
raster_id = self.selected_raster_id
|
||||
self.session_raster_objects = [
|
||||
self.session_raster_objects[:] = [
|
||||
item for item in self.session_raster_objects if int(item["id"]) != raster_id
|
||||
]
|
||||
self.selected_raster_id = None
|
||||
@@ -2177,6 +2352,7 @@ class MainWindow(QMainWindow):
|
||||
copy_action = menu.addAction("复制对象")
|
||||
paste_action = menu.addAction("粘贴对象")
|
||||
replace_action = menu.addAction("替换图片")
|
||||
image_properties_action = menu.addAction("图片属性")
|
||||
layer_menu = menu.addMenu("图层顺序")
|
||||
front_action = layer_menu.addAction("置顶")
|
||||
back_action = layer_menu.addAction("置底")
|
||||
@@ -2185,9 +2361,10 @@ class MainWindow(QMainWindow):
|
||||
edit_action = menu.addAction("编辑内容")
|
||||
properties_action = menu.addAction("属性")
|
||||
delete_action.setEnabled(self.selected_annotation is not None or self.selected_raster_id is not None)
|
||||
copy_action.setEnabled(self.selected_raster_id is not None)
|
||||
paste_action.setEnabled(self.copied_raster_object is not None)
|
||||
copy_action.setEnabled(self.selected_annotation is not None or self.selected_raster_id is not None)
|
||||
paste_action.setEnabled(self._has_copied_object())
|
||||
replace_action.setEnabled(self.selected_raster_id is not None)
|
||||
image_properties_action.setEnabled(self.selected_raster_id is not None)
|
||||
layer_menu.setEnabled(self.selected_raster_id is not None)
|
||||
edit_action.setEnabled(self._selected_annotation_content_editable())
|
||||
properties_action.setEnabled(self.selected_annotation is not None or self.selected_raster_id is not None)
|
||||
@@ -2200,6 +2377,8 @@ class MainWindow(QMainWindow):
|
||||
self.paste_copied_object()
|
||||
elif chosen == replace_action:
|
||||
self.replace_selected_image()
|
||||
elif chosen == image_properties_action:
|
||||
self.edit_selected_image_properties()
|
||||
elif chosen == front_action:
|
||||
self.reorder_selected_raster("front")
|
||||
elif chosen == back_action:
|
||||
@@ -2263,17 +2442,20 @@ class MainWindow(QMainWindow):
|
||||
|
||||
def cancel_current_operation(self) -> bool:
|
||||
had_pending = self.pending_placement is not None
|
||||
had_area = self.pending_area_markup is not None
|
||||
had_selection = self.selected_annotation is not None or self.selected_raster_id is not None
|
||||
had_tool = self.select_object_action.isChecked() or self.freehand_action.isChecked()
|
||||
if not (had_pending or had_selection or had_tool):
|
||||
if not (had_pending or had_area or had_selection or had_tool):
|
||||
return False
|
||||
|
||||
self.pending_placement = None
|
||||
self.pending_area_markup = None
|
||||
self.selected_annotation = None
|
||||
self.selected_raster_id = None
|
||||
self.select_object_action.setChecked(False)
|
||||
self.freehand_action.setChecked(False)
|
||||
self.viewer.set_placement_enabled(False)
|
||||
self.viewer.set_area_selection_enabled(False)
|
||||
self.viewer.set_drawing_enabled(False)
|
||||
self.viewer.set_object_edit_enabled(False)
|
||||
self.viewer.clear_object_selection()
|
||||
@@ -2332,8 +2514,10 @@ class MainWindow(QMainWindow):
|
||||
return
|
||||
if enabled:
|
||||
self.pending_placement = None
|
||||
self.pending_area_markup = None
|
||||
self.viewer.set_placement_enabled(False)
|
||||
self.select_object_action.setChecked(False)
|
||||
self.viewer.set_area_selection_enabled(False)
|
||||
self.viewer.set_drawing_enabled(enabled)
|
||||
if enabled:
|
||||
self.statusBar().showMessage("自由画笔已启用:在页面上按住鼠标绘制", 5000)
|
||||
@@ -2361,7 +2545,13 @@ class MainWindow(QMainWindow):
|
||||
if not ok or not text.strip():
|
||||
return
|
||||
try:
|
||||
annotation = self.document.add_text(self.viewer.page_index, text)
|
||||
font_size, text_color = self._text_style()
|
||||
annotation = self.document.add_text(
|
||||
self.viewer.page_index,
|
||||
text,
|
||||
font_size=font_size,
|
||||
text_color=text_color,
|
||||
)
|
||||
self.viewer.render()
|
||||
self._select_annotation_object(annotation)
|
||||
self.statusBar().showMessage("文本已添加,记得保存", 3000)
|
||||
@@ -2423,6 +2613,9 @@ class MainWindow(QMainWindow):
|
||||
"page_index": page_index,
|
||||
"path": image_path,
|
||||
"rect": rect,
|
||||
"rotation": 0,
|
||||
"opacity": 1.0,
|
||||
"crop": {"left": 0.0, "top": 0.0, "right": 0.0, "bottom": 0.0},
|
||||
}
|
||||
self.next_raster_id += 1
|
||||
self.session_raster_objects.append(item)
|
||||
@@ -2463,15 +2656,66 @@ class MainWindow(QMainWindow):
|
||||
self.viewer.set_overlay_images([])
|
||||
self.viewer.clear_object_selection()
|
||||
|
||||
def _prepared_raster_path(self, item: dict[str, object]) -> str:
|
||||
rotation = int(item.get("rotation", 0)) % 360
|
||||
opacity = float(item.get("opacity", 1.0))
|
||||
crop = item.get("crop") if isinstance(item.get("crop"), dict) else {}
|
||||
has_crop = bool(crop) and any(float(crop.get(key, 0)) > 0 for key in ["left", "top", "right", "bottom"])
|
||||
if rotation == 0 and opacity >= 0.999 and not has_crop:
|
||||
return str(item["path"])
|
||||
|
||||
pixmap = QPixmap(str(item["path"]))
|
||||
if pixmap.isNull():
|
||||
return str(item["path"])
|
||||
|
||||
left = max(0.0, min(0.8, float(crop.get("left", 0) if crop else 0)))
|
||||
top = max(0.0, min(0.8, float(crop.get("top", 0) if crop else 0)))
|
||||
right = max(0.0, min(0.8, float(crop.get("right", 0) if crop else 0)))
|
||||
bottom = max(0.0, min(0.8, float(crop.get("bottom", 0) if crop else 0)))
|
||||
if left + right >= 0.95:
|
||||
right = 0.95 - left
|
||||
if top + bottom >= 0.95:
|
||||
bottom = 0.95 - top
|
||||
|
||||
crop_rect = QRect(
|
||||
int(pixmap.width() * left),
|
||||
int(pixmap.height() * top),
|
||||
max(1, int(pixmap.width() * (1 - left - right))),
|
||||
max(1, int(pixmap.height() * (1 - top - bottom))),
|
||||
)
|
||||
source = pixmap.copy(crop_rect)
|
||||
if source.isNull():
|
||||
return str(item["path"])
|
||||
|
||||
canvas_width = source.height() if rotation in {90, 270} else source.width()
|
||||
canvas_height = source.width() if rotation in {90, 270} else source.height()
|
||||
image = QImage(canvas_width, canvas_height, QImage.Format.Format_ARGB32)
|
||||
image.fill(Qt.GlobalColor.transparent)
|
||||
painter = QPainter(image)
|
||||
painter.setRenderHint(QPainter.RenderHint.SmoothPixmapTransform)
|
||||
painter.setOpacity(max(0.1, min(1.0, opacity)))
|
||||
painter.translate(canvas_width / 2, canvas_height / 2)
|
||||
painter.rotate(rotation)
|
||||
painter.drawPixmap(int(-source.width() / 2), int(-source.height() / 2), source)
|
||||
painter.end()
|
||||
|
||||
temp_dir = Path(QStandardPaths.writableLocation(QStandardPaths.StandardLocation.TempLocation) or ".")
|
||||
temp_dir = temp_dir / "PDFReaderLite"
|
||||
temp_dir.mkdir(parents=True, exist_ok=True)
|
||||
temp_path = temp_dir / f"raster_{id(item)}_{rotation}.png"
|
||||
image.save(str(temp_path), "PNG")
|
||||
return str(temp_path)
|
||||
|
||||
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"]
|
||||
image_path = self._prepared_raster_path(item)
|
||||
if item["type"] == "signature":
|
||||
self.document.add_signature_rect(int(item["page_index"]), str(item["path"]), rect)
|
||||
self.document.add_signature_rect(int(item["page_index"]), image_path, rect)
|
||||
else:
|
||||
self.document.insert_image_rect(int(item["page_index"]), str(item["path"]), rect)
|
||||
self.document.insert_image_rect(int(item["page_index"]), image_path, rect)
|
||||
self._clear_session_raster_objects()
|
||||
self._update_current_tab_title()
|
||||
|
||||
@@ -2479,8 +2723,10 @@ class MainWindow(QMainWindow):
|
||||
if not self._ensure_can_edit("点击放置"):
|
||||
return
|
||||
self.pending_placement = payload
|
||||
self.pending_area_markup = None
|
||||
self.freehand_action.setChecked(False)
|
||||
self.select_object_action.setChecked(False)
|
||||
self.viewer.set_area_selection_enabled(False)
|
||||
self.viewer.set_placement_enabled(True)
|
||||
self.statusBar().showMessage(message, 5000)
|
||||
|
||||
@@ -2493,7 +2739,14 @@ class MainWindow(QMainWindow):
|
||||
try:
|
||||
kind = payload.get("type")
|
||||
if kind == "text":
|
||||
annotation = self.document.add_text(page_index, str(payload["text"]), point)
|
||||
font_size, text_color = self._text_style()
|
||||
annotation = self.document.add_text(
|
||||
page_index,
|
||||
str(payload["text"]),
|
||||
point,
|
||||
font_size=font_size,
|
||||
text_color=text_color,
|
||||
)
|
||||
elif kind == "image":
|
||||
self._add_session_raster_object("image", page_index, str(payload["path"]), point)
|
||||
annotation = None
|
||||
@@ -2721,6 +2974,7 @@ class MainWindow(QMainWindow):
|
||||
if not self.toggle_read_action.isChecked():
|
||||
return True
|
||||
self.pending_placement = None
|
||||
self.pending_area_markup = None
|
||||
self.selected_annotation = None
|
||||
self.selected_raster_id = None
|
||||
self.viewer.reset_interaction_mode()
|
||||
|
||||
@@ -10,6 +10,7 @@ from pdfreaderlite.core.document import PdfDocument
|
||||
class PageLabel(QLabel):
|
||||
stroke_finished = Signal(list)
|
||||
placement_requested = Signal(QPointF)
|
||||
area_selection_finished = Signal(QRectF)
|
||||
object_select_requested = Signal(QPointF)
|
||||
object_rect_changed = Signal(QRectF)
|
||||
object_context_requested = Signal(QPointF)
|
||||
@@ -19,11 +20,15 @@ class PageLabel(QLabel):
|
||||
super().__init__(text)
|
||||
self.drawing_enabled = False
|
||||
self.placement_enabled = False
|
||||
self.area_selection_enabled = False
|
||||
self.object_edit_enabled = False
|
||||
self.selected_rect: QRectF | None = None
|
||||
self.overlay_images: list[dict[str, object]] = []
|
||||
self._drawing = False
|
||||
self._selecting_area = False
|
||||
self._stroke: list[QPointF] = []
|
||||
self._area_start = QPointF()
|
||||
self._area_rect = QRectF()
|
||||
self._dragging_object = False
|
||||
self._resizing_object = False
|
||||
self._drag_start = QPointF()
|
||||
@@ -33,6 +38,12 @@ class PageLabel(QLabel):
|
||||
if self.placement_enabled and event.button() == Qt.MouseButton.LeftButton:
|
||||
self.placement_requested.emit(event.position())
|
||||
return
|
||||
if self.area_selection_enabled and event.button() == Qt.MouseButton.LeftButton:
|
||||
self._selecting_area = True
|
||||
self._area_start = event.position()
|
||||
self._area_rect = QRectF(self._area_start, self._area_start)
|
||||
self.update()
|
||||
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
|
||||
@@ -77,6 +88,10 @@ class PageLabel(QLabel):
|
||||
self._stroke.append(event.position())
|
||||
self.update()
|
||||
return
|
||||
if self._selecting_area:
|
||||
self._area_rect = QRectF(self._area_start, event.position()).normalized()
|
||||
self.update()
|
||||
return
|
||||
super().mouseMoveEvent(event)
|
||||
|
||||
def mouseReleaseEvent(self, event: QMouseEvent) -> None:
|
||||
@@ -97,6 +112,14 @@ class PageLabel(QLabel):
|
||||
self._stroke = []
|
||||
self.update()
|
||||
return
|
||||
if self._selecting_area and event.button() == Qt.MouseButton.LeftButton:
|
||||
self._selecting_area = False
|
||||
rect = self._area_rect.normalized()
|
||||
self._area_rect = QRectF()
|
||||
self.update()
|
||||
if rect.width() >= 8 and rect.height() >= 8:
|
||||
self.area_selection_finished.emit(rect)
|
||||
return
|
||||
super().mouseReleaseEvent(event)
|
||||
|
||||
def contextMenuEvent(self, event: QContextMenuEvent) -> None:
|
||||
@@ -123,7 +146,7 @@ class PageLabel(QLabel):
|
||||
(float(x1) - float(x0)) * float(overlay["zoom"]),
|
||||
(float(y1) - float(y0)) * float(overlay["zoom"]),
|
||||
)
|
||||
painter.drawPixmap(target, pixmap, pixmap.rect())
|
||||
self._draw_overlay(painter, pixmap, target, overlay)
|
||||
if self.selected_rect:
|
||||
painter.setPen(QPen(Qt.GlobalColor.blue, 2, Qt.PenStyle.DashLine))
|
||||
painter.drawRect(self.selected_rect)
|
||||
@@ -132,6 +155,10 @@ class PageLabel(QLabel):
|
||||
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])
|
||||
if not self._area_rect.isNull():
|
||||
painter.setPen(QPen(QColor("#2d73c5"), 2, Qt.PenStyle.DashLine))
|
||||
painter.fillRect(self._area_rect, QColor(45, 115, 197, 38))
|
||||
painter.drawRect(self._area_rect)
|
||||
|
||||
def _resize_handle_rect(self) -> QRectF:
|
||||
if not self.selected_rect:
|
||||
@@ -144,12 +171,40 @@ class PageLabel(QLabel):
|
||||
size,
|
||||
)
|
||||
|
||||
def _draw_overlay(self, painter: QPainter, pixmap: QPixmap, target: QRectF, overlay: dict[str, object]) -> None:
|
||||
crop = overlay.get("crop") if isinstance(overlay.get("crop"), dict) else {}
|
||||
left = max(0.0, min(0.8, float(crop.get("left", 0) if crop else 0)))
|
||||
top = max(0.0, min(0.8, float(crop.get("top", 0) if crop else 0)))
|
||||
right = max(0.0, min(0.8, float(crop.get("right", 0) if crop else 0)))
|
||||
bottom = max(0.0, min(0.8, float(crop.get("bottom", 0) if crop else 0)))
|
||||
if left + right >= 0.95:
|
||||
right = 0.95 - left
|
||||
if top + bottom >= 0.95:
|
||||
bottom = 0.95 - top
|
||||
source = QRectF(
|
||||
pixmap.width() * left,
|
||||
pixmap.height() * top,
|
||||
pixmap.width() * (1 - left - right),
|
||||
pixmap.height() * (1 - top - bottom),
|
||||
)
|
||||
opacity = max(0.1, min(1.0, float(overlay.get("opacity", 1.0))))
|
||||
rotation = int(overlay.get("rotation", 0)) % 360
|
||||
painter.save()
|
||||
painter.setOpacity(opacity)
|
||||
if rotation:
|
||||
painter.translate(target.center())
|
||||
painter.rotate(rotation)
|
||||
target = QRectF(-target.width() / 2, -target.height() / 2, target.width(), target.height())
|
||||
painter.drawPixmap(target, pixmap, source)
|
||||
painter.restore()
|
||||
|
||||
|
||||
class PdfViewer(QScrollArea):
|
||||
page_changed = Signal(int)
|
||||
zoom_changed = Signal(float)
|
||||
ink_stroke_finished = Signal(int, list)
|
||||
placement_requested = Signal(int, tuple)
|
||||
area_selection_finished = Signal(int, tuple)
|
||||
object_select_requested = Signal(int, tuple)
|
||||
object_rect_changed = Signal(int, tuple)
|
||||
object_context_requested = Signal(int, tuple)
|
||||
@@ -252,6 +307,7 @@ class PdfViewer(QScrollArea):
|
||||
def set_drawing_enabled(self, enabled: bool) -> None:
|
||||
if enabled:
|
||||
self.set_placement_enabled(False)
|
||||
self.set_area_selection_enabled(False)
|
||||
for label in self._labels():
|
||||
label.drawing_enabled = enabled
|
||||
label.setCursor(Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor)
|
||||
@@ -261,17 +317,34 @@ class PdfViewer(QScrollArea):
|
||||
if enabled:
|
||||
for label in self._labels():
|
||||
label.drawing_enabled = False
|
||||
label.area_selection_enabled = False
|
||||
self.set_object_edit_enabled(False)
|
||||
for label in self._labels():
|
||||
label.placement_enabled = enabled
|
||||
label.setCursor(Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor)
|
||||
self.viewport().setCursor(Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor)
|
||||
|
||||
def set_area_selection_enabled(self, enabled: bool) -> None:
|
||||
if enabled:
|
||||
for label in self._labels():
|
||||
label.drawing_enabled = False
|
||||
label.placement_enabled = False
|
||||
self.set_object_edit_enabled(False)
|
||||
for label in self._labels():
|
||||
label.area_selection_enabled = enabled
|
||||
if not enabled:
|
||||
label._selecting_area = False
|
||||
label._area_rect = QRectF()
|
||||
label.update()
|
||||
label.setCursor(Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor)
|
||||
self.viewport().setCursor(Qt.CursorShape.CrossCursor if enabled else Qt.CursorShape.ArrowCursor)
|
||||
|
||||
def set_object_edit_enabled(self, enabled: bool) -> None:
|
||||
if enabled:
|
||||
for label in self._labels():
|
||||
label.drawing_enabled = False
|
||||
label.placement_enabled = False
|
||||
label.area_selection_enabled = False
|
||||
else:
|
||||
self.clear_object_selection()
|
||||
for label in self._labels():
|
||||
@@ -283,6 +356,7 @@ class PdfViewer(QScrollArea):
|
||||
for label in self._labels():
|
||||
label.drawing_enabled = False
|
||||
label.placement_enabled = False
|
||||
label.area_selection_enabled = False
|
||||
label.object_edit_enabled = False
|
||||
label.setCursor(Qt.CursorShape.ArrowCursor)
|
||||
self.viewport().setCursor(Qt.CursorShape.ArrowCursor)
|
||||
@@ -350,6 +424,7 @@ class PdfViewer(QScrollArea):
|
||||
def _connect_page_label(self, label: PageLabel, page_index: int) -> None:
|
||||
label.stroke_finished.connect(lambda stroke, index=page_index: self._emit_ink_stroke_for_page(index, stroke))
|
||||
label.placement_requested.connect(lambda point, index=page_index: self._emit_placement_for_page(index, point))
|
||||
label.area_selection_finished.connect(lambda rect, index=page_index: self._emit_area_selection_for_page(index, rect))
|
||||
label.object_select_requested.connect(lambda point, index=page_index: self._emit_object_select_for_page(index, point))
|
||||
label.object_rect_changed.connect(lambda rect, index=page_index: self._emit_object_rect_changed_for_page(index, rect))
|
||||
label.object_context_requested.connect(lambda point, index=page_index: self._emit_object_context_for_page(index, point))
|
||||
@@ -429,6 +504,18 @@ class PdfViewer(QScrollArea):
|
||||
self._set_current_page_from_interaction(page_index)
|
||||
self.placement_requested.emit(page_index, (point.x() / self.zoom, point.y() / self.zoom))
|
||||
|
||||
def _emit_area_selection_for_page(self, page_index: int, rect: QRectF) -> None:
|
||||
self._set_current_page_from_interaction(page_index)
|
||||
self.area_selection_finished.emit(
|
||||
page_index,
|
||||
(
|
||||
rect.left() / self.zoom,
|
||||
rect.top() / self.zoom,
|
||||
rect.right() / self.zoom,
|
||||
rect.bottom() / self.zoom,
|
||||
),
|
||||
)
|
||||
|
||||
def _emit_object_select_for_page(self, page_index: int, point: QPointF) -> None:
|
||||
self._set_current_page_from_interaction(page_index)
|
||||
self.object_select_requested.emit(page_index, (point.x() / self.zoom, point.y() / self.zoom))
|
||||
|
||||
Reference in New Issue
Block a user