projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Plot caps and edges with different colours
[pulseview.git]
/
sigview.cpp
diff --git
a/sigview.cpp
b/sigview.cpp
index df1eefec2745fec15041766a4777d086d6e114eb..4097ae5c25fe1f316b4cd9359dbe44b79bd8a8cf 100644
(file)
--- a/
sigview.cpp
+++ b/
sigview.cpp
@@
-35,7
+35,7
@@
const int SigView::SignalHeight = 50;
SigView::SigView(SigSession &session, QWidget *parent) :
QGLWidget(parent),
_session(session),
SigView::SigView(SigSession &session, QWidget *parent) :
QGLWidget(parent),
_session(session),
- _scale(1
000000000ULL
),
+ _scale(1
e-6
),
_offset(0)
{
connect(&_session, SIGNAL(dataUpdated()),
_offset(0)
{
connect(&_session, SIGNAL(dataUpdated()),
@@
-98,17
+98,21
@@
void SigView::mouseReleaseEvent(QMouseEvent *event)
{
assert(event);
{
assert(event);
+ const double cursor_offset = _offset + _scale * (double)event->x();
+
switch(event->button())
{
case Qt::LeftButton:
switch(event->button())
{
case Qt::LeftButton:
- _scale
= (_scale * 2) / 3
;
+ _scale
*= 2.0 / 3.0
;
break;
case Qt::RightButton:
break;
case Qt::RightButton:
- _scale
= (_scale * 3) / 2
;
+ _scale
*= 3.0 / 2.0
;
break;
}
break;
}
+ _offset = cursor_offset - _scale * (double)event->x();
+
updateGL();
}
updateGL();
}