Add V2 area markup and object editing enhancements

This commit is contained in:
2026-06-30 17:57:28 +08:00
parent fc305699dc
commit 42531a845b
6 changed files with 547 additions and 79 deletions
+88 -1
View File
@@ -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))