projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Made naming scheme consistent
[pulseview.git]
/
sigview.cpp
diff --git
a/sigview.cpp
b/sigview.cpp
index 6a2b62044ddc488959dde2c64798a5554b83a105..8461af6e455f37b1182ef9b9bc1a8197ada54d09 100644
(file)
--- a/
sigview.cpp
+++ b/
sigview.cpp
@@
-52,8
+52,8
@@
SigView::SigView(SigSession &session, QWidget *parent) :
_scale(1e-6),
_offset(0)
{
_scale(1e-6),
_offset(0)
{
- connect(&_session, SIGNAL(data
U
pdated()),
- this, SLOT(data
U
pdated()));
+ connect(&_session, SIGNAL(data
_u
pdated()),
+ this, SLOT(data
_u
pdated()));
setMouseTracking(true);
setAutoFillBackground(false);
setMouseTracking(true);
setAutoFillBackground(false);
@@
-65,7
+65,7
@@
void SigView::initializeGL()
void SigView::resizeGL(int width, int height)
{
void SigView::resizeGL(int width, int height)
{
- setup
V
iewport(width, height);
+ setup
_v
iewport(width, height);
}
void SigView::paintEvent(QPaintEvent *event)
}
void SigView::paintEvent(QPaintEvent *event)
@@
-80,7
+80,7
@@
void SigView::paintEvent(QPaintEvent *event)
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
glMatrixMode(GL_MODELVIEW);
glPushMatrix();
- setup
V
iewport(width(), height());
+ setup
_v
iewport(width(), height());
qglClearColor(Qt::white);
glClear(GL_COLOR_BUFFER_BIT);
qglClearColor(Qt::white);
glClear(GL_COLOR_BUFFER_BIT);
@@
-120,12
+120,12
@@
void SigView::paintEvent(QPaintEvent *event)
}
// Paint the ruler
}
// Paint the ruler
- paint
R
uler(painter);
+ paint
_r
uler(painter);
painter.end();
}
painter.end();
}
-void SigView::data
U
pdated()
+void SigView::data
_u
pdated()
{
update();
}
{
update();
}
@@
-165,7
+165,7
@@
void SigView::wheelEvent(QWheelEvent *event)
update();
}
update();
}
-void SigView::setup
V
iewport(int width, int height)
+void SigView::setup
_v
iewport(int width, int height)
{
glViewport(0, 0, (GLint)width, (GLint)height);
glMatrixMode(GL_PROJECTION);
{
glViewport(0, 0, (GLint)width, (GLint)height);
glMatrixMode(GL_PROJECTION);
@@
-174,7
+174,7
@@
void SigView::setupViewport(int width, int height)
glMatrixMode(GL_MODELVIEW);
}
glMatrixMode(GL_MODELVIEW);
}
-void SigView::paint
R
uler(QPainter &p)
+void SigView::paint
_r
uler(QPainter &p)
{
const double MinSpacing = 80;
{
const double MinSpacing = 80;