From 2d42da6f1ac9a5af4cc510184aac32af9a0edaf5 Mon Sep 17 00:00:00 2001 From: Tyler Goodlet Date: Fri, 16 Jul 2021 16:03:32 -0400 Subject: [PATCH] Move marker label anchor to anchors mod --- piker/ui/_anchors.py | 16 ++++++++++++++++ piker/ui/_lines.py | 18 +++++++----------- 2 files changed, 23 insertions(+), 11 deletions(-) diff --git a/piker/ui/_anchors.py b/piker/ui/_anchors.py index 4a78f375..5d3a17f3 100644 --- a/piker/ui/_anchors.py +++ b/piker/ui/_anchors.py @@ -21,6 +21,7 @@ Anchor funtions for UI placement of annotions. from typing import Callable from PyQt5.QtCore import QPointF +from PyQt5.QtGui import QGraphicsPathItem from ._label import Label @@ -155,3 +156,18 @@ def update_pp_nav( # re-anchor label (i.e. trigger call of ``arrow_tr()`` from above label.update() + + +def path_topright( + gpath: QGraphicsPathItem, + label: Label, # noqa + +) -> QPointF: + # get actual arrow graphics path + path_br = gpath.mapToScene( + gpath.path() + ).boundingRect() + + # vb.locate(arrow_path) #, children=True) + + return path_br.topRight() - QPointF(0, label.h / 3) diff --git a/piker/ui/_lines.py b/piker/ui/_lines.py index 9e5fbd9c..d354e6b9 100644 --- a/piker/ui/_lines.py +++ b/piker/ui/_lines.py @@ -26,6 +26,7 @@ import pyqtgraph as pg from pyqtgraph import Point, functions as fn from PyQt5 import QtCore, QtGui, QtWidgets from PyQt5.QtCore import QPointF +from PyQt5.QtGui import QGraphicsPathItem from ._annotate import mk_marker, qgo_draw_markers from ._anchors import ( @@ -33,6 +34,7 @@ from ._anchors import ( vbr_left, right_axis, update_pp_nav, + path_topright, ) from ._label import Label from ._style import hcolor, _font @@ -767,17 +769,11 @@ def position_line( ) arrow_path.label = marker_label - def arrow_tr(): - # get actual arrow graphics path - path_br = arrow_path.mapToScene( - arrow_path.path() - ).boundingRect() - - # vb.locate(arrow_path) #, children=True) - - return path_br.topRight() - QPointF(0, marker_label.h / 3) - - marker_label.scene_anchor = arrow_tr + marker_label.scene_anchor = partial( + path_topright, + gpath=arrow_path, + label=marker_label, + ) line._labels.append(marker_label)