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

Remove dummy timers from desktop version.

Browse source
This commit is contained in:
vng 2012-03-21 14:18:28 +03:00 • committed by Alex Zolotarev
parent 7bcb13bea2
commit fc27fb88ec
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
qt/draw_widget.cpp
View file

@ -57,11 +57,11 @@ namespace qt
m_framework(FrameworkFactory::CreateFramework()),
m_isDrag(false),
m_isRotate(false),
m_redrawInterval(100),
//m_redrawInterval(100),
m_pScale(0)
{
m_timer = new QTimer(this);
connect(m_timer, SIGNAL(timeout()), this, SLOT(ScaleTimerElapsed()));
//m_timer = new QTimer(this);
//connect(m_timer, SIGNAL(timeout()), this, SLOT(ScaleTimerElapsed()));
}
DrawWidget::~DrawWidget()
@ -250,7 +250,7 @@ namespace qt
void DrawWidget::paintGL()
{
if ((m_isInitialized) && (!m_isTimerStarted))
if (m_isInitialized && !m_isTimerStarted)
{
/// timer should be started upon the first repaint
/// request to fully initialized GLWidget.
@ -412,10 +412,10 @@ namespace qt
}
}
void DrawWidget::ScaleTimerElapsed()
{
m_timer->stop();
}
//void DrawWidget::ScaleTimerElapsed()
//{
// m_timer->stop();
//}
void DrawWidget::AnimTimerElapsed()
{
@ -427,10 +427,10 @@ namespace qt
if (!m_isDrag && !m_isRotate)
{
// if we are inside the timer, cancel it
if (m_timer->isActive())
m_timer->stop();
//if (m_timer->isActive())
// m_timer->stop();
m_timer->start(m_redrawInterval);
//m_timer->start(m_redrawInterval);
//m_framework->Scale(exp(e->delta() / 360.0));
m_framework->ScaleToPoint(ScaleToPointEvent(e->pos().x(), e->pos().y(), exp(e->delta() / 360.0)));

8
qt/draw_widget.hpp
View file

@ -48,9 +48,9 @@ namespace qt
bool m_isDrag;
bool m_isRotate;
QTimer * m_timer;
QTimer * m_animTimer;
size_t m_redrawInterval;
//QTimer * m_timer;
//QTimer * m_animTimer;
//size_t m_redrawInterval;
Q_OBJECT
@ -71,7 +71,7 @@ namespace qt
void ShowAll();
void Repaint();
void ScaleChanged(int action);
void ScaleTimerElapsed();
//void ScaleTimerElapsed();
void AnimTimerElapsed();
void QueryMaxScaleMode();