#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <assert.h>
-#include <limits.h>
-#include <math.h>
+#include <cassert>
+#include <climits>
+#include <cmath>
+#include <mutex>
#include <QEvent>
#include <QMouseEvent>
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
+using boost::shared_lock;
+using boost::shared_mutex;
using pv::data::SignalData;
using std::back_inserter;
using std::deque;
using std::list;
+using std::lock_guard;
using std::max;
using std::make_pair;
using std::min;
const int View::MaxScrollValue = INT_MAX / 2;
-const int View::SignalHeight = 30;
-const int View::SignalMargin = 10;
-const int View::SignalSnapGridSize = 10;
-
const QColor View::CursorAreaColour(220, 231, 243);
const QSizeF View::LabelPadding(4, 0);
connect(_cursors.second().get(), SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
- connect(_header, SIGNAL(geometry_updated()),
- this, SLOT(on_geometry_updated()));
connect(_header, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
connect(this, SIGNAL(hover_point_changed()),
this, SLOT(on_hover_point_changed()));
+ connect(&_lazy_event_handler, SIGNAL(timeout()),
+ this, SLOT(process_sticky_events()));
+ _lazy_event_handler.setSingleShot(true);
+
setViewport(_viewport);
_viewport->installEventFilter(this);
return _session;
}
+View* View::view()
+{
+ return this;
+}
+
+const View* View::view() const
+{
+ return this;
+}
+
Viewport* View::viewport()
{
return _viewport;
return _offset;
}
-int View::v_offset() const
+int View::owner_v_offset() const
{
return -_v_offset;
}
+unsigned int View::depth() const
+{
+ return 0;
+}
+
void View::zoom(double steps)
{
zoom(steps, _viewport->width() / 2);
{
using pv::data::SignalData;
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
-
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data = get_visible_data();
if (visible_data.empty())
scale_offset_changed();
}
-vector< shared_ptr<Trace> > View::get_traces() const
-{
- vector< shared_ptr<Trace> > traces;
-
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
- copy(sigs.begin(), sigs.end(), back_inserter(traces));
-
-#ifdef ENABLE_DECODE
- const vector< shared_ptr<DecodeTrace> > decode_sigs(
- session().get_decode_signals());
- copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(traces));
-#endif
-
- stable_sort(traces.begin(), traces.end(),
- [](const shared_ptr<Trace> &a, const shared_ptr<Trace> &b) {
- return a->get_v_offset() < b->get_v_offset(); });
-
- return traces;
-}
-
-list<weak_ptr<SelectableItem> > View::selected_items() const
-{
- list<weak_ptr<SelectableItem> > items;
-
- // List the selected signals
- const vector< shared_ptr<Trace> > traces(get_traces());
- for (shared_ptr<Trace> t : traces) {
- assert(t);
- if (t->selected())
- items.push_back(t);
- }
-
- // List the selected cursors
- if (_cursors.first()->selected())
- items.push_back(_cursors.first());
- if (_cursors.second()->selected())
- items.push_back(_cursors.second());
-
- return items;
-}
-
set< shared_ptr<SignalData> > View::get_visible_data() const
{
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
+ shared_lock<shared_mutex> lock(session().signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(session().signals());
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
return _hover_point;
}
-void View::normalize_layout()
-{
- const vector< shared_ptr<Trace> > traces(get_traces());
-
- int v_min = INT_MAX;
- for (const shared_ptr<Trace> t : traces)
- v_min = min(t->get_v_offset(), v_min);
-
- const int delta = -min(v_min, 0);
- for (shared_ptr<Trace> t : traces)
- t->set_v_offset(t->get_v_offset() + delta);
-
- verticalScrollBar()->setSliderPosition(_v_offset + delta);
- v_scroll_value_changed(verticalScrollBar()->sliderPosition());
-}
-
void View::update_viewport()
{
assert(_viewport);
// Set the vertical scrollbar
verticalScrollBar()->setPageStep(areaSize.height());
- verticalScrollBar()->setRange(0,
- _viewport->get_total_height() + SignalMargin -
- areaSize.height());
+
+ const pair<int, int> extents = v_extents();
+ const int extra_scroll_height = (extents.second - extents.first) / 4;
+ verticalScrollBar()->setRange(extents.first - extra_scroll_height,
+ extents.first + extra_scroll_height);
}
void View::update_layout()
update_scroll();
}
+void View::paint_label(QPainter &p, int right, bool hover)
+{
+ (void)p;
+ (void)right;
+ (void)hover;
+}
+
+QRectF View::label_rect(int right)
+{
+ (void)right;
+ return QRectF();
+}
+
bool View::eventFilter(QObject *object, QEvent *event)
{
const QEvent::Type type = event->type();
update_layout();
}
+void View::appearance_changed(bool label, bool content)
+{
+ if (label)
+ _header->update();
+ if (content)
+ _viewport->update();
+}
+
+void View::extents_changed(bool horz, bool vert)
+{
+ _sticky_events |=
+ (horz ? SelectableItemHExtentsChanged : 0) |
+ (vert ? SelectableItemVExtentsChanged : 0);
+ _lazy_event_handler.start();
+}
+
void View::h_scroll_value_changed(int value)
{
if (_updating_scroll)
void View::signals_changed()
{
- int offset = SignalMargin + SignalHeight;
- const vector< shared_ptr<Trace> > traces(get_traces());
- for (shared_ptr<Trace> t : traces) {
- t->set_view(this);
- t->set_v_offset(offset);
- offset += SignalHeight + 2 * SignalMargin;
+ // Populate the traces
+ clear_child_items();
+
+ shared_lock<shared_mutex> lock(session().signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(session().signals());
+ for (auto s : sigs)
+ add_child_item(s);
+
+#ifdef ENABLE_DECODE
+ const vector< shared_ptr<DecodeTrace> > decode_sigs(
+ session().get_decode_signals());
+ for (auto s : decode_sigs)
+ add_child_item(s);
+#endif
+
+ // Create the initial layout
+ int offset = 0;
+ for (shared_ptr<RowItem> r : *this) {
+ const pair<int, int> extents = r->v_extents();
+ if (r->enabled())
+ offset += -extents.first;
+ r->force_to_v_offset(offset);
+ if (r->enabled())
+ offset += extents.second;
}
update_layout();
- normalize_layout();
}
void View::data_updated()
signals_moved();
}
-void View::on_geometry_updated()
+void View::process_sticky_events()
{
- update_layout();
+ if (_sticky_events & SelectableItemHExtentsChanged)
+ update_layout();
+ if (_sticky_events & SelectableItemVExtentsChanged) {
+ _viewport->update();
+ _header->update();
+ }
+
+ // Clear the sticky events
+ _sticky_events = 0;
}
void View::on_hover_point_changed()
{
- const vector< shared_ptr<Trace> > traces(get_traces());
- for (shared_ptr<Trace> t : traces)
- t->hover_point_changed();
+ for (shared_ptr<RowItem> r : *this)
+ r->hover_point_changed();
}
} // namespace view