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

#2366 AppFwk: Use caf::FilePath for odb-file

Browse Source
This commit is contained in:
Rebecca Cox 2018-01-19 12:53:37 +01:00
parent 56188c8f3f
commit 7726ed1610
2 changed files with 7 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
ApplicationCode/ProjectDataModel/RimGeoMechCase.cpp
View File

@ -54,7 +54,7 @@ RimGeoMechCase::RimGeoMechCase(void)
{
CAF_PDM_InitObject("Geomechanical Case", ":/GeoMechCase48x48.png", "", "");
CAF_PDM_InitField(&m_caseFileName, "CaseFileName", QString(), "Case File Name", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_caseFileName, "CaseFileName", "Case File Name", "", "", "");
m_caseFileName.uiCapability()->setUiReadOnly(true);
CAF_PDM_InitFieldNoDefault(&geoMechViews, "GeoMechViews", "", "", "", "");
geoMechViews.uiCapability()->setUiHidden(true);
@ -106,7 +106,7 @@ RimGeoMechCase::~RimGeoMechCase(void)
//--------------------------------------------------------------------------------------------------
void RimGeoMechCase::setFileName(const QString& fileName)
{
m_caseFileName = fileName;
m_caseFileName.v().setPath(fileName);
}
//--------------------------------------------------------------------------------------------------
@ -114,7 +114,7 @@ void RimGeoMechCase::setFileName(const QString& fileName)
//--------------------------------------------------------------------------------------------------
QString RimGeoMechCase::caseFileName() const
{
return m_caseFileName();
return m_caseFileName().path();
}
//--------------------------------------------------------------------------------------------------
@ -156,12 +156,12 @@ bool RimGeoMechCase::openGeoMechCase(std::string* errorMessage)
// If read already, return
if (this->m_geoMechCaseData.notNull()) return true;
if (!caf::Utils::fileExists(m_caseFileName()))
if (!caf::Utils::fileExists(m_caseFileName().path()))
{
return false;
}
m_geoMechCaseData = new RigGeoMechCaseData(m_caseFileName().toStdString());
m_geoMechCaseData = new RigGeoMechCaseData(m_caseFileName().path().toStdString());
bool fileOpenSuccess = m_geoMechCaseData->openAndReadFemParts(errorMessage);
if (!fileOpenSuccess)
@ -199,22 +199,7 @@ bool RimGeoMechCase::openGeoMechCase(std::string* errorMessage)
//--------------------------------------------------------------------------------------------------
void RimGeoMechCase::updateFilePathsFromProjectPath(const QString& newProjectPath, const QString& oldProjectPath)
{
bool foundFile = false;
std::vector<QString> searchedPaths;
// Update filename and folder paths when opening project from a different file location
m_caseFileName = RimTools::relocateFile(m_caseFileName(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths);
for (caf::FilePath& fileName : m_elementPropertyFileNames.v())
{
fileName = RimTools::relocateFile(fileName.path(), newProjectPath, oldProjectPath, &foundFile, &searchedPaths);
}
#if 0 // Output the search path for debugging
for (size_t i = 0; i < searchedPaths.size(); ++i)
qDebug() << searchedPaths[i];
#endif
//No longer in use. Filepaths are now of type caf::FilePath, and updated in RimProject on load.
}

2
ApplicationCode/ProjectDataModel/RimGeoMechCase.h
View File

@ -94,7 +94,7 @@ private:
private:
cvf::ref<RigGeoMechCaseData> m_geoMechCaseData;
caf::PdmField<QString> m_caseFileName;
caf::PdmField<caf::FilePath> m_caseFileName;
caf::PdmField<double> m_cohesion;
caf::PdmField<double> m_frictionAngleDeg;
caf::PdmField<std::vector<caf::FilePath>> m_elementPropertyFileNames;