TraceGroup: Implemented label_rect

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index 50eefc43cd765b1d0a300fb7fb622549b94044c8..f3849fbe3f1db3ad3005a14273a1a00a9ea434ec 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -64,13 +64,11 @@ Header::Header(View &parent) :
 
 QSize Header::sizeHint() const
 {
 
 QSize Header::sizeHint() const
 {

-       int max_width = 0;
-
+       QRectF max_rect(-Padding, 0, Padding, 0);

        for (auto &i : _view)
                if (i->enabled())
        for (auto &i : _view)
                if (i->enabled())

-                       max_width = max(max_width, (int)i->label_rect(0).width());
-
-       return QSize(max_width + Padding + BaselineOffset, 0);
+                       max_rect = max_rect.united(i->label_rect(0));
+       return QSize(max_rect.width() + Padding + BaselineOffset, 0);

 }
 
 shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
 }
 
 shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)

diff --git a/pv/view/tracegroup.cpp b/pv/view/tracegroup.cpp
index f99b19666ba27892902a97fde42801a47a8ddca2..9d0465fc3c863421f69bec5eaf5740b7629e83f2 100644 (file)
--- a/pv/view/tracegroup.cpp
+++ b/pv/view/tracegroup.cpp
@@ -29,6 +29,9 @@ using std::shared_ptr;
 namespace pv {
 namespace view {
 
 namespace pv {
 namespace view {
 

+const int TraceGroup::Padding = 8;
+const int TraceGroup::Width = 12;
+

 TraceGroup::~TraceGroup()
 {
        _owner = nullptr;
 TraceGroup::~TraceGroup()
 {
        _owner = nullptr;


@@ -74,8 +77,13 @@ void TraceGroup::paint_label(QPainter &p, int right, bool hover)
 
 QRectF TraceGroup::label_rect(int right) const
 {
 
 QRectF TraceGroup::label_rect(int right) const
 {

-       (void)right;
-       return QRectF();
+       QRectF rect;
+       for (const shared_ptr<RowItem> r : child_items())
+               if (r)
+                       rect = rect.united(r->label_rect(right));
+
+       return QRectF(rect.x() - Width - Padding, rect.y(),
+               Width, rect.height());

 }
 
 bool TraceGroup::pt_in_label_rect(int left, int right, const QPoint &point)
 }
 
 bool TraceGroup::pt_in_label_rect(int left, int right, const QPoint &point)

diff --git a/pv/view/tracegroup.h b/pv/view/tracegroup.h
index 0d246cee3c05471c88dbe4f99425eafcea395230..21298dcb01e4d10f09423289a2a98f4ba0cb8ad7 100644 (file)
--- a/pv/view/tracegroup.h
+++ b/pv/view/tracegroup.h
@@ -31,6 +31,10 @@ class TraceGroup : public RowItem, public RowItemOwner
 {
        Q_OBJECT
 
 {
        Q_OBJECT
 

+private:
+       static const int Padding;
+       static const int Width;
+

 public:
        /**
         * Virtual destructor
 public:
        /**
         * Virtual destructor