projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Derrive from std::enable_shared_from_this
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index 372aff252336289e735122332326aa19224af8fd..615802239e2486d1a37d44705f0c98c98265ba80 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-69,7
+69,6
@@
const int View::MaxScrollValue = INT_MAX / 2;
const int View::SignalHeight = 30;
const int View::SignalMargin = 10;
const int View::SignalHeight = 30;
const int View::SignalMargin = 10;
-const int View::SignalSnapGridSize = 10;
const QColor View::CursorAreaColour(220, 231, 243);
const QColor View::CursorAreaColour(220, 231, 243);
@@
-326,14
+325,12
@@
const QPoint& View::hover_point() const
void View::normalize_layout()
{
void View::normalize_layout()
{
- const vector< shared_ptr<RowItem> > row_items(child_items());
-
int v_min = INT_MAX;
int v_min = INT_MAX;
- for (const shared_ptr<RowItem> r :
row_item
s)
+ for (const shared_ptr<RowItem> r :
*thi
s)
v_min = min(r->v_offset(), v_min);
const int delta = -min(v_min, 0);
v_min = min(r->v_offset(), v_min);
const int delta = -min(v_min, 0);
- for (shared_ptr<RowItem> r :
row_item
s)
+ for (shared_ptr<RowItem> r :
*thi
s)
r->set_v_offset(r->v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
r->set_v_offset(r->v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
@@
-517,13
+514,17
@@
void View::signals_changed()
// Create the initial layout
int offset = SignalMargin + SignalHeight;
// Create the initial layout
int offset = SignalMargin + SignalHeight;
- for (shared_ptr<RowItem> r :
child_items()
) {
+ for (shared_ptr<RowItem> r :
*this
) {
r->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
}
update_layout();
normalize_layout();
r->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
}
update_layout();
normalize_layout();
+
+ // Update the child widgets
+ _header->signals_updated();
+ _viewport->signals_updated();
}
void View::data_updated()
}
void View::data_updated()
@@
-554,8
+555,7
@@
void View::on_geometry_updated()
void View::on_hover_point_changed()
{
void View::on_hover_point_changed()
{
- const vector< shared_ptr<RowItem> > row_items(child_items());
- for (shared_ptr<RowItem> r : row_items)
+ for (shared_ptr<RowItem> r : *this)
r->hover_point_changed();
}
r->hover_point_changed();
}