From 4eec46cbdcbf6c3b6cbdd2fa79c7d045ffd3a731 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Fri, 20 Apr 2018 13:20:46 +0200
Subject: [PATCH] #2770 Fracture : Extract startTimer()

---
 .../RiaCompletionTypeCalculationScheduler.cpp | 36 ++++++++++---------
 .../RiaCompletionTypeCalculationScheduler.h   | 10 ++++--
 .../ProjectDataModel/RimEclipseCase.cpp       |  1 -
 3 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp b/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp
index 2f1c2e6a44..984afb860c 100644
--- a/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp
+++ b/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp
@@ -17,12 +17,15 @@
 /////////////////////////////////////////////////////////////////////////////////
 
 #include "RiaCompletionTypeCalculationScheduler.h"
+
 #include "RiaApplication.h"
+
 #include "Rim3dView.h"
 #include "RimEclipseCase.h"
 #include "RimEclipseCaseCollection.h"
 #include "RimOilField.h"
 #include "RimProject.h"
+
 #include "RiuMainWindow.h"
 #include "RiuViewer.h"
 
@@ -53,14 +56,7 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd
         m_eclipseCasesToRecalculate.push_back(eclipseCase);
     }
 
-    if (!m_recalculateCompletionTypeTimer)
-    {
-        m_recalculateCompletionTypeTimer = new QTimer(this);
-        m_recalculateCompletionTypeTimer->setSingleShot(true);
-        connect(m_recalculateCompletionTypeTimer, SIGNAL(timeout()), this, SLOT(slotRecalculateCompletionType()));
-    }
-
-    m_recalculateCompletionTypeTimer->start(1500);
+    startTimer();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -70,14 +66,7 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd
 {
     m_eclipseCasesToRecalculate.push_back(eclipseCase);
 
-    if (!m_recalculateCompletionTypeTimer)
-    {
-        m_recalculateCompletionTypeTimer = new QTimer(this);
-        m_recalculateCompletionTypeTimer->setSingleShot(true);
-        connect(m_recalculateCompletionTypeTimer, SIGNAL(timeout()), this, SLOT(slotRecalculateCompletionType()));
-    }
-
-    m_recalculateCompletionTypeTimer->start(1500);
+    startTimer();
 }
 
 //--------------------------------------------------------------------------------------------------
@@ -120,3 +109,18 @@ RiaCompletionTypeCalculationScheduler::~RiaCompletionTypeCalculationScheduler()
 {
     delete m_recalculateCompletionTypeTimer;
 }
+
+//--------------------------------------------------------------------------------------------------
+/// 
+//--------------------------------------------------------------------------------------------------
+void RiaCompletionTypeCalculationScheduler::startTimer()
+{
+    if (!m_recalculateCompletionTypeTimer)
+    {
+        m_recalculateCompletionTypeTimer = new QTimer(this);
+        m_recalculateCompletionTypeTimer->setSingleShot(true);
+        connect(m_recalculateCompletionTypeTimer, SIGNAL(timeout()), this, SLOT(slotRecalculateCompletionType()));
+    }
+
+    m_recalculateCompletionTypeTimer->start(1500);
+}
diff --git a/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.h b/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.h
index 256b864c53..7a72bde95d 100644
--- a/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.h
+++ b/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.h
@@ -18,14 +18,15 @@
 
 #pragma once
 
-#include <QObject>
-#include <vector>
 #include "cafPdmPointer.h"
 
+#include <QObject>
+
+#include <vector>
+
 class QTimer;
 class RimEclipseCase;
 
-
 class RiaCompletionTypeCalculationScheduler : public QObject
 {
     Q_OBJECT;
@@ -44,6 +45,9 @@ private:
     RiaCompletionTypeCalculationScheduler(const RiaCompletionTypeCalculationScheduler& o) = delete;
     void operator=(const RiaCompletionTypeCalculationScheduler& o) = delete;
 
+    void startTimer();
+
+private:
     std::vector<caf::PdmPointer<RimEclipseCase> > m_eclipseCasesToRecalculate;
     QTimer*                                       m_recalculateCompletionTypeTimer;
 };
diff --git a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
index 0f7397be7a..e266c30df4 100644
--- a/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
+++ b/ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
@@ -394,7 +394,6 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
             }
         }
 
-        ;
         for (const auto& wellRes : rigEclipseCase->wellResults())
         {
             std::vector<std::vector<RigCompletionData>> completionsPerTimeStep;