#include <libsigrokdecode/libsigrokdecode.h>
#endif
-#include <assert.h>
-#include <limits.h>
-#include <math.h>
-
-#include <boost/foreach.hpp>
+#include <cassert>
+#include <climits>
+#include <cmath>
+#include <mutex>
#include <QEvent>
#include <QMouseEvent>
#include <QScrollBar>
+#include "cursorheader.h"
#include "decodetrace.h"
#include "header.h"
#include "ruler.h"
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
-using boost::shared_ptr;
-using boost::weak_ptr;
+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;
using std::pair;
using std::set;
+using std::shared_ptr;
using std::vector;
+using std::weak_ptr;
namespace pv {
namespace view {
_session(session),
_viewport(new Viewport(*this)),
_ruler(new Ruler(*this)),
+ _cursorheader(new CursorHeader(*this)),
_header(new Header(*this)),
_scale(1e-6),
_offset(0),
connect(&_session, SIGNAL(signals_changed()),
this, SLOT(signals_changed()));
- connect(&_session, SIGNAL(data_updated()),
+ connect(&_session, SIGNAL(capture_state_changed(int)),
+ this, SLOT(data_updated()));
+ connect(&_session, SIGNAL(data_received()),
+ this, SLOT(data_updated()));
+ connect(&_session, SIGNAL(frame_ended()),
this, SLOT(data_updated()));
connect(_cursors.first().get(), SIGNAL(time_changed()),
this, SLOT(on_signals_moved()));
connect(_header, SIGNAL(selection_changed()),
- _ruler, SLOT(clear_selection()));
- connect(_ruler, SIGNAL(selection_changed()),
+ _cursorheader, SLOT(clear_selection()));
+ connect(_cursorheader, SIGNAL(selection_changed()),
_header, SLOT(clear_selection()));
connect(_header, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
- connect(_ruler, 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);
_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();
}
SigSession& View::session()
return _session;
}
+View* View::view()
+{
+ return this;
+}
+
+const View* View::view() const
+{
+ return this;
+}
+
+Viewport* View::viewport()
+{
+ return _viewport;
+}
+
+const Viewport* View::viewport() const
+{
+ return _viewport;
+}
+
double View::scale() const
{
return _scale;
return _offset;
}
-int View::v_offset() const
+int View::owner_v_offset() const
{
- return _v_offset;
+ return -_v_offset;
}
void View::zoom(double steps)
void View::zoom(double steps, int offset)
{
- const double new_scale = max(min(_scale * pow(3.0/2.0, -steps),
- MaxScale), MinScale);
- set_zoom(new_scale, offset);
+ set_zoom(_scale * pow(3.0/2.0, -steps), offset);
}
void View::zoom_fit()
if (w <= 0)
return;
- set_scale_offset(delta / w, extents.first);
+ const double scale = max(min(delta / w, MaxScale), MinScale);
+ set_scale_offset(scale, extents.first);
}
void View::zoom_one_to_one()
{
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;
- BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
- if (sig->enabled())
- visible_data.insert(sig->data());
-
+ set< shared_ptr<SignalData> > visible_data = get_visible_data();
if (visible_data.empty())
return;
double samplerate = 0.0;
- BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data) {
+ for (const shared_ptr<SignalData> d : visible_data) {
assert(d);
samplerate = max(samplerate, d->samplerate());
}
update_scroll();
_ruler->update();
+ _cursorheader->update();
_viewport->update();
scale_offset_changed();
}
-vector< shared_ptr<Trace> > View::get_traces() const
-{
- const vector< shared_ptr<Signal> > sigs(
- session().get_signals());
-#ifdef ENABLE_DECODE
- const vector< shared_ptr<DecodeTrace> > decode_sigs(
- session().get_decode_signals());
- vector< shared_ptr<Trace> > traces(
- sigs.size() + decode_sigs.size());
-#else
- vector< shared_ptr<Trace> > traces(sigs.size());
-#endif
-
- vector< shared_ptr<Trace> >::iterator i = traces.begin();
- i = copy(sigs.begin(), sigs.end(), i);
-#ifdef ENABLE_DECODE
- i = copy(decode_sigs.begin(), decode_sigs.end(), i);
-#endif
-
- stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
- 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());
- BOOST_FOREACH (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;
- BOOST_FOREACH(const shared_ptr<Signal> sig, sigs)
+ for (const shared_ptr<Signal> sig : sigs)
if (sig->enabled())
visible_data.insert(sig->data());
return make_pair(0.0, 0.0);
double left_time = DBL_MAX, right_time = DBL_MIN;
- BOOST_FOREACH(const shared_ptr<SignalData> d, visible_data)
+ for (const shared_ptr<SignalData> d : visible_data)
{
const double start_time = d->get_start_time();
double samplerate = d->samplerate();
void View::show_cursors(bool show)
{
_show_cursors = show;
- _ruler->update();
+ _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);
- _ruler->update();
+ _cursorheader->update();
_viewport->update();
}
void View::normalize_layout()
{
- const vector< shared_ptr<Trace> > traces(get_traces());
-
int v_min = INT_MAX;
- BOOST_FOREACH(const shared_ptr<Trace> t, traces)
- v_min = min(t->get_v_offset(), v_min);
+ for (const shared_ptr<RowItem> r : *this)
+ v_min = min(r->v_offset(), v_min);
const int delta = -min(v_min, 0);
- BOOST_FOREACH(shared_ptr<Trace> t, traces)
- t->set_v_offset(t->get_v_offset() + delta);
+ for (shared_ptr<RowItem> r : *this)
+ r->set_v_offset(r->v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
v_scroll_value_changed(verticalScrollBar()->sliderPosition());
void View::update_layout()
{
- setViewportMargins(_header->sizeHint().width(),
+ 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(),
- _viewport->x(), _viewport->height());
+ _header->sizeHint().width(), _viewport->height());
update_scroll();
}
-bool View::compare_trace_v_offsets(const shared_ptr<Trace> &a,
- const shared_ptr<Trace> &b)
+void View::paint_label(QPainter &p, int right, bool hover)
{
- assert(a);
- assert(b);
- return a->get_v_offset() < b->get_v_offset();
+ (void)p;
+ (void)right;
+ (void)hover;
+}
+
+QRectF View::label_rect(int right)
+{
+ (void)right;
+ return QRectF();
}
bool View::eventFilter(QObject *object, QEvent *event)
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
if (object == _viewport)
_hover_point = mouse_event->pos();
- else if (object == _ruler)
+ else if (object == _ruler || object == _cursorheader)
_hover_point = QPoint(mouse_event->x(), 0);
else if (object == _header)
_hover_point = QPoint(0, mouse_event->y());
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
case QEvent::Wheel:
+ case QEvent::TouchBegin:
+ case QEvent::TouchUpdate:
+ case QEvent::TouchEnd:
return false;
default:
}
_ruler->update();
+ _cursorheader->update();
_viewport->update();
}
void View::signals_changed()
{
+ // 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 = SignalMargin + SignalHeight;
- const vector< shared_ptr<Trace> > traces(get_traces());
- BOOST_FOREACH(shared_ptr<Trace> t, traces) {
- t->set_view(this);
- t->set_v_offset(offset);
+ for (shared_ptr<RowItem> r : *this) {
+ r->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
}
update_layout();
normalize_layout();
+
+ // Update the child widgets
+ _header->signals_updated();
+ _viewport->signals_updated();
}
void View::data_updated()
void View::marker_time_changed()
{
- _ruler->update();
+ _cursorheader->update();
_viewport->update();
}
update_layout();
}
+void View::on_hover_point_changed()
+{
+ for (shared_ptr<RowItem> r : *this)
+ r->hover_point_changed();
+}
+
} // namespace view
} // namespace pv
projects / pulseview.git / blobdiff