projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix SVG icons not being displayed on Windows.
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 06fab904e75168fab06a9499574446959c93e9a3..e9a1442217d7bc1bd600f6432e0002c7ed0543e3 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-28,8
+28,10
@@
#include <boost/foreach.hpp>
#include <boost/foreach.hpp>
-using namespace boost;
-using namespace std;
+using boost::shared_ptr;
+using std::max;
+using std::min;
+using std::vector;
namespace pv {
namespace view {
namespace pv {
namespace view {
@@
-42,6
+44,9
@@
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()));
}
@@
-72,9
+77,15
@@
void Viewport::paintEvent(QPaintEvent*)
BOOST_FOREACH(const shared_ptr<Trace> t, traces)
{
assert(t);
BOOST_FOREACH(const shared_ptr<Trace> t, traces)
{
assert(t);
- t->paint(p, 0, width());
+ t->paint
_back
(p, 0, width());
}
}
+ BOOST_FOREACH(const shared_ptr<Trace> t, traces)
+ t->paint_mid(p, 0, width());
+
+ BOOST_FOREACH(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());
@@
-102,6
+113,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);
@@
-117,6
+138,16
@@
void Viewport::wheelEvent(QWheelEvent *event)
}
}
}
}
+void Viewport::on_signals_changed()
+{
+ const vector< shared_ptr<Trace> > traces(_view.get_traces());
+ BOOST_FOREACH(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();