Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OpenFlipper-Free
OpenFlipper
Commits
45edb590
Commit
45edb590
authored
May 08, 2020
by
Jan
Browse files
Fixed remaining QElapsedTimer warnings
parent
d5fcc1ab
Changes
9
Hide whitespace changes
Inline
Side-by-side
Core/Core.cc
View file @
45edb590
...
...
@@ -226,7 +226,7 @@ Core::init() {
connect
(
scenegraphCheckTimer_
,
SIGNAL
(
timeout
()),
this
,
SLOT
(
checkScenegraphDirty
()),
Qt
::
DirectConnection
);
// Will measure the time between redraws
redrawTime_
=
new
QTime
();
redrawTime_
=
new
Q
Elapsed
Time
r
();
redrawTime_
->
start
();
if
(
OpenFlipperSettings
().
value
(
"Core/Gui/splash"
,
true
).
toBool
()
)
{
...
...
Core/Core.hh
View file @
45edb590
...
...
@@ -928,8 +928,8 @@ private slots:
void
stopVideoCapture
();
private:
QTimer
videoTimer_
;
QTime
lastVideoTime_
;
QTimer
videoTimer_
;
Q
Elapsed
Time
r
lastVideoTime_
;
int
captureType_
;
...
...
@@ -1472,7 +1472,7 @@ private slots:
QTimer
*
scenegraphCheckTimer_
;
/// Holds the time since last redraw
QTime
*
redrawTime_
;
Q
Elapsed
Time
r
*
redrawTime_
;
/** @} */
...
...
Core/PluginLoader.cc
View file @
45edb590
...
...
@@ -341,7 +341,7 @@ void Core::loadPlugins()
emit
log
(
LOGOUT
,
"================================================================================"
);
QTime
time
;
Q
Elapsed
Time
r
time
;
time
.
start
();
...
...
libs_required/ACG/QtWidgets/QtBaseViewer.cc
View file @
45edb590
...
...
@@ -793,7 +793,7 @@ void QtBaseViewer::updateGL()
void
QtBaseViewer
::
drawScene
()
{
QTime
timer
;
Q
Elapsed
Time
r
timer
;
timer
.
start
();
...
...
libs_required/ACG/QtWidgets/QtBaseViewer.hh
View file @
45edb590
...
...
@@ -76,7 +76,7 @@
#include <QString>
#include <QMenu>
#include <QToolBar>
#include <QTime>
#include <Q
Elapsed
Time
r
>
#include <vector>
#include <string>
...
...
@@ -89,7 +89,7 @@ class QPushButton;
class
QToolButton
;
class
QStatusBar
;
class
QSplitter
;
class
QTimer
;
class
Q
Elapsed
Timer
;
class
QImage
;
class
QSocketNotifier
;
class
QGraphicsWidget
;
...
...
@@ -906,7 +906,7 @@ private:
std
::
vector
<
QAction
*
>
drawMenuActions_
;
// Used to calculate the time passed between redraws
QTime
redrawTime_
;
Q
Elapsed
Time
r
redrawTime_
;
//===========================================================================
/** @name view handling
...
...
libs_required/ACG/QtWidgets/QtExaminerViewer.cc
View file @
45edb590
...
...
@@ -402,7 +402,7 @@ bool QtExaminerViewer::mapToSphere(const QPoint& _v2D, Vec3d& _v3D) const
void
QtExaminerViewer
::
slotAnimation
()
{
QTime
t
;
Q
Elapsed
Time
r
t
;
t
.
start
();
makeCurrent
();
rotate
(
lastRotationAxis_
,
lastRotationAngle_
);
...
...
libs_required/ACG/QtWidgets/QtExaminerViewer.hh
View file @
45edb590
...
...
@@ -58,6 +58,7 @@
#include "QtBaseViewer.hh"
#include <QElapsedTimer>
#include <QTime>
#include <QMouseEvent>
#include <QWheelEvent>
...
...
@@ -160,7 +161,7 @@ private:
// animation stuff
Vec3d
lastRotationAxis_
;
double
lastRotationAngle_
;
Q
Time
lastMoveTime_
;
Q
ElapsedTimer
lastMoveTime_
;
QTimer
*
timer_
;
};
...
...
widgets/glWidget/QtBaseViewer.cc
View file @
45edb590
...
...
@@ -174,7 +174,7 @@ glViewer::glViewer( QGraphicsScene* _scene,
sp
.
setVerticalStretch
(
1
);
setSizePolicy
(
sp
);
redrawTime_
.
start
();
redrawTime_
.
start
();
// timer for animation
timer_
=
new
QTimer
(
this
);
...
...
@@ -543,7 +543,7 @@ void glViewer::drawScene(double _aspect)
// Inside the glWidget rendering, the system should not send extra updates
properties_
.
blockSignals
(
true
);
QTime
timer
;
Q
Elapsed
Time
r
timer
;
timer
.
start
();
// *****************************************************************
...
...
@@ -1595,7 +1595,7 @@ void glViewer::mousePressEvent(QGraphicsSceneMouseEvent* _e)
if
(
clickTimer_
.
isActive
())
{
clickTime_
=
QTime
();
clickTime_
.
invalidate
();
clickTimer_
.
stop
();
}
else
...
...
@@ -1720,9 +1720,9 @@ void glViewer::mouseReleaseEvent(QGraphicsSceneMouseEvent* _e)
case
Viewer
::
ExamineMode
:
viewMouseEvent
(
&
me
);
if
(
!
clickTime_
.
is
Null
())
if
(
clickTime_
.
is
Valid
())
{
int
elapsed
=
clickTime_
.
elapsed
();
int
elapsed
=
clickTime_
.
elapsed
();
QPoint
diff
=
clickEvent_
.
pos
()
-
me
.
pos
();
if
(
abs
(
diff
.
x
())
<=
1
&&
abs
(
diff
.
y
())
<=
1
&&
elapsed
<=
QApplication
::
doubleClickInterval
()
/
2
)
...
...
@@ -1733,7 +1733,7 @@ void glViewer::mouseReleaseEvent(QGraphicsSceneMouseEvent* _e)
}
else
{
clickTime_
=
QTime
();
clickTime_
.
invalidate
();
clickTimer_
.
stop
();
}
}
...
...
widgets/glWidget/QtBaseViewer.hh
View file @
45edb590
...
...
@@ -76,6 +76,7 @@
#include <QTimer>
#include <QMouseEvent>
#include <QTime>
#include <QElapsedTimer>
//== FORWARDDECLARATIONS ======================================================
...
...
@@ -618,7 +619,7 @@ private:
std
::
vector
<
QAction
*
>
drawMenuActions_
;
// Used to calculate the time passed between redraws
QTime
redrawTime_
;
Q
Elapsed
Time
r
redrawTime_
;
// Default VAO needed in core profile mode
ACG
::
VertexArrayObject
defaultVAO_
;
...
...
@@ -955,12 +956,12 @@ private:
ACG
::
Vec3d
lastRotationAxis_
;
ACG
::
Vec3d
constrainedRotationAxis_
;
double
lastRotationAngle_
;
Q
Time
lastMoveTime_
;
Q
ElapsedTimer
lastMoveTime_
;
QTimer
*
timer_
;
double
fovyModifier_
;
QTimer
clickTimer_
;
Q
Time
clickTime_
;
Q
ElapsedTimer
clickTime_
;
QMouseEvent
clickEvent_
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment