OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge dev into pre-proto

Browse Source
This commit is contained in:
Jacob Støren
2017-06-14 23:25:55 +02:00
parent bca96d31ad 81d44ca69b
commit 1911092cb7
46 changed files with 1123 additions and 306 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimWellPathCollection.cpp
+3 -3
View File
@@ -159,7 +159,7 @@ void RimWellPathCollection::readWellPathFiles()
}
}
progress.setProgressDescription(QString("Reading file %1").arg(wellPaths[wpIdx]->name));
progress.setProgressDescription(QString("Reading file %1").arg(wellPaths[wpIdx]->name()));
progress.incrementProgress();
}
@@ -248,10 +248,10 @@ void RimWellPathCollection::readAndAddWellPaths(std::vector<RimWellPath*>& wellP
RimWellPath* wellPath = wellPathArray[wpIdx];
wellPath->readWellPathFile(NULL, m_wellPathImporter);
progress.setProgressDescription(QString("Reading file %1").arg(wellPath->name));
progress.setProgressDescription(QString("Reading file %1").arg(wellPath->name()));
// If a well path with this name exists already, make it read the well path file
RimWellPath* existingWellPath = wellPathByName(wellPath->name);
RimWellPath* existingWellPath = wellPathByName(wellPath->name());
if (existingWellPath)
{
existingWellPath->filepath = wellPath->filepath;