projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced BOOST_FOREACH with C++11 range-based for loops
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index a437918d9f2a88f3001f35ae9eb33b854530924c..0ebfea1e6d532b94c959569aaf5f1e9d03e601d4 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-26,8
+26,6
@@
#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>
@@
-92,7
+90,9
@@
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(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()),
@@
-120,6
+120,10
@@
View::View(SigSession &session, QWidget *parent) :
_viewport->installEventFilter(this);
_ruler->installEventFilter(this);
_header->installEventFilter(this);
_viewport->installEventFilter(this);
_ruler->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();
}
SigSession& View::session()
}
SigSession& View::session()
@@
-154,9
+158,7
@@
void View::zoom(double steps)
void View::zoom(double steps, int offset)
{
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()
}
void View::zoom_fit()
@@
-171,7
+173,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()
@@
-182,16
+185,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());
}
@@
-231,7
+230,7
@@
vector< shared_ptr<Trace> > View::get_traces() const
vector< shared_ptr<Trace> > traces(sigs.size());
#endif
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);
i = copy(sigs.begin(), sigs.end(), i);
#ifdef ENABLE_DECODE
i = copy(decode_sigs.begin(), decode_sigs.end(), i);
@@
-247,7
+246,7
@@
list<weak_ptr<SelectableItem> > View::selected_items() const
// List the selected signals
const vector< shared_ptr<Trace> > traces(get_traces());
// 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);
assert(t);
if (t->selected())
items.push_back(t);
@@
-269,7
+268,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());
@@
-283,12
+282,15
@@
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();
{
const double start_time = d->get_start_time();
+ double samplerate = d->samplerate();
+ samplerate = (samplerate <= 0.0) ? 1.0 : samplerate;
+
left_time = min(left_time, start_time);
right_time = max(right_time, start_time +
left_time = min(left_time, start_time);
right_time = max(right_time, start_time +
- d->get_max_sample_count() /
d->samplerate()
);
+ d->get_max_sample_count() /
samplerate
);
}
assert(left_time < right_time);
}
assert(left_time < right_time);
@@
-336,11
+338,11
@@
void View::normalize_layout()
const vector< shared_ptr<Trace> > traces(get_traces());
int v_min = INT_MAX;
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);
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);
t->set_v_offset(t->get_v_offset() + delta);
verticalScrollBar()->setSliderPosition(_v_offset + delta);
@@
-495,7
+497,7
@@
void View::signals_changed()
{
int offset = SignalMargin + SignalHeight;
const vector< shared_ptr<Trace> > traces(get_traces());
{
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;
t->set_view(this);
t->set_v_offset(offset);
offset += SignalHeight + 2 * SignalMargin;