X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fview%2Fheader.cpp;h=e7bfcbf01a1df5e5d6febc762a8219c78fc4b3b6;hp=e14a9f246ecfb39e7d390e9d9f96be136cdf80e9;hb=6f98ca4cc1b777e35194fc6f6b38704e696d0937;hpb=38eeddeab105aea3f8015dda5399ebbead21550a diff --git a/pv/view/header.cpp b/pv/view/header.cpp index e14a9f24..e7bfcbf0 100644 --- a/pv/view/header.cpp +++ b/pv/view/header.cpp @@ -29,36 +29,56 @@ #include #include -#include -#include #include #include #include #include -using namespace boost; -using namespace std; +#include + +using boost::shared_ptr; +using std::max; +using std::make_pair; +using std::pair; +using std::vector; namespace pv { namespace view { +const int Header::Padding = 12; + Header::Header(View &parent) : MarginWidget(parent), - _action_set_name(new QAction(tr("Set &Name..."), this)), - _action_set_colour(new QAction(tr("Set &Colour..."), this)) + _dragging(false) { + setFocusPolicy(Qt::ClickFocus); setMouseTracking(true); - connect(_action_set_name, SIGNAL(triggered()), - this, SLOT(on_action_set_name_triggered())); - connect(_action_set_colour, SIGNAL(triggered()), - this, SLOT(on_action_set_colour_triggered())); - 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(); +} + +QSize Header::sizeHint() const +{ + int max_width = 0; + + const vector< shared_ptr > traces(_view.get_traces()); + BOOST_FOREACH(shared_ptr t, traces) { + assert(t); + + if (t->enabled()) { + max_width = max(max_width, (int)t->get_label_rect(0).width()); + } + } + + return QSize(max_width + Padding, 0); } shared_ptr Header::get_mouse_over_trace(const QPoint &pt) @@ -66,13 +86,10 @@ shared_ptr Header::get_mouse_over_trace(const QPoint &pt) const int w = width(); const vector< shared_ptr > traces(_view.get_traces()); - const int v_offset = _view.v_offset(); BOOST_FOREACH(const shared_ptr t, traces) { assert(t); - - if (t->pt_in_label_rect(t->get_v_offset() - v_offset, - 0, w, pt)) + if (t->pt_in_label_rect(0, w, pt)) return t; } @@ -98,16 +115,14 @@ void Header::paintEvent(QPaintEvent*) QPainter painter(this); painter.setRenderHint(QPainter::Antialiasing); - const int v_offset = _view.v_offset(); const bool dragging = !_drag_traces.empty(); BOOST_FOREACH(const shared_ptr t, traces) { assert(t); - const int y = t->get_v_offset() - v_offset; const bool highlight = !dragging && t->pt_in_label_rect( - y, 0, w, _mouse_point); - t->paint_label(painter, y, w, highlight); + 0, w, _mouse_point); + t->paint_label(painter, w, highlight); } painter.end(); @@ -164,10 +179,28 @@ void Header::mousePressEvent(QMouseEvent *event) 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 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(); + } + } + + _dragging = false; _drag_traces.clear(); - _view.normalize_layout(); } } @@ -176,8 +209,18 @@ void Header::mouseMoveEvent(QMouseEvent *event) assert(event); _mouse_point = event->pos(); + if (!(event->buttons() & Qt::LeftButton)) + return; + + if ((event->pos() - _mouse_down_point).manhattanLength() < + QApplication::startDragDistance()) + return; + // Move the signals if we are dragging - if (!_drag_traces.empty()) { + if (!_drag_traces.empty()) + { + _dragging = true; + const int delta = event->pos().y() - _mouse_down_point.y(); for (std::list, @@ -214,44 +257,25 @@ void Header::contextMenuEvent(QContextMenuEvent *event) { const shared_ptr t = get_mouse_over_trace(_mouse_point); - if (!t) - return; - - QMenu menu(this); - menu.addAction(_action_set_name); - menu.addAction(_action_set_colour); - - _context_trace = t; - menu.exec(event->globalPos()); - _context_trace.reset(); + if (t) + t->create_context_menu(this)->exec(event->globalPos()); } -void Header::on_action_set_name_triggered() +void Header::keyPressEvent(QKeyEvent *e) { - bool ok = false; - - shared_ptr context_trace = _context_trace; - if (!context_trace) - return; - - const QString new_label = QInputDialog::getText(this, tr("Set Name"), - tr("Name"), QLineEdit::Normal, context_trace->get_name(), &ok); - - if (ok) - context_trace->set_name(new_label); -} + assert(e); -void Header::on_action_set_colour_triggered() -{ - shared_ptr context_trace = _context_trace; - if (!context_trace) - return; - - const QColor new_colour = QColorDialog::getColor( - context_trace->get_colour(), this, tr("Set Colour")); - - if (new_colour.isValid()) - context_trace->set_colour(new_colour); + switch (e->key()) + { + case Qt::Key_Delete: + { + const vector< shared_ptr > traces(_view.get_traces()); + BOOST_FOREACH(const shared_ptr t, traces) + if (t->selected()) + t->delete_pressed(); + break; + } + } } void Header::on_signals_changed() @@ -259,7 +283,12 @@ void Header::on_signals_changed() const vector< shared_ptr > traces(_view.get_traces()); BOOST_FOREACH(shared_ptr t, traces) { assert(t); - connect(t.get(), SIGNAL(text_changed()), this, SLOT(update())); + connect(t.get(), SIGNAL(visibility_changed()), + this, SLOT(on_trace_changed())); + connect(t.get(), SIGNAL(text_changed()), + this, SLOT(on_trace_changed())); + connect(t.get(), SIGNAL(colour_changed()), + this, SLOT(update())); } } @@ -268,6 +297,11 @@ void Header::on_signals_moved() update(); } +void Header::on_trace_changed() +{ + update(); + geometry_updated(); +} } // namespace view } // namespace pv