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

#5147 RimWellLogFile::m_fileName ->FilePath

Browse Source
This commit is contained in:
Jacob Støren
2019-12-11 08:38:31 +01:00
parent 7f1ccc0169
commit b1942e0844
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
ApplicationCode/ProjectDataModel/RimWellLogFile.cpp
View File

@@ -151,9 +151,9 @@ bool RimWellLogFile::readFile( QString* errorMessage )
m_wellLogDataFile = new RigWellLogFile;
}
m_name = QFileInfo( m_fileName ).fileName();
m_name = QFileInfo( m_fileName().path() ).fileName();
if ( !m_wellLogDataFile->open( m_fileName, errorMessage ) )
if ( !m_wellLogDataFile->open( m_fileName().path(), errorMessage ) )
{
m_wellLogDataFile = nullptr;
return false;
@@ -242,15 +242,15 @@ bool RimWellLogFile::hasFlowData() const
//--------------------------------------------------------------------------------------------------
void RimWellLogFile::updateFilePathsFromProjectPath( const QString& newProjectPath, const QString& oldProjectPath )
{
bool foundFile = false;
std::vector<QString> searchedPaths;
QString fileNameCandidate =
RimTools::relocateFile( m_fileName(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths );
if ( foundFile )
{
m_fileName = fileNameCandidate;
}
// bool foundFile = false;
// std::vector<QString> searchedPaths;
//
// QString fileNameCandidate =
// RimTools::relocateFile( m_fileName(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths );
// if ( foundFile )
// {
// m_fileName = fileNameCandidate;
// }
}
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimWellLogFile.h
View File

@@ -51,7 +51,7 @@ public:
void setFileName( const QString& fileName );
QString fileName() const
{
return m_fileName;
return m_fileName().path();
}
QString name() const
{
@@ -109,7 +109,7 @@ private:
private:
cvf::ref<RigWellLogFile> m_wellLogDataFile;
caf::PdmField<QString> m_wellName;
caf::PdmField<QString> m_fileName;
caf::PdmField<caf::FilePath> m_fileName;
caf::PdmField<QString> m_name;
caf::PdmField<QDateTime> m_date;
bool m_lasFileHasValidDate;