projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replaced std::pair<Cursor, Cursor> with CursorPair
[pulseview.git]
/
pv
/
view
/
viewport.cpp
diff --git
a/pv/view/viewport.cpp
b/pv/view/viewport.cpp
index 90f2b4b2a5a922d63a7931e47d9482c621f4d088..70282d41c4acfbd1cbe759411a716de241079aee 100644
(file)
--- a/
pv/view/viewport.cpp
+++ b/
pv/view/viewport.cpp
@@
-59,7
+59,7
@@
int Viewport::get_total_height() const
return h;
}
return h;
}
-void Viewport::paintEvent(QPaintEvent
*event
)
+void Viewport::paintEvent(QPaintEvent
*
)
{
const vector< shared_ptr<Signal> > sigs(
_view.session().get_signals());
{
const vector< shared_ptr<Signal> > sigs(
_view.session().get_signals());
@@
-74,11
+74,8
@@
void Viewport::paintEvent(QPaintEvent *event)
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
BOOST_FOREACH(const shared_ptr<Signal> s, sigs)
{
assert(s);
-
- const QRect signal_rect(0, s->get_v_offset() - v_offset,
- width(), View::SignalHeight);
-
- s->paint(p, signal_rect, _view.scale(), _view.offset());
+ s->paint(p, s->get_v_offset() - v_offset, 0, width(),
+ _view.scale(), _view.offset());
}
draw_cursors_foreground(p);
}
draw_cursors_foreground(p);
@@
-107,11
+104,6
@@
void Viewport::mouseMoveEvent(QMouseEvent *event)
}
}
}
}
-void Viewport::mouseReleaseEvent(QMouseEvent *event)
-{
- assert(event);
-}
-
void Viewport::wheelEvent(QWheelEvent *event)
{
assert(event);
void Viewport::wheelEvent(QWheelEvent *event)
{
assert(event);
@@
-135,9
+127,9
@@
void Viewport::draw_cursors_background(QPainter &p)
p.setPen(Qt::NoPen);
p.setBrush(QBrush(View::CursorAreaColour));
p.setPen(Qt::NoPen);
p.setBrush(QBrush(View::CursorAreaColour));
- const
pair<Cursor, Cursor>
&c = _view.cursors();
- const float x1 = (c.first.time() - _view.offset()) / _view.scale();
- const float x2 = (c.second.time() - _view.offset()) / _view.scale();
+ const
CursorPair
&c = _view.cursors();
+ const float x1 = (c.first
()
.time() - _view.offset()) / _view.scale();
+ const float x2 = (c.second
()
.time() - _view.offset()) / _view.scale();
const int l = (int)max(min(x1, x2), 0.0f);
const int r = (int)min(max(x1, x2), (float)width());
const int l = (int)max(min(x1, x2), 0.0f);
const int r = (int)min(max(x1, x2), (float)width());
@@
-150,9
+142,9
@@
void Viewport::draw_cursors_foreground(QPainter &p)
return;
const QRect r = rect();
return;
const QRect r = rect();
-
pair<Cursor, Cursor>
&cursors = _view.cursors();
- cursors.first.paint(p, r);
- cursors.second.paint(p, r);
+
CursorPair
&cursors = _view.cursors();
+ cursors.first
()
.paint(p, r);
+ cursors.second
()
.paint(p, r);
}
void Viewport::on_signals_moved()
}
void Viewport::on_signals_moved()