#include <libsigrokdecode/libsigrokdecode.h>
#endif
+#include <extdef.h>
+
#include <cassert>
#include <climits>
#include <cmath>
#include <mutex>
+#include <unordered_set>
+#include <QApplication>
#include <QEvent>
+#include <QFontMetrics>
#include <QMouseEvent>
#include <QScrollBar>
-#include "cursorheader.h"
-#include "decodetrace.h"
-#include "header.h"
-#include "ruler.h"
-#include "signal.h"
-#include "view.h"
-#include "viewport.h"
+#include <libsigrok/libsigrok.hpp>
+
+#include "cursorheader.hpp"
+#include "decodetrace.hpp"
+#include "header.hpp"
+#include "logicsignal.hpp"
+#include "ruler.hpp"
+#include "signal.hpp"
+#include "tracegroup.hpp"
+#include "view.hpp"
+#include "viewport.hpp"
-#include "pv/sigsession.h"
-#include "pv/data/logic.h"
-#include "pv/data/logicsnapshot.h"
+#include "pv/session.hpp"
+#include "pv/data/logic.hpp"
+#include "pv/data/logicsnapshot.hpp"
+#include "pv/util.hpp"
using boost::shared_lock;
using boost::shared_mutex;
+
using pv::data::SignalData;
+using pv::util::format_time;
+
using std::back_inserter;
using std::deque;
+using std::dynamic_pointer_cast;
using std::list;
using std::lock_guard;
using std::max;
using std::pair;
using std::set;
using std::shared_ptr;
+using std::unordered_map;
+using std::unordered_set;
using std::vector;
using std::weak_ptr;
const int View::MaxScrollValue = INT_MAX / 2;
+const int View::ScaleUnits[3] = {1, 2, 5};
+
const QColor View::CursorAreaColour(220, 231, 243);
const QSizeF View::LabelPadding(4, 0);
-View::View(SigSession &session, QWidget *parent) :
+View::View(Session &session, QWidget *parent) :
QAbstractScrollArea(parent),
- _session(session),
- _viewport(new Viewport(*this)),
- _ruler(new Ruler(*this)),
- _cursorheader(new CursorHeader(*this)),
- _header(new Header(*this)),
- _scale(1e-6),
- _offset(0),
- _v_offset(0),
- _updating_scroll(false),
- _show_cursors(false),
- _cursors(*this),
- _hover_point(-1, -1)
+ session_(session),
+ viewport_(new Viewport(*this)),
+ ruler_(new Ruler(*this)),
+ cursorheader_(new CursorHeader(*this)),
+ header_(new Header(*this)),
+ scale_(1e-6),
+ offset_(0),
+ v_offset_(0),
+ updating_scroll_(false),
+ tick_period_(0.0),
+ tick_prefix_(0),
+ show_cursors_(false),
+ cursors_(*this),
+ hover_point_(-1, -1)
{
connect(horizontalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(h_scroll_value_changed(int)));
connect(verticalScrollBar(), SIGNAL(valueChanged(int)),
this, SLOT(v_scroll_value_changed(int)));
- connect(&_session, SIGNAL(signals_changed()),
+ connect(&session_, SIGNAL(signals_changed()),
this, SLOT(signals_changed()));
- connect(&_session, SIGNAL(capture_state_changed(int)),
+ connect(&session_, SIGNAL(capture_state_changed(int)),
this, SLOT(data_updated()));
- connect(&_session, SIGNAL(data_received()),
+ connect(&session_, SIGNAL(data_received()),
this, SLOT(data_updated()));
- connect(&_session, SIGNAL(frame_ended()),
+ connect(&session_, SIGNAL(frame_ended()),
this, SLOT(data_updated()));
- connect(_cursors.first().get(), SIGNAL(time_changed()),
+ connect(cursors_.first().get(), SIGNAL(time_changed()),
this, SLOT(marker_time_changed()));
- connect(_cursors.second().get(), SIGNAL(time_changed()),
+ 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()),
+ connect(header_, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
- connect(_header, SIGNAL(selection_changed()),
- _cursorheader, SLOT(clear_selection()));
- connect(_cursorheader, SIGNAL(selection_changed()),
- _header, SLOT(clear_selection()));
+ connect(header_, SIGNAL(selection_changed()),
+ cursorheader_, SLOT(clear_selection()));
+ connect(cursorheader_, SIGNAL(selection_changed()),
+ header_, SLOT(clear_selection()));
- connect(_header, SIGNAL(selection_changed()),
+ connect(header_, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
- connect(_cursorheader, SIGNAL(selection_changed()),
+ connect(cursorheader_, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
connect(this, SIGNAL(hover_point_changed()),
this, SLOT(on_hover_point_changed()));
- setViewport(_viewport);
+ connect(&lazy_event_handler_, SIGNAL(timeout()),
+ this, SLOT(process_sticky_events()));
+ lazy_event_handler_.setSingleShot(true);
- _viewport->installEventFilter(this);
- _ruler->installEventFilter(this);
- _cursorheader->installEventFilter(this);
- _header->installEventFilter(this);
+ setViewport(viewport_);
+
+ viewport_->installEventFilter(this);
+ ruler_->installEventFilter(this);
+ cursorheader_->installEventFilter(this);
+ header_->installEventFilter(this);
// Trigger the initial event manually. The default device has signals
// which were created before this object came into being
signals_changed();
// make sure the transparent widgets are on the top
- _cursorheader->raise();
- _header->raise();
+ cursorheader_->raise();
+ header_->raise();
+
+ // Update the zoom state
+ calculate_tick_spacing();
}
-SigSession& View::session()
+Session& View::session()
{
- return _session;
+ return session_;
}
-const SigSession& View::session() const
+const Session& View::session() const
{
- return _session;
+ return session_;
}
View* View::view()
Viewport* View::viewport()
{
- return _viewport;
+ return viewport_;
}
const Viewport* View::viewport() const
{
- return _viewport;
+ return viewport_;
}
double View::scale() const
{
- return _scale;
+ return scale_;
}
double View::offset() const
{
- return _offset;
+ return offset_;
+}
+
+int View::owner_visual_v_offset() const
+{
+ return -v_offset_;
}
-int View::owner_v_offset() const
+unsigned int View::depth() const
{
- return -_v_offset;
+ return 0;
+}
+
+unsigned int View::tick_prefix() const
+{
+ return tick_prefix_;
+}
+
+double View::tick_period() const
+{
+ return tick_period_;
}
void View::zoom(double steps)
{
- zoom(steps, _viewport->width() / 2);
+ zoom(steps, viewport_->width() / 2);
}
void View::zoom(double steps, int offset)
{
- set_zoom(_scale * pow(3.0/2.0, -steps), offset);
+ set_zoom(scale_ * pow(3.0/2.0, -steps), offset);
}
void View::zoom_fit()
if (delta < 1e-12)
return;
- assert(_viewport);
- const int w = _viewport->width();
+ assert(viewport_);
+ const int w = viewport_->width();
if (w <= 0)
return;
if (samplerate == 0.0)
return;
- assert(_viewport);
- const int w = _viewport->width();
+ assert(viewport_);
+ const int w = viewport_->width();
if (w <= 0)
return;
void View::set_scale_offset(double scale, double offset)
{
- _scale = scale;
- _offset = offset;
+ scale_ = scale;
+ offset_ = offset;
+
+ calculate_tick_spacing();
update_scroll();
- _ruler->update();
- _cursorheader->update();
- _viewport->update();
+ ruler_->update();
+ cursorheader_->update();
+ viewport_->update();
scale_offset_changed();
}
bool View::cursors_shown() const
{
- return _show_cursors;
+ return show_cursors_;
}
void View::show_cursors(bool show)
{
- _show_cursors = show;
- _cursorheader->update();
- _viewport->update();
+ show_cursors_ = show;
+ cursorheader_->update();
+ viewport_->update();
}
void View::centre_cursors()
{
- const double time_width = _scale * _viewport->width();
- _cursors.first()->set_time(_offset + time_width * 0.4);
- _cursors.second()->set_time(_offset + time_width * 0.6);
- _cursorheader->update();
- _viewport->update();
+ const double time_width = scale_ * viewport_->width();
+ cursors_.first()->set_time(offset_ + time_width * 0.4);
+ cursors_.second()->set_time(offset_ + time_width * 0.6);
+ cursorheader_->update();
+ viewport_->update();
}
CursorPair& View::cursors()
{
- return _cursors;
+ return cursors_;
}
const CursorPair& View::cursors() const
{
- return _cursors;
+ return cursors_;
}
const QPoint& View::hover_point() const
{
- return _hover_point;
+ return hover_point_;
}
void View::update_viewport()
{
- assert(_viewport);
- _viewport->update();
+ assert(viewport_);
+ viewport_->update();
+ header_->update();
+}
+
+void View::restack_all_row_items()
+{
+ // Make a set of owners
+ unordered_set< RowItemOwner* > owners;
+ for (const auto &r : *this)
+ owners.insert(r->owner());
+
+ // Make a list that is sorted from deepest first
+ vector< RowItemOwner* > sorted_owners(owners.begin(), owners.end());
+ sort(sorted_owners.begin(), sorted_owners.end(),
+ [](const RowItemOwner* a, const RowItemOwner *b) {
+ return a->depth() > b->depth(); });
+
+ // Restack the items recursively
+ for (auto &o : sorted_owners)
+ o->restack_items();
+
+ // Animate the items to their destination
+ for (const auto &r : *this)
+ r->animate_to_layout_v_offset();
}
void View::get_scroll_layout(double &length, double &offset) const
{
const pair<double, double> extents = get_time_extents();
- length = (extents.second - extents.first) / _scale;
- offset = _offset / _scale;
+ length = (extents.second - extents.first) / scale_;
+ offset = offset_ / scale_;
}
void View::set_zoom(double scale, int offset)
{
- const double cursor_offset = _offset + _scale * offset;
+ const double cursor_offset = offset_ + scale_ * offset;
const double new_scale = max(min(scale, MaxScale), MinScale);
const double new_offset = cursor_offset - new_scale * offset;
set_scale_offset(new_scale, new_offset);
}
+void View::calculate_tick_spacing()
+{
+ const double SpacingIncrement = 32.0f;
+ const double MinValueSpacing = 32.0f;
+
+ double min_width = SpacingIncrement, typical_width;
+
+ QFontMetrics m(QApplication::font());
+
+ do {
+ const double min_period = scale_ * min_width;
+
+ const int order = (int)floorf(log10f(min_period));
+ const double order_decimal = pow(10.0, order);
+
+ unsigned int unit = 0;
+
+ do {
+ tick_period_ = order_decimal * ScaleUnits[unit++];
+ } while (tick_period_ < min_period &&
+ unit < countof(ScaleUnits));
+
+ tick_prefix_ = (order - pv::util::FirstSIPrefixPower) / 3;
+
+ typical_width = m.boundingRect(0, 0, INT_MAX, INT_MAX,
+ Qt::AlignLeft | Qt::AlignTop,
+ format_time(offset_, tick_prefix_)).width() +
+ MinValueSpacing;
+
+ min_width += SpacingIncrement;
+
+ } while(typical_width > tick_period_ / scale_);
+}
+
void View::update_scroll()
{
- assert(_viewport);
+ assert(viewport_);
- const QSize areaSize = _viewport->size();
+ const QSize areaSize = viewport_->size();
// Set the horizontal scroll bar
double length = 0, offset = 0;
get_scroll_layout(length, offset);
length = max(length - areaSize.width(), 0.0);
+ int major_tick_distance = tick_period_ / scale_;
+
horizontalScrollBar()->setPageStep(areaSize.width() / 2);
+ horizontalScrollBar()->setSingleStep(major_tick_distance);
- _updating_scroll = true;
+ updating_scroll_ = true;
if (length < MaxScrollValue) {
horizontalScrollBar()->setRange(0, length);
} else {
horizontalScrollBar()->setRange(0, MaxScrollValue);
horizontalScrollBar()->setSliderPosition(
- _offset * MaxScrollValue / (_scale * length));
+ offset_ * MaxScrollValue / (scale_ * length));
}
- _updating_scroll = false;
+ updating_scroll_ = false;
// Set the vertical scrollbar
verticalScrollBar()->setPageStep(areaSize.height());
void View::update_layout()
{
setViewportMargins(
- _header->sizeHint().width() - pv::view::Header::BaselineOffset,
- _ruler->sizeHint().height(), 0, 0);
- _ruler->setGeometry(_viewport->x(), 0,
- _viewport->width(), _viewport->y());
- _cursorheader->setGeometry(
- _viewport->x(),
- _ruler->sizeHint().height() - _cursorheader->sizeHint().height() / 2,
- _viewport->width(), _cursorheader->sizeHint().height());
- _header->setGeometry(0, _viewport->y(),
- _header->sizeHint().width(), _viewport->height());
+ header_->sizeHint().width() - pv::view::Header::BaselineOffset,
+ ruler_->sizeHint().height(), 0, 0);
+ ruler_->setGeometry(viewport_->x(), 0,
+ viewport_->width(), viewport_->y());
+ cursorheader_->setGeometry(
+ viewport_->x(),
+ ruler_->sizeHint().height() - cursorheader_->sizeHint().height() / 2,
+ viewport_->width(), cursorheader_->sizeHint().height());
+ header_->setGeometry(0, viewport_->y(),
+ header_->sizeHint().width(), viewport_->height());
update_scroll();
}
return QRectF();
}
+bool View::add_channels_to_owner(
+ const vector< shared_ptr<sigrok::Channel> > &channels,
+ RowItemOwner *owner, int &offset,
+ unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
+ &signal_map,
+ std::function<bool (shared_ptr<RowItem>)> filter_func)
+{
+ bool any_added = false;
+
+ assert(owner);
+
+ for (const auto &channel : channels)
+ {
+ const auto iter = signal_map.find(channel);
+ if (iter == signal_map.end() ||
+ (filter_func && !filter_func((*iter).second)))
+ continue;
+
+ shared_ptr<RowItem> row_item = (*iter).second;
+ owner->add_child_item(row_item);
+ apply_offset(row_item, offset);
+ signal_map.erase(iter);
+
+ any_added = true;
+ }
+
+ return any_added;
+}
+
+void View::apply_offset(shared_ptr<RowItem> row_item, int &offset) {
+ assert(row_item);
+ const pair<int, int> extents = row_item->v_extents();
+ if (row_item->enabled())
+ offset += -extents.first;
+ row_item->force_to_v_offset(offset);
+ if (row_item->enabled())
+ offset += extents.second;
+}
+
bool View::eventFilter(QObject *object, QEvent *event)
{
const QEvent::Type type = event->type();
if (type == QEvent::MouseMove) {
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
- if (object == _viewport)
- _hover_point = mouse_event->pos();
- else if (object == _ruler || object == _cursorheader)
- _hover_point = QPoint(mouse_event->x(), 0);
- else if (object == _header)
- _hover_point = QPoint(0, mouse_event->y());
+ if (object == viewport_)
+ hover_point_ = mouse_event->pos();
+ else if (object == ruler_ || object == cursorheader_)
+ hover_point_ = QPoint(mouse_event->x(), 0);
+ else if (object == header_)
+ hover_point_ = QPoint(0, mouse_event->y());
else
- _hover_point = QPoint(-1, -1);
+ hover_point_ = QPoint(-1, -1);
hover_point_changed();
} else if (type == QEvent::Leave) {
- _hover_point = QPoint(-1, -1);
+ hover_point_ = QPoint(-1, -1);
hover_point_changed();
}
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)
+ if (updating_scroll_)
return;
const int range = horizontalScrollBar()->maximum();
if (range < MaxScrollValue)
- _offset = _scale * value;
+ offset_ = scale_ * value;
else {
double length = 0, offset;
get_scroll_layout(length, offset);
- _offset = _scale * length * value / MaxScrollValue;
+ offset_ = scale_ * length * value / MaxScrollValue;
}
- _ruler->update();
- _cursorheader->update();
- _viewport->update();
+ ruler_->update();
+ cursorheader_->update();
+ viewport_->update();
}
void View::v_scroll_value_changed(int value)
{
- _v_offset = value;
- _header->update();
- _viewport->update();
+ v_offset_ = value;
+ header_->update();
+ viewport_->update();
}
void View::signals_changed()
{
+ int offset = 0;
+
// 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);
+ shared_ptr<sigrok::Device> device = session_.device();
+ assert(device);
+ // Collect a set of signals
+ unordered_map<shared_ptr<sigrok::Channel>, shared_ptr<Signal> >
+ signal_map;
+
+ shared_lock<shared_mutex> lock(session_.signals_mutex());
+ const vector< shared_ptr<Signal> > &sigs(session_.signals());
+
+ for (const shared_ptr<Signal> &sig : sigs)
+ signal_map[sig->channel()] = sig;
+
+ // Populate channel groups
+ for (auto entry : device->channel_groups())
+ {
+ const shared_ptr<sigrok::ChannelGroup> &group = entry.second;
+
+ if (group->channels().size() <= 1)
+ continue;
+
+ shared_ptr<TraceGroup> trace_group(new TraceGroup());
+ int child_offset = 0;
+ if (add_channels_to_owner(group->channels(),
+ trace_group.get(), child_offset, signal_map))
+ {
+ add_child_item(trace_group);
+ apply_offset(trace_group, offset);
+ }
+ }
+
+ // Add the remaining logic channels
+ shared_ptr<TraceGroup> logic_trace_group(new TraceGroup());
+ int child_offset = 0;
+
+ if (add_channels_to_owner(device->channels(),
+ logic_trace_group.get(), child_offset, signal_map,
+ [](shared_ptr<RowItem> r) -> bool {
+ return dynamic_pointer_cast<LogicSignal>(r) != nullptr;
+ }))
+
+ {
+ add_child_item(logic_trace_group);
+ apply_offset(logic_trace_group, offset);
+ }
+
+ // Add the remaining channels
+ add_channels_to_owner(device->channels(), this, offset, signal_map);
+ assert(signal_map.empty());
+
+ // Add decode signals
#ifdef ENABLE_DECODE
const vector< shared_ptr<DecodeTrace> > decode_sigs(
session().get_decode_signals());
- for (auto s : decode_sigs)
+ 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->set_v_offset(offset);
- if (r->enabled())
- offset += extents.second;
+ apply_offset(s, offset);
}
+#endif
update_layout();
-
- // Update the child widgets
- _header->signals_updated();
- _viewport->signals_updated();
}
void View::data_updated()
update_scroll();
// Repaint the view
- _viewport->update();
+ viewport_->update();
}
void View::marker_time_changed()
{
- _cursorheader->update();
- _viewport->update();
+ cursorheader_->update();
+ viewport_->update();
}
void View::on_signals_moved()
signals_moved();
}
-void View::on_geometry_updated()
+void View::process_sticky_events()
{
- update_layout();
+ if (sticky_events_ & SelectableItemHExtentsChanged)
+ update_layout();
+ if (sticky_events_ & SelectableItemVExtentsChanged)
+ restack_all_row_items();
+
+ // Clear the sticky events
+ sticky_events_ = 0;
}
void View::on_hover_point_changed()