*/
#include <cassert>
+#include <cmath>
+#include <algorithm>
#include "view.h"
#include "viewport.h"
using std::max;
using std::min;
using std::shared_ptr;
+using std::stable_sort;
using std::vector;
namespace pv {
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()));
-
- // 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
{
int h = 0;
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
- for (const shared_ptr<Trace> t : traces) {
- assert(t);
- h = max(t->get_v_offset() + View::SignalHeight, h);
- }
-
+ for (auto &i : _view)
+ h = max(i->v_offset() + View::SignalHeight, h);
return h;
}
+void Viewport::signals_updated()
+{
+ for (shared_ptr<RowItem> r : _view) {
+ assert(r);
+ connect(r.get(), SIGNAL(appearance_changed()),
+ this, SLOT(update()));
+ }
+}
+
void Viewport::paintEvent(QPaintEvent*)
{
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ 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(); });
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
_view.cursors().draw_viewport_background(p, rect());
// Plot the signal
- for (const shared_ptr<Trace> t : traces)
+ for (const shared_ptr<RowItem> r : row_items)
{
- assert(t);
- t->paint_back(p, 0, width());
+ assert(r);
+ r->paint_back(p, 0, width());
}
- for (const shared_ptr<Trace> t : traces)
- t->paint_mid(p, 0, width());
+ for (const shared_ptr<RowItem> r : row_items)
+ r->paint_mid(p, 0, width());
- for (const shared_ptr<Trace> t : traces)
- t->paint_fore(p, 0, width());
+ for (const shared_ptr<RowItem> r : row_items)
+ r->paint_fore(p, 0, width());
if (_view.cursors_shown())
_view.cursors().draw_viewport_foreground(p, rect());
return true;
}
-void Viewport::on_signals_changed()
-{
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
- for (shared_ptr<Trace> t : traces) {
- assert(t);
- connect(t.get(), SIGNAL(visibility_changed()),
- this, SLOT(update()));
- }
-}
-
void Viewport::on_signals_moved()
{
update();