projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace View ownership of traces with RowItemOwner
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index cf990bcdced9f7cf44eeac9b149f2942cb8c2cc9..7a55bbb3fd2776fc7c38afae05864a5e2649b683 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-26,12
+26,11
@@
#include <limits.h>
#include <math.h>
#include <limits.h>
#include <math.h>
-#include <boost/foreach.hpp>
-
#include <QEvent>
#include <QMouseEvent>
#include <QScrollBar>
#include <QEvent>
#include <QMouseEvent>
#include <QScrollBar>
+#include "cursorheader.h"
#include "decodetrace.h"
#include "header.h"
#include "ruler.h"
#include "decodetrace.h"
#include "header.h"
#include "ruler.h"
@@
-43,9
+42,8
@@
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
#include "pv/data/logic.h"
#include "pv/data/logicsnapshot.h"
-using boost::shared_ptr;
-using boost::weak_ptr;
using pv::data::SignalData;
using pv::data::SignalData;
+using std::back_inserter;
using std::deque;
using std::list;
using std::max;
using std::deque;
using std::list;
using std::max;
@@
-53,7
+51,9
@@
using std::make_pair;
using std::min;
using std::pair;
using std::set;
using std::min;
using std::pair;
using std::set;
+using std::shared_ptr;
using std::vector;
using std::vector;
+using std::weak_ptr;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-76,6
+76,7
@@
View::View(SigSession &session, QWidget *parent) :
_session(session),
_viewport(new Viewport(*this)),
_ruler(new Ruler(*this)),
_session(session),
_viewport(new Viewport(*this)),
_ruler(new Ruler(*this)),
+ _cursorheader(new CursorHeader(*this)),
_header(new Header(*this)),
_scale(1e-6),
_offset(0),
_header(new Header(*this)),
_scale(1e-6),
_offset(0),
@@
-92,7
+93,11
@@
View::View(SigSession &session, QWidget *parent) :
connect(&_session, SIGNAL(signals_changed()),
this, SLOT(signals_changed()));
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(data_updated()));
connect(_cursors.first().get(), SIGNAL(time_changed()),
@@
-106,20
+111,32
@@
View::View(SigSession &session, QWidget *parent) :
this, SLOT(on_signals_moved()));
connect(_header, SIGNAL(selection_changed()),
this, SLOT(on_signals_moved()));
connect(_header, SIGNAL(selection_changed()),
- _
rul
er, SLOT(clear_selection()));
- connect(_
rul
er, SIGNAL(selection_changed()),
+ _
cursorhead
er, SLOT(clear_selection()));
+ connect(_
cursorhead
er, SIGNAL(selection_changed()),
_header, SLOT(clear_selection()));
connect(_header, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
_header, SLOT(clear_selection()));
connect(_header, SIGNAL(selection_changed()),
this, SIGNAL(selection_changed()));
- connect(_
rul
er, SIGNAL(selection_changed()),
+ connect(_
cursorhead
er, SIGNAL(selection_changed()),
this, 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);
setViewport(_viewport);
_viewport->installEventFilter(this);
_ruler->installEventFilter(this);
+ _cursorheader->installEventFilter(this);
_header->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()
}
SigSession& View::session()
@@
-132,6
+149,26
@@
const SigSession& View::session() const
return _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;
double View::scale() const
{
return _scale;
@@
-142,9
+179,9
@@
double View::offset() const
return _offset;
}
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)
@@
-169,7
+206,8
@@
void View::zoom_fit()
if (w <= 0)
return;
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()
}
void View::zoom_one_to_one()
@@
-180,16
+218,12
@@
void View::zoom_one_to_one()
session().get_signals());
// Make a set of all the visible data objects
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;
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());
}
assert(d);
samplerate = max(samplerate, d->samplerate());
}
@@
-212,31
+246,30
@@
void View::set_scale_offset(double scale, double offset)
update_scroll();
_ruler->update();
update_scroll();
_ruler->update();
+ _cursorheader->update();
_viewport->update();
scale_offset_changed();
}
_viewport->update();
scale_offset_changed();
}
-vector< shared_ptr<
Trace> > View::get_trace
s() const
+vector< shared_ptr<
RowItem> > View::child_item
s() const
{
{
+ vector< shared_ptr<RowItem> > row_items;
+
const vector< shared_ptr<Signal> > sigs(
session().get_signals());
const vector< shared_ptr<Signal> > sigs(
session().get_signals());
+ copy(sigs.begin(), sigs.end(), back_inserter(row_items));
+
#ifdef ENABLE_DECODE
const vector< shared_ptr<DecodeTrace> > decode_sigs(
session().get_decode_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());
+ copy(decode_sigs.begin(), decode_sigs.end(), back_inserter(row_items));
#endif
#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(row_items.begin(), row_items.end(),
+ [](const shared_ptr<RowItem> &a, const shared_ptr<RowItem> &b) {
+ return a->v_offset() < b->v_offset(); });
- stable_sort(traces.begin(), traces.end(), compare_trace_v_offsets);
- return traces;
+ return row_items;
}
list<weak_ptr<SelectableItem> > View::selected_items() const
}
list<weak_ptr<SelectableItem> > View::selected_items() const
@@
-244,11
+277,11
@@
list<weak_ptr<SelectableItem> > View::selected_items() const
list<weak_ptr<SelectableItem> > items;
// List the selected signals
list<weak_ptr<SelectableItem> > items;
// List the selected signals
- const vector< shared_ptr<
Trace> > traces(get_trace
s());
-
BOOST_FOREACH (shared_ptr<Trace> t, trace
s) {
- assert(
t
);
- if (
t
->selected())
- items.push_back(
t
);
+ const vector< shared_ptr<
RowItem> > row_items(child_item
s());
+
for (shared_ptr<RowItem> r : row_item
s) {
+ assert(
r
);
+ if (
r
->selected())
+ items.push_back(
r
);
}
// List the selected cursors
}
// List the selected cursors
@@
-267,7
+300,7
@@
set< shared_ptr<SignalData> > View::get_visible_data() const
// Make a set of all the visible data objects
set< shared_ptr<SignalData> > visible_data;
// 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());
if (sig->enabled())
visible_data.insert(sig->data());
@@
-281,7
+314,7
@@
pair<double, double> View::get_time_extents() const
return make_pair(0.0, 0.0);
double left_time = DBL_MAX, right_time = DBL_MIN;
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();
{
const double start_time = d->get_start_time();
double samplerate = d->samplerate();
@@
-304,7
+337,7
@@
bool View::cursors_shown() const
void View::show_cursors(bool show)
{
_show_cursors = show;
void View::show_cursors(bool show)
{
_show_cursors = show;
- _
rul
er->update();
+ _
cursorhead
er->update();
_viewport->update();
}
_viewport->update();
}
@@
-313,7
+346,7
@@
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);
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);
- _
rul
er->update();
+ _
cursorhead
er->update();
_viewport->update();
}
_viewport->update();
}
@@
-334,15
+367,15
@@
const QPoint& View::hover_point() const
void View::normalize_layout()
{
void View::normalize_layout()
{
- const vector< shared_ptr<
Trace> > traces(get_trace
s());
+ const vector< shared_ptr<
RowItem> > row_items(child_item
s());
int v_min = INT_MAX;
int v_min = INT_MAX;
-
BOOST_FOREACH(const shared_ptr<Trace> t, trace
s)
- v_min = min(
t->get_
v_offset(), v_min);
+
for (const shared_ptr<RowItem> r : row_item
s)
+ v_min = min(
r->
v_offset(), v_min);
const int delta = -min(v_min, 0);
const int delta = -min(v_min, 0);
-
BOOST_FOREACH(shared_ptr<Trace> t, trace
s)
-
t->set_v_offset(t->get_
v_offset() + delta);
+
for (shared_ptr<RowItem> r : row_item
s)
+
r->set_v_offset(r->
v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
v_scroll_value_changed(verticalScrollBar()->sliderPosition());
verticalScrollBar()->setSliderPosition(_v_offset + delta);
v_scroll_value_changed(verticalScrollBar()->sliderPosition());
@@
-404,21
+437,31
@@
void View::update_scroll()
void View::update_layout()
{
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());
_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->setGeometry(0, _viewport->y(),
- _
viewport->x
(), _viewport->height());
+ _
header->sizeHint().width
(), _viewport->height());
update_scroll();
}
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)
+{
+ (void)p;
+ (void)right;
+ (void)hover;
+}
+
+QRectF View::label_rect(int right)
{
{
- assert(a);
- assert(b);
- return a->get_v_offset() < b->get_v_offset();
+ (void)right;
+ return QRectF();
}
bool View::eventFilter(QObject *object, QEvent *event)
}
bool View::eventFilter(QObject *object, QEvent *event)
@@
-429,7
+472,7
@@
bool View::eventFilter(QObject *object, QEvent *event)
const QMouseEvent *const mouse_event = (QMouseEvent*)event;
if (object == _viewport)
_hover_point = mouse_event->pos();
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());
_hover_point = QPoint(mouse_event->x(), 0);
else if (object == _header)
_hover_point = QPoint(0, mouse_event->y());
@@
-455,6
+498,9
@@
bool View::viewportEvent(QEvent *e)
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
case QEvent::Wheel:
case QEvent::MouseButtonDblClick:
case QEvent::MouseMove:
case QEvent::Wheel:
+ case QEvent::TouchBegin:
+ case QEvent::TouchUpdate:
+ case QEvent::TouchEnd:
return false;
default:
return false;
default:
@@
-482,6
+528,7
@@
void View::h_scroll_value_changed(int value)
}
_ruler->update();
}
_ruler->update();
+ _cursorheader->update();
_viewport->update();
}
_viewport->update();
}
@@
-495,10
+542,10
@@
void View::v_scroll_value_changed(int value)
void View::signals_changed()
{
int offset = SignalMargin + SignalHeight;
void View::signals_changed()
{
int offset = SignalMargin + SignalHeight;
- const vector< shared_ptr<
Trace> > traces(get_trace
s());
-
BOOST_FOREACH(shared_ptr<Trace> t, trace
s) {
-
t->set_view
(this);
-
t
->set_v_offset(offset);
+ const vector< shared_ptr<
RowItem> > row_items(child_item
s());
+
for (shared_ptr<RowItem> r : row_item
s) {
+
r->set_owner
(this);
+
r
->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;
}
offset += SignalHeight + 2 * SignalMargin;
}
@@
-517,7
+564,7
@@
void View::data_updated()
void View::marker_time_changed()
{
void View::marker_time_changed()
{
- _
rul
er->update();
+ _
cursorhead
er->update();
_viewport->update();
}
_viewport->update();
}
@@
-532,5
+579,12
@@
void View::on_geometry_updated()
update_layout();
}
update_layout();
}
+void View::on_hover_point_changed()
+{
+ const vector< shared_ptr<RowItem> > row_items(child_items());
+ for (shared_ptr<RowItem> r : row_items)
+ r->hover_point_changed();
+}
+
} // namespace view
} // namespace pv
} // namespace view
} // namespace pv