Replaced lengthy iterator types with the auto keyword

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

diff --git a/pv/view/header.cpp b/pv/view/header.cpp
index f8f5b6380514ac2604730ce0a687c0c469fff04a..a00efb14664534e689464b398040b39d302011ab 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,26 @@ 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);
+
+               if (t->enabled()) {
+                       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)
@@ -197,9 +223,7 @@ void Header::mouseMoveEvent(QMouseEvent *event)
 
                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++) {
+               for (auto i = _drag_traces.begin(); i != _drag_traces.end(); i++) {
                        const boost::shared_ptr<Trace> trace((*i).first);
                        if (trace) {
                                const int y = (*i).second + delta;
@@ -235,12 +259,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(on_trace_changed()));
+               connect(t.get(), SIGNAL(text_changed()),
+                       this, SLOT(on_trace_changed()));
+               connect(t.get(), SIGNAL(colour_changed()),
+                       this, SLOT(update()));
        }
 }
 
@@ -249,6 +295,11 @@ void Header::on_signals_moved()
        update();
 }
 
+void Header::on_trace_changed()
+{
+       update();
+       geometry_updated();
+}
 
 } // namespace view
 } // namespace pv