#include <cmath>
#include <algorithm>
-#include "view.h"
-#include "viewport.h"
+#include "signal.hpp"
+#include "view.hpp"
+#include "viewitempaintparams.hpp"
+#include "viewport.hpp"
-#include "signal.h"
-#include "../sigsession.h"
+#include <pv/session.hpp>
#include <QMouseEvent>
using std::abs;
using std::max;
using std::min;
+using std::none_of;
using std::shared_ptr;
using std::stable_sort;
using std::vector;
namespace view {
Viewport::Viewport(View &parent) :
- QWidget(&parent),
- view_(parent),
+ ViewWidget(parent),
mouse_down_valid_(false),
pinch_zoom_active_(false)
{
setAttribute(Qt::WA_AcceptTouchEvents, true);
- setMouseTracking(true);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
-
- connect(&view_, SIGNAL(signals_moved()),
- this, SLOT(on_signals_moved()));
}
void Viewport::paintEvent(QPaintEvent*)
{
vector< shared_ptr<RowItem> > row_items(view_.begin(), view_.end());
+ assert(none_of(row_items.begin(), row_items.end(),
+ [](const shared_ptr<RowItem> &r) { return !r; }));
+
stable_sort(row_items.begin(), row_items.end(),
[](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
return a->visual_v_offset() < b->visual_v_offset(); });
+ const vector< shared_ptr<TimeItem> > time_items(view_.time_items());
+ assert(none_of(time_items.begin(), time_items.end(),
+ [](const shared_ptr<TimeItem> &t) { return !t; }));
+
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
- if (view_.cursors_shown())
- view_.cursors().draw_viewport_background(p, rect());
+ const ViewItemPaintParams pp(rect(), view_.scale(), view_.offset());
- // Plot the signal
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_back(p, pp);
for (const shared_ptr<RowItem> r : row_items)
- {
- assert(r);
- r->paint_back(p, 0, width());
- }
+ r->paint_back(p, pp);
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_mid(p, pp);
for (const shared_ptr<RowItem> r : row_items)
- r->paint_mid(p, 0, width());
+ r->paint_mid(p, pp);
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());
+ r->paint_fore(p, pp);
+ for (const shared_ptr<TimeItem> t : time_items)
+ t->paint_fore(p, pp);
p.end();
}
return true;
}
-void Viewport::on_signals_moved()
-{
- update();
-}
-
} // namespace view
} // namespace pv