#1998 RFT plot. Support for multiple LAS files per well path

This commit is contained in:
Bjørn Erik Jensen
2017-10-19 16:12:22 +02:00
parent 5a9af2bba6
commit b99f12b3e4
12 changed files with 369 additions and 258 deletions

View File

@@ -137,26 +137,27 @@ void RimWellPathCollection::readWellPathFiles()
}
}
RimWellLogFile* wellLogFile = wellPaths[wpIdx]->wellLogFile();
if (wellLogFile)
for (RimWellLogFile* const wellLogFile : wellPaths[wpIdx]->wellLogFiles())
{
QString errorMessage;
if (!wellLogFile->readFile(&errorMessage))
if (wellLogFile)
{
QString displayMessage = "Could not open the well log file: \n" + wellLogFile->fileName();
if (!errorMessage.isEmpty())
QString errorMessage;
if (!wellLogFile->readFile(&errorMessage))
{
displayMessage += "\n\n";
displayMessage += errorMessage;
}
QString displayMessage = "Could not open the well log file: \n" + wellLogFile->fileName();
QMessageBox::warning(RiuMainWindow::instance(),
"File open error",
displayMessage);
if (!errorMessage.isEmpty())
{
displayMessage += "\n\n";
displayMessage += errorMessage;
}
QMessageBox::warning(RiuMainWindow::instance(),
"File open error",
displayMessage);
}
}
}
progress.setProgressDescription(QString("Reading file %1").arg(wellPaths[wpIdx]->name()));
progress.incrementProgress();
}
@@ -300,7 +301,7 @@ void RimWellPathCollection::addWellLogs(const QStringList& filePaths)
wellPaths.push_back(wellPath);
}
wellPath->setLogFileInfo(logFileInfo);
wellPath->addWellLogFile(logFileInfo);
}
}