#2939 ProgressInfo: Reintroduce process envents, to update the progress dialog durig processing on linux/mac.

Introduced isActive and used this info to block sheduled redraw/display model regen when progress bar is active, to avoid unintended recursive behaviour resulting in crashes.

ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp

@@ -38,6 +38,7 @@
 #include <QTreeView>
 
 #include <set>
+#include "cafProgressState.h"
 
 //--------------------------------------------------------------------------------------------------
 ///
@@ -100,6 +101,12 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd
 //--------------------------------------------------------------------------------------------------
 void RiaCompletionTypeCalculationScheduler::slotRecalculateCompletionType()
 {
+    if ( caf::ProgressState::isActive() )
+    {
+        startTimer();
+        return;
+    }
+
     std::set<RimEclipseCase*> uniqueCases(m_eclipseCasesToRecalculate.begin(), m_eclipseCasesToRecalculate.end());
 
     Rim3dView*  activeView = RiaApplication::instance()->activeReservoirView();

ApplicationCode/Application/RiaViewRedrawScheduler.cpp

@@ -23,6 +23,7 @@
 #include <QCoreApplication>
 
 #include <set>
+#include "cafProgressState.h"
 
 //--------------------------------------------------------------------------------------------------
 /// 
@@ -59,16 +60,24 @@ void RiaViewRedrawScheduler::scheduleDisplayModelUpdateAndRedraw(Rim3dView* resV
 {
     m_resViewsToUpdate.push_back(resViewToUpdate);
 
+    startTimer(0);
+}
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiaViewRedrawScheduler::startTimer(int msecs)
+{
     if (!m_resViewUpdateTimer) 
     {
         m_resViewUpdateTimer = new QTimer(this);
-        connect(m_resViewUpdateTimer, SIGNAL(timeout()), this, SLOT(slotUpdateScheduledDisplayModels()));
+        connect(m_resViewUpdateTimer, SIGNAL(timeout()), this, SLOT(slotUpdateAndRedrawScheduledViewsWhenReady()));
     }
 
     if (!m_resViewUpdateTimer->isActive())
     {
         m_resViewUpdateTimer->setSingleShot(true);
-        m_resViewUpdateTimer->start(0);
+        m_resViewUpdateTimer->start(msecs);
     }
 }
 
@@ -76,7 +85,7 @@ void RiaViewRedrawScheduler::scheduleDisplayModelUpdateAndRedraw(Rim3dView* resV
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------
-void RiaViewRedrawScheduler::slotUpdateScheduledDisplayModels()
+void RiaViewRedrawScheduler::updateAndRedrawScheduledViews()
 {
     // Compress to remove duplicates
     // and update dependent views after independent views
@@ -113,6 +122,20 @@ void RiaViewRedrawScheduler::slotUpdateScheduledDisplayModels()
     m_resViewsToUpdate.clear();
 }
 
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiaViewRedrawScheduler::slotUpdateAndRedrawScheduledViewsWhenReady()
+{
+    if ( caf::ProgressState::isActive() )
+    {
+        startTimer(100);
+        return;
+    }
+
+    updateAndRedrawScheduledViews();
+}
+
 //--------------------------------------------------------------------------------------------------
 /// 
 //--------------------------------------------------------------------------------------------------

ApplicationCode/Application/RiaViewRedrawScheduler.h

@@ -33,11 +33,14 @@ public:
     static RiaViewRedrawScheduler* instance();
     void                scheduleDisplayModelUpdateAndRedraw(Rim3dView* resViewToUpdate);
     void                clearViewsScheduledForUpdate();
+    void                updateAndRedrawScheduledViews();
 
-public slots:
-    void                slotUpdateScheduledDisplayModels();
+private slots:
+    void                slotUpdateAndRedrawScheduledViewsWhenReady();
 
 private:
+    void                startTimer(int msecs);
+
     RiaViewRedrawScheduler() : m_resViewUpdateTimer(nullptr)  {}
     ~RiaViewRedrawScheduler();
 

ApplicationCode/Commands/ExportCommands/RicExportMultipleSnapshotsFeature.cpp

@@ -230,7 +230,7 @@ void RicExportMultipleSnapshotsFeature::exportViewVariationsToFolder(RimGridView
             // Force update of scheduled display models modifying the time step
             // This is required due to visualization structures updated by the update functions,
             // and this is not triggered by changing time step only
-            RiaViewRedrawScheduler::instance()->slotUpdateScheduledDisplayModels();
+            RiaViewRedrawScheduler::instance()->updateAndRedrawScheduledViews();
 
             viewer->setCurrentFrame(i);
             viewer->animationControl()->setCurrentFrameOnly(i);

ApplicationCode/ProjectDataModel/Rim3dView.cpp

@@ -256,7 +256,7 @@ QImage Rim3dView::snapshotWindowContent()
     if (m_viewer)
     {
         // Force update of scheduled display models before snapshotting
-        RiaViewRedrawScheduler::instance()->slotUpdateScheduledDisplayModels();
+        RiaViewRedrawScheduler::instance()->updateAndRedrawScheduledViews();
 
         m_viewer->repaint();
 

Fwk/AppFwk/cafUserInterface/cafProgressInfo.cpp

@@ -37,6 +37,7 @@
 
 #include "cafProgressInfo.h"
 #include "cafAssert.h"
+#include "cafProgressState.h"
 
 #include <QPointer>
 #include <QProgressDialog>
@@ -317,6 +318,13 @@ namespace caf {
         return progressDialog()->thread() == QThread::currentThread();
     }
 
+    //--------------------------------------------------------------------------------------------------
+    /// 
+    //--------------------------------------------------------------------------------------------------
+    bool ProgressState::isActive()
+    {
+        return !maxProgressStack().empty();
+    }
 
     //--------------------------------------------------------------------------------------------------
     /// 
@@ -426,8 +434,8 @@ namespace caf {
         progressDialog()->setValue(static_cast<int>(currentTotalProgress()));
         progressDialog()->setLabelText(currentComposedLabel());
 
-        //QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-        if (progressDialog()) progressDialog()->repaint();
+        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+        //if (progressDialog()) progressDialog()->repaint();
     }
 
 
@@ -441,8 +449,8 @@ namespace caf {
         descriptionStack().back() = description;
 
         progressDialog()->setLabelText(currentComposedLabel());
-        //QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-        if (progressDialog()) progressDialog()->repaint();
+        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+        //if (progressDialog()) progressDialog()->repaint();
 
     }
 
@@ -483,8 +491,8 @@ namespace caf {
         progressDialog()->setMaximum(totalMaxProgress);
         progressDialog()->setValue(totalProgress);
 
-        //QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-        if (progressDialog()) progressDialog()->repaint();
+        QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+        //if (progressDialog()) progressDialog()->repaint();
 
     }
 
@@ -560,7 +568,7 @@ namespace caf {
         progressDialog()->setLabelText(currentComposedLabel());
 
         // If we are finishing the last level, clean up
-        if (!maxProgressStack_v.size())
+        if (maxProgressStack_v.empty())
         {
             if (progressDialog() != nullptr)
             {
@@ -568,11 +576,12 @@ namespace caf {
                 progressDialog()->close();
             }
         }
-
-        // Make sure the Gui is repainted
-        //QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
-        if (progressDialog()) progressDialog()->repaint();
-
+        else
+        {
+            // Make sure the Gui is repainted
+            QCoreApplication::processEvents(QEventLoop::ExcludeUserInputEvents);
+            //if (progressDialog()) progressDialog()->repaint();
+        }
     }
 
 

Fwk/AppFwk/cafUserInterface/cafProgressState.h

@@ -0,0 +1,45 @@
+//##################################################################################################
+//
+//   Custom Visualization Core library
+//   Copyright (C) 2011-2013 Ceetron AS
+//
+//   This library may be used under the terms of either the GNU General Public License or
+//   the GNU Lesser General Public License as follows:
+//
+//   GNU General Public License Usage
+//   This library is free software: you can redistribute it and/or modify
+//   it under the terms of the GNU General Public License as published by
+//   the Free Software Foundation, either version 3 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU General Public License at <<http://www.gnu.org/licenses/gpl.html>>
+//   for more details.
+//
+//   GNU Lesser General Public License Usage
+//   This library is free software; you can redistribute it and/or modify
+//   it under the terms of the GNU Lesser General Public License as published by
+//   the Free Software Foundation; either version 2.1 of the License, or
+//   (at your option) any later version.
+//
+//   This library is distributed in the hope that it will be useful, but WITHOUT ANY
+//   WARRANTY; without even the implied warranty of MERCHANTABILITY or
+//   FITNESS FOR A PARTICULAR PURPOSE.
+//
+//   See the GNU Lesser General Public License at <<http://www.gnu.org/licenses/lgpl-2.1.html>>
+//   for more details.
+//
+//##################################################################################################
+
+namespace caf {
+
+class ProgressState
+{
+public: 
+    static bool isActive();
+};
+
+}