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 file paths are resolved before initAfterRead() is called

Browse Source
This commit is contained in:
Magne Sjaastad 2023-04-03 14:56:25 +02:00
parent b2e8cc1663
commit e8f6d4819f
4 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationLibCode/ProjectDataModel/RimProject.cpp
View File

@ -303,7 +303,7 @@ void RimProject::close()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimProject::initAfterRead()
void RimProject::beforeInitAfterRead()
{
this->distributePathsFromGlobalPathList();
@ -360,6 +360,14 @@ void RimProject::initAfterRead()
if ( m_subWindowsTiledPlotWindow_OBSOLETE ) m_subWindowsTileModePlotWindow = RiaDefines::WindowTileMode::DEFAULT;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimProject::initAfterRead()
{
// Function moved to beforeInitAfterRead() to make sure that file path objects are replaced before other initAfterRead() is called
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationLibCode/ProjectDataModel/RimProject.h
View File

@ -196,7 +196,7 @@ public:
std::vector<caf::FilePath*> allFilePaths() const;
protected:
// Overridden methods
void beforeInitAfterRead() override;
void initAfterRead() override;
void setupBeforeSave() override;

8
Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.cpp
View File

@ -87,6 +87,7 @@ void PdmDocument::readFile( QIODevice* xmlFile )
// after everything is read from file
resolveReferencesRecursively();
beforeInitAfterRead();
initAfterReadRecursively();
}
@ -153,4 +154,11 @@ void PdmDocument::updateUiIconStateRecursively( PdmObjectHandle* object )
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void PdmDocument::beforeInitAfterRead()
{
}
} // End of namespace caf

3
Fwk/AppFwk/cafProjectDataModel/cafPdmDocument.h
View File

@ -61,6 +61,9 @@ public:
void writeFile( QIODevice* device );
static void updateUiIconStateRecursively( PdmObjectHandle* root );
protected:
virtual void beforeInitAfterRead();
};
} // End of namespace caf