Rename 'probe' to 'channel' (libsigrokdecode change).

[pulseview.git] / pv / view / header.cpp

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index f8f5b6380514ac2604730ce0a687c0c469fff04a..a7902521216a90655ba708669ab5b36b2886f52b 100644 (file)
--- a/pv/view/header.cpp
+++ b/pv/view/header.cpp
@@ -36,16 +36,22 @@
 
 #include <pv/widgets/popup.h>
 
-using namespace boost;
-using namespace std;
+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),
        _dragging(false)
 {
+       setFocusPolicy(Qt::ClickFocus);
        setMouseTracking(true);
 
        connect(&_view.session(), SIGNAL(signals_changed()),
@@ -53,6 +59,23 @@ Header::Header(View &parent) :
 
        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<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);
 }
 
 shared_ptr<Trace> Header::get_mouse_over_trace(const QPoint &pt)
@@ -235,12 +258,34 @@ void Header::contextMenuEvent(QContextMenuEvent *event)
                t->create_context_menu(this)->exec(event->globalPos());
 }
 
+void Header::keyPressEvent(QKeyEvent *e)
+{
+       assert(e);
+
+       switch (e->key())
+       {
+       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();    
+               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(text_changed()), this, SLOT(update()));
+               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()),
+                       this, SLOT(update()));
        }
 }
 
@@ -249,6 +294,11 @@ void Header::on_signals_moved()
        update();
 }
 
+void Header::on_trace_text_changed()
+{
+       update();
+       geometry_updated();
+}
 
 } // namespace view
 } // namespace pv