From e88b712ff9ed9c18056e978dd0cedcd822a525ce Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 24 Sep 2014 22:06:13 +0200 Subject: [PATCH] + fix typos --- src/Gui/Quarter/QuarterWidget.cpp | 32 +++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/Gui/Quarter/QuarterWidget.cpp b/src/Gui/Quarter/QuarterWidget.cpp index c63f44dde..0d82117d4 100644 --- a/src/Gui/Quarter/QuarterWidget.cpp +++ b/src/Gui/Quarter/QuarterWidget.cpp @@ -672,20 +672,20 @@ void QuarterWidget::resizeEvent(QResizeEvent* event) Overridden from QGLWidget to render the scenegraph */ void QuarterWidget::paintEvent(QPaintEvent* event) -{ +{ std::clock_t begin = std::clock(); - + if(!initialized) { glEnable(GL_DEPTH_TEST); this->getSoRenderManager()->reinitialize(); initialized = true; - } - + } + getSoRenderManager()->activate(); - + glEnable(GL_DEPTH_TEST); glMatrixMode(GL_PROJECTION); - + QGLWidget* w = static_cast(this->viewport()); assert(w->isValid() && "No valid GL context found!"); // We might have to process the delay queue here since we don't know @@ -713,29 +713,29 @@ void QuarterWidget::paintEvent(QPaintEvent* event) assert(w->isValid() && "No valid GL context found!"); glDrawBuffer(w->doubleBuffer() ? GL_BACK : GL_FRONT); - + w->makeCurrent(); this->actualRedraw(); - - //start the standart graphicsview processing for all widgets and graphic items. As - //QGraphicsView initaliizes a QPainter whcih changes the opengl context in an unpredictable - //manner we need to store the context and recreate it after qt is done. + + //start the standard graphics view processing for all widgets and graphic items. As + //QGraphicsView initaliizes a QPainter which changes the Opengl context in an unpredictable + //manner we need to store the context and recreate it after Qt is done. glPushAttrib(GL_ALL_ATTRIB_BITS); glPushAttrib(GL_MULTISAMPLE_BIT_EXT); - + inherited::paintEvent(event); - + glPopAttrib(); glPopAttrib(); - + if (w->doubleBuffer()) { w->swapBuffers(); } - + PRIVATE(this)->autoredrawenabled = true; // process the delay queue the next time we enter this function, // unless we get here after a call to redraw(). PRIVATE(this)->processdelayqueue = true; - + std::clock_t end = std::clock(); renderTime = double(double(end-begin)/CLOCKS_PER_SEC)*1000.0; }