Refactored the enable/disable functionality of renderers. A disabled renderer will still not draw, but will execute and update its data.

Author: smistad

source/FAST/Visualization/RenderToImage/RenderToImage.cpp

@@ -489,8 +489,8 @@ void RenderToImage::paintGL() {
             for(auto& renderer : mNonVolumeRenderers) {
                 if(!renderer->isDisabled()) {
                     renderer->draw(mPerspectiveMatrix, m3DViewingTransformation.matrix(), zNear, zFar, true, m_width, m_height);
-                    renderer->postDraw();
                 }
+                renderer->postDraw();
             }
             mRuntimeManager->stopRegularTimer("draw2D");
 
@@ -506,16 +506,16 @@ void RenderToImage::paintGL() {
             for(auto& renderer : mNonVolumeRenderers) {
                 if(!renderer->isDisabled()) {
                     renderer->draw(mPerspectiveMatrix, m3DViewingTransformation.matrix(), zNear, zFar, false, m_width, m_height);
-                    renderer->postDraw();
                 }
+                renderer->postDraw();
             }
 
             if(!mVolumeRenderers.empty()) {
                 for(auto& renderer : mVolumeRenderers) {
                     if(!renderer->isDisabled()) {
                         renderer->draw(mPerspectiveMatrix, m3DViewingTransformation.matrix(), zNear, zFar, false, m_width, m_height);
-                        renderer->postDraw();
                     }
+                    renderer->postDraw();
                 }
 
                 // Blit/copy the framebuffer to the default framebuffer (window)

source/FAST/Visualization/Renderer.cpp

@@ -38,14 +38,13 @@ void Renderer::stopPipeline() {
 
 void Renderer::postDraw() {
     std::lock_guard<std::mutex> lock(mMutex);
+    // It is important that this happens in this function, since postDraw is called even though it is disabled:
     mHasRendered = true;
 }
 
 void Renderer::execute() {
     {
         std::lock_guard<std::mutex> lock(mMutex);
-        if(m_disabled)
-            return;
         if(mStop) {
             return;
         }

source/FAST/Visualization/Renderer.hpp

@@ -23,6 +23,8 @@ class DataBoundingBox;
  *
  * Renderers are process objects which can visualize data in a View, typically using OpenGL.
  * They should inherit from this class.
+ *
+ * @ingroup renderers
  */
 class FAST_EXPORT  Renderer : public ProcessObject, protected QOpenGLFunctions_3_3_Core {
     public:
@@ -47,12 +49,12 @@ class FAST_EXPORT  Renderer : public ProcessObject, protected QOpenGLFunctions_3
         virtual void stopPipeline();
         virtual void reset();
         /**
-         * Set renderer to disabled or enabled. A disabled renderer will not draw.
+         * @brief Set renderer to disabled or enabled. A disabled renderer will not draw, but it will execute.
          * @param disabled
          */
         virtual void setDisabled(bool disabled);
         /**
-         * Get whether this renderer is disabled or not
+         * @brief Get whether this renderer is disabled or not
          * @return
          */
         virtual bool isDisabled() const;
@@ -67,7 +69,7 @@ class FAST_EXPORT  Renderer : public ProcessObject, protected QOpenGLFunctions_3
         void clearDataToRender();
 
         /**
-         * Creates an OpenGL shader program. Should be used in the renderer constructor.
+         * @brief Creates an OpenGL shader program. Should be used in the renderer constructor.
          * @param shaderFilenames
          * @param programName
          */
@@ -91,9 +93,9 @@ class FAST_EXPORT  Renderer : public ProcessObject, protected QOpenGLFunctions_3
         std::mutex mMutex;
 
         /**
-         * A disabled renderer will not draw
+         * @brief A disabled renderer will not draw, but it will execute
          */
-        bool m_disabled = false;
+        std::atomic_bool m_disabled = false;
 
         /**
          * Whether this renderer is only capable of 2D rendering

source/FAST/Visualization/View.cpp

@@ -477,9 +477,8 @@ void View::initializeGL() {
     // Update all renderes, so that getBoundingBox works
     std::vector<Renderer::pointer> renderers = getRenderers();
     try {
-        for (int i = 0; i < renderers.size(); i++) {
-            if (!renderers[i]->isDisabled())
-                renderers[i]->update(0);
+        for(int i = 0; i < renderers.size(); i++) {
+            renderers[i]->update(0);
         }
     } catch (ThreadStopped& e) {
         // TODO What to do in this case?
@@ -554,8 +553,8 @@ void View::paintGL() {
         for(auto renderer : mNonVolumeRenderers) {
             if(!renderer->isDisabled()) {
                 renderer->draw(mPerspectiveMatrix, m3DViewingTransformation.matrix(), zNear, zFar, true, width(), height());
-                renderer->postDraw();
             }
+            renderer->postDraw(); // Call postDraw even though it is disabled, so that it is marked as hasRendered
         }
 
         if(m_showScalebar)
@@ -574,17 +573,17 @@ void View::paintGL() {
         for(auto renderer : mNonVolumeRenderers) {
             if(!renderer->isDisabled()) {
                 renderer->draw(mPerspectiveMatrix, m3DViewingTransformation.matrix(), zNear, zFar, false, width(), height());
-                renderer->postDraw();
             }
+            renderer->postDraw(); // Call postDraw even though it is disabled, so that it is marked as hasRendered
         }
 
         if(!mVolumeRenderers.empty()) {
             glBindFramebuffer(GL_DRAW_FRAMEBUFFER, m_FBO);
             for(auto renderer : mVolumeRenderers) {
                 if(!renderer->isDisabled()) {
                     renderer->draw(mPerspectiveMatrix, m3DViewingTransformation.matrix(), zNear, zFar, false, width(), height());
-                    renderer->postDraw();
                 }
+                renderer->postDraw(); // Call postDraw even though it is disabled, so that it is marked as hasRendered
             }
 
             // Blit/copy the framebuffer to the default framebuffer (window)