diff --git a/qt/draw_widget.cpp b/qt/draw_widget.cpp index 0bbec223d3..d0a21c6a99 100644 --- a/qt/draw_widget.cpp +++ b/qt/draw_widget.cpp @@ -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))); diff --git a/qt/draw_widget.hpp b/qt/draw_widget.hpp index b5c2adfd8e..08e719920f 100644 --- a/qt/draw_widget.hpp +++ b/qt/draw_widget.hpp @@ -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();