projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced boost::function with std::function
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 7f2cedea0ccde0a1975c5a202e82a46fd62400b2..c5789630be883ed2bb45b3154576eafb4bad0a4b 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-18,6
+18,8
@@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
+#include <cassert>
+
#include "view.h"
#include "viewport.h"
#include "view.h"
#include "viewport.h"
@@
-26,10
+28,10
@@
#include <QMouseEvent>
#include <QMouseEvent>
-#include <boost/foreach.hpp>
-
-using
namespace boost
;
-using
namespace std
;
+using std::max;
+using std::min;
+using
std::shared_ptr
;
+using
std::vector
;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-42,18
+44,24
@@
Viewport::Viewport(View &parent) :
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
setAutoFillBackground(true);
setBackgroundRole(QPalette::Base);
+ connect(&_view.session(), SIGNAL(signals_changed()),
+ this, SLOT(on_signals_changed()));
+
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
connect(&_view, SIGNAL(signals_moved()),
this, SLOT(on_signals_moved()));
+
+ // Trigger the initial event manually. The default device has signals
+ // which were created before this object came into being
+ on_signals_changed();
}
int Viewport::get_total_height() const
{
int h = 0;
}
int Viewport::get_total_height() const
{
int h = 0;
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
- BOOST_FOREACH(const shared_ptr<Signal> s, sigs) {
- assert(s);
- h = max(s->get_v_offset() + View::SignalHeight, h);
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ for (const shared_ptr<Trace> t : traces) {
+ assert(t);
+ h = max(t->get_v_offset() + View::SignalHeight, h);
}
return h;
}
return h;
@@
-61,8
+69,7
@@
int Viewport::get_total_height() const
void Viewport::paintEvent(QPaintEvent*)
{
void Viewport::paintEvent(QPaintEvent*)
{
- const vector< shared_ptr<Signal> > sigs(
- _view.session().get_signals());
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
QPainter p(this);
p.setRenderHint(QPainter::Antialiasing);
@@
-71,14
+78,18
@@
void Viewport::paintEvent(QPaintEvent*)
_view.cursors().draw_viewport_background(p, rect());
// Plot the signal
_view.cursors().draw_viewport_background(p, rect());
// Plot the signal
- const int v_offset = _view.v_offset();
- BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
+ for (const shared_ptr<Trace> t : traces)
{
{
- assert(s);
- s->paint(p, s->get_v_offset() - v_offset, 0, width(),
- _view.scale(), _view.offset());
+ assert(t);
+ t->paint_back(p, 0, width());
}
}
+ for (const shared_ptr<Trace> t : traces)
+ t->paint_mid(p, 0, width());
+
+ for (const shared_ptr<Trace> t : traces)
+ t->paint_fore(p, 0, width());
+
if (_view.cursors_shown())
_view.cursors().draw_viewport_foreground(p, rect());
if (_view.cursors_shown())
_view.cursors().draw_viewport_foreground(p, rect());
@@
-106,6
+117,16
@@
void Viewport::mouseMoveEvent(QMouseEvent *event)
}
}
}
}
+void Viewport::mouseDoubleClickEvent(QMouseEvent *event)
+{
+ assert(event);
+
+ if (event->buttons() & Qt::LeftButton)
+ _view.zoom(2.0, event->x());
+ else if (event->buttons() & Qt::RightButton)
+ _view.zoom(-2.0, event->x());
+}
+
void Viewport::wheelEvent(QWheelEvent *event)
{
assert(event);
void Viewport::wheelEvent(QWheelEvent *event)
{
assert(event);
@@
-121,6
+142,16
@@
void Viewport::wheelEvent(QWheelEvent *event)
}
}
}
}
+void Viewport::on_signals_changed()
+{
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ for (shared_ptr<Trace> t : traces) {
+ assert(t);
+ connect(t.get(), SIGNAL(visibility_changed()),
+ this, SLOT(update()));
+ }
+}
+
void Viewport::on_signals_moved()
{
update();
void Viewport::on_signals_moved()
{
update();