#include "signal.h"
#include "../sigsession.h"
-#include <assert.h>
-
-#include <boost/foreach.hpp>
+#include <cassert>
+#include <algorithm>
#include <QApplication>
#include <QMenu>
#include <pv/widgets/popup.h>
-using namespace boost;
-using namespace std;
+using std::max;
+using std::make_pair;
+using std::pair;
+using std::shared_ptr;
+using std::stable_sort;
+using std::vector;
namespace pv {
namespace view {
const int Header::Padding = 12;
+const int Header::BaselineOffset = 5;
Header::Header(View &parent) :
MarginWidget(parent),
QSize Header::sizeHint() const
{
- int max_width = 0;
-
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
- BOOST_FOREACH(shared_ptr<Trace> t, traces) {
- assert(t);
- max_width = max(max_width, (int)t->get_label_rect(0).width());
- }
-
- return QSize(max_width + Padding, 0);
+ QRectF max_rect(-Padding, 0, Padding, 0);
+ for (auto &i : _view)
+ if (i->enabled())
+ max_rect = max_rect.united(i->label_rect(0));
+ return QSize(max_rect.width() + Padding + BaselineOffset, 0);
}
-shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
+shared_ptr<RowItem> Header::get_mouse_over_row_item(const QPoint &pt)
{
- const int w = width();
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
- BOOST_FOREACH(const shared_ptr<Trace> t, traces)
- {
- assert(t);
- if (t->pt_in_label_rect(0, w, pt))
- return t;
- }
-
- return shared_ptr<Trace>();
+ const int w = width() - BaselineOffset;
+ for (auto &i : _view)
+ if (i->enabled() && i->label_rect(w).contains(pt))
+ return i;
+ return shared_ptr<RowItem>();
}
void Header::clear_selection()
{
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
- BOOST_FOREACH(const shared_ptr<Trace> t, traces) {
- assert(t);
- t->select(false);
- }
-
+ for (auto &i : _view)
+ i->select(false);
update();
}
+void Header::show_popup(const shared_ptr<RowItem> &item)
+{
+ using pv::widgets::Popup;
+
+ Popup *const p = item->create_popup(&_view);
+ if (!p)
+ return;
+
+ const QPoint pt(width() - BaselineOffset, item->get_y());
+ p->set_position(mapToGlobal(pt), Popup::Right);
+ p->show();
+}
+
void Header::paintEvent(QPaintEvent*)
{
- const int w = width();
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ // The trace labels are not drawn with the arrows exactly on the
+ // left edge of the widget, because then the selection shadow
+ // would be clipped away.
+ const int w = width() - BaselineOffset;
+
+ 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 painter(this);
painter.setRenderHint(QPainter::Antialiasing);
- const bool dragging = !_drag_traces.empty();
- BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+ const bool dragging = !_drag_row_items.empty();
+ for (const shared_ptr<RowItem> r : row_items)
{
- assert(t);
+ assert(r);
- const bool highlight = !dragging && t->pt_in_label_rect(
- 0, w, _mouse_point);
- t->paint_label(painter, w, highlight);
+ const bool highlight = !dragging &&
+ r->label_rect(w).contains(_mouse_point);
+ r->paint_label(painter, w, highlight);
}
painter.end();
{
assert(event);
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
-
if (event->button() & Qt::LeftButton) {
_mouse_down_point = event->pos();
// Save the offsets of any signals which will be dragged
- BOOST_FOREACH(const shared_ptr<Trace> t, traces)
- if (t->selected())
- _drag_traces.push_back(
- make_pair(t, t->get_v_offset()));
+ for (const shared_ptr<RowItem> r : _view)
+ if (r->selected())
+ _drag_row_items.push_back(
+ make_pair(r, r->v_offset()));
}
// Select the signal if it has been clicked
- const shared_ptr<Trace> mouse_over_trace =
- get_mouse_over_trace(event->pos());
- if (mouse_over_trace) {
- if (mouse_over_trace->selected())
- mouse_over_trace->select(false);
+ const shared_ptr<RowItem> mouse_over_row_item =
+ get_mouse_over_row_item(event->pos());
+ if (mouse_over_row_item) {
+ if (mouse_over_row_item->selected())
+ mouse_over_row_item->select(false);
else {
- mouse_over_trace->select(true);
+ mouse_over_row_item->select(true);
if (~QApplication::keyboardModifiers() &
Qt::ControlModifier)
- _drag_traces.clear();
+ _drag_row_items.clear();
// Add the signal to the drag list
if (event->button() & Qt::LeftButton)
- _drag_traces.push_back(
- make_pair(mouse_over_trace,
- mouse_over_trace->get_v_offset()));
+ _drag_row_items.push_back(
+ make_pair(mouse_over_row_item,
+ mouse_over_row_item->v_offset()));
}
}
if (~QApplication::keyboardModifiers() & Qt::ControlModifier) {
// Unselect all other signals because the Ctrl is not
// pressed
- BOOST_FOREACH(const shared_ptr<Trace> t, traces)
- if (t != mouse_over_trace)
- t->select(false);
+ for (const shared_ptr<RowItem> r : _view)
+ if (r != mouse_over_row_item)
+ r->select(false);
}
selection_changed();
void Header::mouseReleaseEvent(QMouseEvent *event)
{
- using pv::widgets::Popup;
-
assert(event);
if (event->button() == Qt::LeftButton) {
if (_dragging)
_view.normalize_layout();
else
{
- const shared_ptr<Trace> mouse_over_trace =
- get_mouse_over_trace(event->pos());
- if (mouse_over_trace) {
- Popup *const p =
- mouse_over_trace->create_popup(&_view);
- p->set_position(mapToGlobal(QPoint(width(),
- mouse_over_trace->get_y())),
- Popup::Right);
- p->show();
- }
+ const shared_ptr<RowItem> mouse_over_row_item =
+ get_mouse_over_row_item(event->pos());
+ if (mouse_over_row_item)
+ show_popup(mouse_over_row_item);
}
_dragging = false;
- _drag_traces.clear();
+ _drag_row_items.clear();
}
}
return;
// Move the signals if we are dragging
- if (!_drag_traces.empty())
+ if (!_drag_row_items.empty())
{
_dragging = true;
const int delta = event->pos().y() - _mouse_down_point.y();
- for (std::list<std::pair<boost::weak_ptr<Trace>,
- int> >::iterator i = _drag_traces.begin();
- i != _drag_traces.end(); i++) {
- const boost::shared_ptr<Trace> trace((*i).first);
- if (trace) {
+ for (auto i = _drag_row_items.begin();
+ i != _drag_row_items.end(); i++) {
+ const std::shared_ptr<RowItem> row_item((*i).first);
+ if (row_item) {
const int y = (*i).second + delta;
const int y_snap =
((y + View::SignalSnapGridSize / 2) /
View::SignalSnapGridSize) *
View::SignalSnapGridSize;
- trace->set_v_offset(y_snap);
+ row_item->set_v_offset(y_snap);
// Ensure the trace is selected
- trace->select();
+ row_item->select();
}
}
void Header::contextMenuEvent(QContextMenuEvent *event)
{
- const shared_ptr<Trace> t = get_mouse_over_trace(_mouse_point);
+ const shared_ptr<RowItem> r = get_mouse_over_row_item(_mouse_point);
+ if (!r)
+ return;
- if (t)
- t->create_context_menu(this)->exec(event->globalPos());
+ QMenu *const menu = r->create_context_menu(this);
+ if (!menu)
+ return;
+
+ menu->exec(event->globalPos());
}
void Header::keyPressEvent(QKeyEvent *e)
{
case Qt::Key_Delete:
{
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
- BOOST_FOREACH(const shared_ptr<Trace> t, traces)
- if (t->selected())
- t->delete_pressed();
+ for (const shared_ptr<RowItem> r : _view)
+ if (r->selected())
+ r->delete_pressed();
break;
}
}
void Header::on_signals_changed()
{
- const vector< shared_ptr<Trace> > traces(_view.get_traces());
- BOOST_FOREACH(shared_ptr<Trace> t, traces) {
- assert(t);
- connect(t.get(), SIGNAL(visibility_changed()),
- this, SLOT(update()));
- connect(t.get(), SIGNAL(text_changed()),
- this, SLOT(on_trace_text_changed()));
- connect(t.get(), SIGNAL(colour_changed()),
+ for (shared_ptr<RowItem> r : _view) {
+ assert(r);
+ connect(r.get(), SIGNAL(visibility_changed()),
+ this, SLOT(on_trace_changed()));
+ connect(r.get(), SIGNAL(text_changed()),
+ this, SLOT(on_trace_changed()));
+ connect(r.get(), SIGNAL(colour_changed()),
this, SLOT(update()));
}
}
update();
}
-void Header::on_trace_text_changed()
+void Header::on_trace_changed()
{
update();
geometry_updated();
projects / pulseview.git / blobdiff