projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced lengthy iterator types with the auto keyword
[pulseview.git]
/
pv
/
view
/
view.cpp
diff --git
a/pv/view/view.cpp
b/pv/view/view.cpp
index cf990bcdced9f7cf44eeac9b149f2942cb8c2cc9..3d3b8eb233c74a9cc2498de16e3a7b7522019cfe 100644
(file)
--- a/
pv/view/view.cpp
+++ b/
pv/view/view.cpp
@@
-92,7
+92,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
+122,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()
@@
-169,7
+175,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,11
+187,7
@@
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;
if (visible_data.empty())
return;
@@
-229,7
+232,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);