#include <limits.h>
#include <math.h>
-#include <boost/foreach.hpp>
-
#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 pv::data::SignalData;
using std::deque;
using std::list;
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(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()));
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()
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()
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> > traces(sigs.size());
#endif
- vector< shared_ptr<Trace> >::iterator i = traces.begin();
+ auto i = traces.begin();
i = copy(sigs.begin(), sigs.end(), i);
#ifdef ENABLE_DECODE
i = copy(decode_sigs.begin(), decode_sigs.end(), i);
// List the selected signals
const vector< shared_ptr<Trace> > traces(get_traces());
- BOOST_FOREACH (shared_ptr<Trace> t, traces) {
+ for (shared_ptr<Trace> t : traces) {
assert(t);
if (t->selected())
items.push_back(t);
// 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();
}
const vector< shared_ptr<Trace> > traces(get_traces());
int v_min = INT_MAX;
- BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+ for (const shared_ptr<Trace> t : traces)
v_min = min(t->get_v_offset(), v_min);
const int delta = -min(v_min, 0);
- BOOST_FOREACH(shared_ptr<Trace> t, traces)
+ for (shared_ptr<Trace> t : traces)
t->set_v_offset(t->get_v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
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();
}
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();
}
{
int offset = SignalMargin + SignalHeight;
const vector< shared_ptr<Trace> > traces(get_traces());
- BOOST_FOREACH(shared_ptr<Trace> t, traces) {
+ for (shared_ptr<Trace> t : traces) {
t->set_view(this);
t->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
void View::marker_time_changed()
{
- _ruler->update();
+ _cursorheader->update();
_viewport->update();
}