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

Make sure seismic file reader is created in RiaApplication::loadProject()

Browse Source
This commit is contained in:
Magne Sjaastad 2023-10-16 13:59:44 +02:00
parent a4428c1271
commit 18e9ef0558
3 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ApplicationLibCode/Application/RiaApplication.cpp
View File

@ -68,6 +68,8 @@
#include "RimPlotWindow.h" #include "RimPlotWindow.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimScriptCollection.h" #include "RimScriptCollection.h"
#include "RimSeismicData.h"
#include "RimSeismicDataCollection.h"
#include "RimSeismicView.h" #include "RimSeismicView.h"
#include "RimSeismicViewCollection.h" #include "RimSeismicViewCollection.h"
#include "RimSimWellInViewCollection.h" #include "RimSimWellInViewCollection.h"
@ -526,7 +528,6 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
} }
} }
// Add well paths for each oil field
for ( size_t oilFieldIdx = 0; oilFieldIdx < m_project->oilFields().size(); oilFieldIdx++ ) for ( size_t oilFieldIdx = 0; oilFieldIdx < m_project->oilFields().size(); oilFieldIdx++ )
{ {
RimOilField* oilField = m_project->oilFields[oilFieldIdx]; RimOilField* oilField = m_project->oilFields[oilFieldIdx];
@ -536,8 +537,16 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct
oilField->wellPathCollection = std::make_unique<RimWellPathCollection>(); oilField->wellPathCollection = std::make_unique<RimWellPathCollection>();
} }
// Initialize well paths
oilField->wellPathCollection->loadDataAndUpdate(); oilField->wellPathCollection->loadDataAndUpdate();
oilField->ensembleWellLogsCollection->loadDataAndUpdate(); oilField->ensembleWellLogsCollection->loadDataAndUpdate();
// Initialize seismic data
auto& seisDataColl = oilField->seismicDataCollection();
for ( auto seismicData : seisDataColl->seismicData() )
{
seismicData->ensureFileReaderIsInitialized();
}
} }
{ {

18
ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicData.cpp
View File

@ -145,14 +145,6 @@ void RimSeismicData::logError( QString msg )
m_nErrorsLogged++; m_nErrorsLogged++;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSeismicData::initAfterRead()
{
updateMetaData();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@ -498,6 +490,16 @@ std::pair<double, double> RimSeismicData::dataRangeMinMax() const
return m_activeDataRange; return m_activeDataRange;
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimSeismicData::ensureFileReaderIsInitialized()
{
if ( !openFileIfNotOpen() ) return;
updateMetaData();
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

3
ApplicationLibCode/ProjectDataModel/Seismic/RimSeismicData.h
View File

@ -69,9 +69,10 @@ public:
std::pair<double, double> dataRangeMinMax() const override; std::pair<double, double> dataRangeMinMax() const override;
void ensureFileReaderIsInitialized();
protected: protected:
void updateMetaData(); void updateMetaData();
void initAfterRead() override;
caf::PdmFieldHandle* userDescriptionField() override; caf::PdmFieldHandle* userDescriptionField() override;