OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

#2770 Fracture : Extract startTimer()

Browse Source
This commit is contained in:
Magne Sjaastad 2018-04-20 13:20:46 +02:00
parent 95151193e9
commit 4eec46cbdc
3 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp
View File

@ -17,12 +17,15 @@
///////////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////////
#include "RiaCompletionTypeCalculationScheduler.h" #include "RiaCompletionTypeCalculationScheduler.h"
#include "RiaApplication.h" #include "RiaApplication.h"
#include "Rim3dView.h" #include "Rim3dView.h"
#include "RimEclipseCase.h" #include "RimEclipseCase.h"
#include "RimEclipseCaseCollection.h" #include "RimEclipseCaseCollection.h"
#include "RimOilField.h" #include "RimOilField.h"
#include "RimProject.h" #include "RimProject.h"
#include "RiuMainWindow.h" #include "RiuMainWindow.h"
#include "RiuViewer.h" #include "RiuViewer.h"
@ -53,14 +56,7 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd
m_eclipseCasesToRecalculate.push_back(eclipseCase); m_eclipseCasesToRecalculate.push_back(eclipseCase);
} }
if (!m_recalculateCompletionTypeTimer) startTimer();
{
m_recalculateCompletionTypeTimer = new QTimer(this);
m_recalculateCompletionTypeTimer->setSingleShot(true);
connect(m_recalculateCompletionTypeTimer, SIGNAL(timeout()), this, SLOT(slotRecalculateCompletionType()));
}
m_recalculateCompletionTypeTimer->start(1500);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -70,14 +66,7 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd
{ {
m_eclipseCasesToRecalculate.push_back(eclipseCase); m_eclipseCasesToRecalculate.push_back(eclipseCase);
if (!m_recalculateCompletionTypeTimer) startTimer();
{
m_recalculateCompletionTypeTimer = new QTimer(this);
m_recalculateCompletionTypeTimer->setSingleShot(true);
connect(m_recalculateCompletionTypeTimer, SIGNAL(timeout()), this, SLOT(slotRecalculateCompletionType()));
}
m_recalculateCompletionTypeTimer->start(1500);
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -120,3 +109,18 @@ RiaCompletionTypeCalculationScheduler::~RiaCompletionTypeCalculationScheduler()
{ {
delete m_recalculateCompletionTypeTimer; 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);
}

10
ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.h
View File

@ -18,14 +18,15 @@
#pragma once #pragma once
#include <QObject>
#include <vector>
#include "cafPdmPointer.h" #include "cafPdmPointer.h"
#include <QObject>
#include <vector>
class QTimer; class QTimer;
class RimEclipseCase; class RimEclipseCase;
class RiaCompletionTypeCalculationScheduler : public QObject class RiaCompletionTypeCalculationScheduler : public QObject
{ {
Q_OBJECT; Q_OBJECT;
@ -44,6 +45,9 @@ private:
RiaCompletionTypeCalculationScheduler(const RiaCompletionTypeCalculationScheduler& o) = delete; RiaCompletionTypeCalculationScheduler(const RiaCompletionTypeCalculationScheduler& o) = delete;
void operator=(const RiaCompletionTypeCalculationScheduler& o) = delete; void operator=(const RiaCompletionTypeCalculationScheduler& o) = delete;
void startTimer();
private:
std::vector<caf::PdmPointer<RimEclipseCase> > m_eclipseCasesToRecalculate; std::vector<caf::PdmPointer<RimEclipseCase> > m_eclipseCasesToRecalculate;
QTimer* m_recalculateCompletionTypeTimer; QTimer* m_recalculateCompletionTypeTimer;
}; };

1
ApplicationCode/ProjectDataModel/RimEclipseCase.cpp
View File

@ -394,7 +394,6 @@ const RigVirtualPerforationTransmissibilities* RimEclipseCase::computeAndGetVirt
} }
} }
;
for (const auto& wellRes : rigEclipseCase->wellResults()) for (const auto& wellRes : rigEclipseCase->wellResults())
{ {
std::vector<std::vector<RigCompletionData>> completionsPerTimeStep; std::vector<std::vector<RigCompletionData>> completionsPerTimeStep;