projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
RowItem: Replaced fixed signal heights with extents
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 43da472890120e4eb01acfb59fdd14db0d716cc0..82d13c92b985985efa7c9033760d80307c181bb6 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-52,32
+52,22
@@
Viewport::Viewport(View &parent) :
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
- connect(&_view.session(), SIGNAL(signals_changed()),
- this, SLOT(on_signals_changed()));
-
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
-
- // Trigger the initial event manually. The default device has signals
- // which were created before this object came into being
- on_signals_changed();
}
}
-int Viewport::get_total_height() const
+void Viewport::signals_updated()
{
{
- int h = 0;
- const vector< shared_ptr<RowItem> > row_items(_view.child_items());
- for (const shared_ptr<RowItem> r : row_items) {
+ for (shared_ptr<RowItem> r : _view) {
assert(r);
assert(r);
- h = max(r->v_offset() + View::SignalHeight, h);
+ connect(r.get(), SIGNAL(appearance_changed()),
+ this, SLOT(update()));
}
}
-
- return h;
}
void Viewport::paintEvent(QPaintEvent*)
{
}
void Viewport::paintEvent(QPaintEvent*)
{
- vector< shared_ptr<RowItem> > row_items(_view.
child_items
());
+ vector< shared_ptr<RowItem> > row_items(_view.
begin(), _view.end
());
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
return a->v_offset() < b->v_offset(); });
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
return a->v_offset() < b->v_offset(); });
@@
-233,16
+223,6
@@
bool Viewport::touchEvent(QTouchEvent *event)
return true;
}
return true;
}
-void Viewport::on_signals_changed()
-{
- const vector< shared_ptr<RowItem> > row_items(_view.child_items());
- for (shared_ptr<RowItem> r : row_items) {
- assert(r);
- connect(r.get(), SIGNAL(visibility_changed()),
- this, SLOT(update()));
- }
-}
-
void Viewport::on_signals_moved()
{
update();
void Viewport::on_signals_moved()
{
update();