pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

fix for desktop. We need call m_frameFn in timer for use pause/resume logic implemented in WindowsHandle

Browse source
This commit is contained in:
ExMix 2013-03-26 14:00:24 +03:00 • committed by Alex Zolotarev
parent b2001a9e56
commit e6a0d7976d
2 changed files with 15 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
qt/draw_widget.cpp
View file

@ -19,14 +19,14 @@
namespace qt
{
QtVideoTimer::QtVideoTimer(DrawWidget * w, TFrameFn frameFn)
: ::VideoTimer(frameFn), m_widget(w)
QtVideoTimer::QtVideoTimer(TFrameFn frameFn)
: ::VideoTimer(frameFn)
{}
void QtVideoTimer::start()
{
m_timer = new QTimer();
m_widget->connect(m_timer, SIGNAL(timeout()), m_widget, SLOT(AnimTimerElapsed()));
QObject::connect(m_timer, SIGNAL(timeout()), this, SLOT(TimerElapsed()));
resume();
}
@ -50,6 +50,11 @@ namespace qt
m_state = EStopped;
}
void QtVideoTimer::TimerElapsed()
{
m_frameFn();
}
DrawWidget::DrawWidget(QWidget * pParent)
: QGLWidget(pParent),
m_isInitialized(false),
@ -189,7 +194,7 @@ namespace qt
/// Using timer, which doesn't use the separate thread
/// for performing an action. This avoids race conditions in Framework.
/// see issue #717
return new QtVideoTimer(this, bind(&DrawWidget::DrawFrame, this));
return new QtVideoTimer(bind(&DrawWidget::DrawFrame, this));
//#endif
}
@ -463,11 +468,6 @@ namespace qt
// m_timer->stop();
//}
void DrawWidget::AnimTimerElapsed()
{
DrawFrame();
}
void DrawWidget::wheelEvent(QWheelEvent * e)
{
if (!m_isDrag && !m_isRotate)

10
qt/draw_widget.hpp
View file

@ -19,20 +19,23 @@ namespace qt
class DrawWidget;
class QtVideoTimer : public ::VideoTimer
class QtVideoTimer : public QObject, public ::VideoTimer
{
Q_OBJECT
private:
QTimer * m_timer;
DrawWidget * m_widget;
public:
QtVideoTimer(DrawWidget * w, ::VideoTimer::TFrameFn frameFn);
QtVideoTimer(::VideoTimer::TFrameFn frameFn);
void resume();
void pause();
void start();
void stop();
protected:
Q_SLOT void TimerElapsed();
};
class DrawWidget : public QGLWidget
@ -70,7 +73,6 @@ namespace qt
void Repaint();
void ScaleChanged(int action);
//void ScaleTimerElapsed();
void AnimTimerElapsed();
void QueryMaxScaleMode();