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

Move updatedFilePathFromPathId() to private

Browse Source 
File paths are now updated in initAfterRead()
This commit is contained in:
Magne Sjaastad 2024-06-05 09:32:44 +02:00
parent a952fbce7e
commit beccd2454e
3 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ApplicationLibCode/ProjectDataModel/Annotations/RimAnnotationCollection.cpp
View File

@ -111,8 +111,7 @@ void RimAnnotationCollection::initAfterRead()
RimPolygonFile* newPoly = new RimPolygonFile(); RimPolygonFile* newPoly = new RimPolygonFile();
newPoly->setName( oldPoly->uiName() ); newPoly->setName( oldPoly->uiName() );
QString fileName = RimProject::current()->updatedFilePathFromPathId( oldPoly->fileName() ); newPoly->setFileName( oldPoly->fileName() );
newPoly->setFileName( fileName );
polycoll->addPolygonFile( newPoly ); polycoll->addPolygonFile( newPoly );
} }

6
ApplicationLibCode/ProjectDataModel/RimProject.h
View File

@ -194,7 +194,6 @@ public:
RimPlotTemplateFolderItem* rootPlotTemplateItem() const; RimPlotTemplateFolderItem* rootPlotTemplateItem() const;
std::vector<caf::FilePath*> allFilePaths() const; std::vector<caf::FilePath*> allFilePaths() const;
QString updatedFilePathFromPathId( QString filePath, RiaVariableMapper* pathListMapper = nullptr ) const;
protected: protected:
void beforeInitAfterRead() override; void beforeInitAfterRead() override;
@ -204,8 +203,9 @@ protected:
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override; void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
private: private:
void transferPathsToGlobalPathList(); void transferPathsToGlobalPathList();
void distributePathsFromGlobalPathList(); void distributePathsFromGlobalPathList();
QString updatedFilePathFromPathId( QString filePath, RiaVariableMapper* pathListMapper = nullptr ) const;
private: private:
caf::PdmChildField<RimMainPlotCollection*> m_mainPlotCollection; caf::PdmChildField<RimMainPlotCollection*> m_mainPlotCollection;

4
ApplicationLibCode/ProjectDataModel/VerticalFlowPerformance/RimVfpPlot.cpp
View File

@ -871,12 +871,10 @@ void RimVfpPlot::initAfterRead()
auto filePath = m_filePath_OBSOLETE.v().path(); auto filePath = m_filePath_OBSOLETE.v().path();
if ( filePath.isEmpty() ) return; if ( filePath.isEmpty() ) return;
QString fileName = RimProject::current()->updatedFilePathFromPathId( filePath );
auto vfpDataCollection = RimVfpDataCollection::instance(); auto vfpDataCollection = RimVfpDataCollection::instance();
if ( vfpDataCollection ) if ( vfpDataCollection )
{ {
auto tableData = vfpDataCollection->appendTableDataObject( fileName ); auto tableData = vfpDataCollection->appendTableDataObject( filePath );
if ( tableData ) if ( tableData )
{ {
setDataSource( tableData ); setDataSource( tableData );