OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-20 11:48:35 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert "#3862 Reload case. Reset time step filter during reload to fix issue"

Browse Source 
This reverts commit d202e430d2.
This commit is contained in:
Bjørn Erik Jensen 2018-12-19 08:26:12 +01:00 committed by Magne Sjaastad
parent 928a0628cd
commit b30008c5c8
3 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/ProjectDataModel/RimEclipseResultCase.cpp
View File

@ -242,7 +242,6 @@ void RimEclipseResultCase::reloadEclipseGridFile()
{ {
m_gridAndWellDataIsReadFromFile = false; m_gridAndWellDataIsReadFromFile = false;
m_activeCellInfoIsReadFromFile = false; m_activeCellInfoIsReadFromFile = false;
m_timeStepFilter->reset();
setReservoirData(nullptr); setReservoirData(nullptr);
openReserviorCase(); openReserviorCase();
} }

15
ApplicationCode/ProjectDataModel/RimTimeStepFilter.cpp
View File

@ -181,21 +181,6 @@ bool RimTimeStepFilter::updateFilteredTimeStepsFromUi()
return true; return true;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimTimeStepFilter::reset()
{
m_filterType = TS_ALL;
m_filteredTimeSteps.v().clear();
m_filteredTimeStepsUi.v().clear();
m_firstTimeStep = 0;
m_lastTimeStep = 0;
m_interval = 1;
m_dateFormat = QString("yyyy-MM-dd");
m_timeStepNamesFromFile.v().clear();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationCode/ProjectDataModel/RimTimeStepFilter.h
View File

@ -52,9 +52,6 @@ public:
void setTimeStepsFromFile(const std::vector<std::pair<QString, QDateTime>>& timeSteps); void setTimeStepsFromFile(const std::vector<std::pair<QString, QDateTime>>& timeSteps);
std::vector<size_t> filteredTimeSteps() const; std::vector<size_t> filteredTimeSteps() const;
bool updateFilteredTimeStepsFromUi(); bool updateFilteredTimeStepsFromUi();
void reset();
private: private:
std::vector<std::pair<QString, QDateTime>> allTimeSteps() const; std::vector<std::pair<QString, QDateTime>> allTimeSteps() const;
std::vector<int> filteredTimeStepIndicesFromUi() const; std::vector<int> filteredTimeStepIndicesFromUi() const;