diff --git a/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp b/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp index c0a6d10800..2f9386c194 100644 --- a/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp +++ b/ApplicationCode/Application/RiaCompletionTypeCalculationScheduler.cpp @@ -1,49 +1,50 @@ ///////////////////////////////////////////////////////////////////////////////// // // Copyright (C) 2018- Statoil ASA -// +// // ResInsight 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. -// +// // ResInsight 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 +// +// See the GNU General Public License at // for more details. // ///////////////////////////////////////////////////////////////////////////////// #include "RiaCompletionTypeCalculationScheduler.h" +#include "RiaApplication.h" +#include "Rim3dView.h" #include "RimEclipseCase.h" #include "RimEclipseCaseCollection.h" -#include "RiaApplication.h" #include "RimOilField.h" #include "RimProject.h" - -#include -#include -#include "QAbstractItemModel" #include "RiuMainWindow.h" -#include "cafPdmUiTreeView.h" -#include -#include "Rim3dView.h" #include "RiuViewer.h" +#include "cafPdmUiTreeView.h" + +#include +#include + +#include + //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- RiaCompletionTypeCalculationScheduler* RiaCompletionTypeCalculationScheduler::instance() { - static RiaCompletionTypeCalculationScheduler theInstance; - + static RiaCompletionTypeCalculationScheduler theInstance; + return &theInstance; } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAndRedrawAllViews() { @@ -63,13 +64,12 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAndRedrawEclipseCase(RimEclipseCase* eclipseCase) { m_eclipseCasesToRecalculate.push_back(eclipseCase); - if (!m_recalculateCompletionTypeTimer) { m_recalculateCompletionTypeTimer = new QTimer(this); @@ -81,14 +81,14 @@ void RiaCompletionTypeCalculationScheduler::scheduleRecalculateCompletionTypeAnd } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- void RiaCompletionTypeCalculationScheduler::slotRecalculateCompletionType() { std::set uniqueCases(m_eclipseCasesToRecalculate.begin(), m_eclipseCasesToRecalculate.end()); - Rim3dView* activeView = RiaApplication::instance()->activeReservoirView(); - QModelIndex mi = RiuMainWindow::instance()->projectTreeView()->treeView()->currentIndex(); + Rim3dView* activeView = RiaApplication::instance()->activeReservoirView(); + QModelIndex mi = RiuMainWindow::instance()->projectTreeView()->treeView()->currentIndex(); for (RimEclipseCase* eclipseCase : uniqueCases) { @@ -113,7 +113,7 @@ void RiaCompletionTypeCalculationScheduler::slotRecalculateCompletionType() } //-------------------------------------------------------------------------------------------------- -/// +/// //-------------------------------------------------------------------------------------------------- RiaCompletionTypeCalculationScheduler::~RiaCompletionTypeCalculationScheduler() {