Replace RiaScheduler with caf:Scheduler

Remove ProgressState
Use caf::SchedulerCallable to communicate state for the progress dialog.
Use std::atomic to ensure thread safety

ApplicationLibCode/Application/CMakeLists_files.cmake

@@ -31,7 +31,6 @@ set(SOURCE_GROUP_HEADER_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaRftDefines.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaDateTimeDefines.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaPlotCollectionScheduler.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaScheduler.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaSeismicDefines.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaLasDefines.h
     ${CMAKE_CURRENT_LIST_DIR}/RiaOsduDefines.h
@@ -73,7 +72,6 @@ set(SOURCE_GROUP_SOURCE_FILES
     ${CMAKE_CURRENT_LIST_DIR}/RiaRftDefines.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaDateTimeDefines.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaPlotCollectionScheduler.cpp
-    ${CMAKE_CURRENT_LIST_DIR}/RiaScheduler.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaSeismicDefines.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaLasDefines.cpp
     ${CMAKE_CURRENT_LIST_DIR}/RiaOsduDefines.cpp
@@ -86,15 +84,6 @@ list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})
 
 list(APPEND CODE_SOURCE_FILES ${SOURCE_GROUP_SOURCE_FILES})
 
-set(QT_MOC_HEADERS
-    ${QT_MOC_HEADERS}
-    ${CMAKE_CURRENT_LIST_DIR}/RiaConsoleApplication.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaGuiApplication.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaCompletionTypeCalculationScheduler.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaPlotWindowRedrawScheduler.h
-    ${CMAKE_CURRENT_LIST_DIR}/RiaScheduler.h
-)
-
 source_group(
   "Application" FILES ${SOURCE_GROUP_HEADER_FILES} ${SOURCE_GROUP_SOURCE_FILES}
                       ${CMAKE_CURRENT_LIST_DIR}/CMakeLists_files.cmake

ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.cpp

@@ -32,7 +32,6 @@
 #include "RiuViewer.h"
 
 #include "cafPdmUiTreeView.h"
-#include "cafProgressState.h"
 
 #include <QTimer>
 #include <QTreeView>

ApplicationLibCode/Application/RiaCompletionTypeCalculationScheduler.h

@@ -18,9 +18,8 @@
 
 #pragma once
 
-#include "RiaScheduler.h"
-
 #include "cafPdmPointer.h"
+#include "cafScheduler.h"
 
 #include <vector>
 
@@ -29,7 +28,7 @@ class RimEclipseCase;
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-class RiaCompletionTypeCalculationScheduler : public RiaScheduler
+class RiaCompletionTypeCalculationScheduler : public caf::Scheduler
 {
     Q_OBJECT;
 

ApplicationLibCode/Application/RiaPlotCollectionScheduler.cpp

@@ -21,8 +21,6 @@
 #include "RimAbstractPlotCollection.h"
 #include "RimViewWindow.h"
 
-#include "cafProgressState.h"
-
 #include <QTimer>
 
 //--------------------------------------------------------------------------------------------------

ApplicationLibCode/Application/RiaPlotCollectionScheduler.h

@@ -18,14 +18,14 @@
 
 #pragma once
 
-#include "RiaScheduler.h"
+#include "cafScheduler.h"
 
 class RimPlotCollection;
 
 //--------------------------------------------------------------------------------------------------
 ///
 //--------------------------------------------------------------------------------------------------
-class RiaPlotCollectionScheduler : public RiaScheduler
+class RiaPlotCollectionScheduler : public caf::Scheduler
 {
 public:
     RiaPlotCollectionScheduler();

ApplicationLibCode/Application/RiaPlotWindowRedrawScheduler.h

@@ -18,7 +18,8 @@
 #pragma once
 
 #include "RiaDefines.h"
-#include "RiaScheduler.h"
+
+#include "cafScheduler.h"
 
 #include <QPointer>
 
@@ -29,7 +30,7 @@ class RiuMultiPlotPage;
 class RiuMultiPlotBook;
 class RiuPlotWidget;
 
-class RiaPlotWindowRedrawScheduler : public RiaScheduler
+class RiaPlotWindowRedrawScheduler : public caf::Scheduler
 {
     Q_OBJECT
 

ApplicationLibCode/Application/RiaQuickAccessScheduler.h

@@ -18,9 +18,9 @@
 
 #pragma once
 
-#include "RiaScheduler.h"
+#include "cafScheduler.h"
 
-class RiaQuickAccessScheduler : public RiaScheduler
+class RiaQuickAccessScheduler : public caf::Scheduler
 {
 public:
     RiaQuickAccessScheduler();

ApplicationLibCode/Application/RiaViewRedrawScheduler.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include "RiaScheduler.h"
+#include "cafScheduler.h"
 
 #include "cafPdmPointer.h"
 
@@ -26,7 +26,7 @@
 
 class Rim3dView;
 
-class RiaViewRedrawScheduler : public RiaScheduler
+class RiaViewRedrawScheduler : public caf::Scheduler
 {
 public:
     RiaViewRedrawScheduler();

ApplicationLibCode/Commands/HoloLensCommands/RicExportToSharingServerScheduler.cpp

@@ -23,7 +23,7 @@
 #include "RicHoloLensSessionManager.h"
 
 #include "cafCmdFeatureManager.h"
-#include "cafProgressState.h"
+#include "cafScheduler.h"
 
 #include <QCoreApplication>
 #include <QTimer>
@@ -86,7 +86,7 @@ void RicExportToSharingServerScheduler::triggerUpdateSession()
 //--------------------------------------------------------------------------------------------------
 void RicExportToSharingServerScheduler::slotTriggerUpdateSessionWhenReady()
 {
-    if ( caf::ProgressState::isActive() )
+    if ( caf::SchedulerCallable::instance()->isScheduledTaskBlocked() )
     {
         startTimer( 100 );
         return;