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

#2066 Observed Data : Improve error reporting

Browse Source
This commit is contained in:
Magne Sjaastad
2017-11-03 08:11:27 +01:00
parent ea53018f54
commit 9b7cfdd913
12 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ApplicationCode/ProjectDataModel/Summary/RimObservedDataCollection.cpp
View File

@@ -75,7 +75,7 @@ void RimObservedDataCollection::addObservedData(RimObservedData* observedData)
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName(const QString& fileName)
RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName(const QString& fileName, QString* errorText)
{
RimObservedData* observedData = nullptr;
@@ -84,7 +84,10 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
QFile file(fileName);
if (!file.open(QIODevice::ReadOnly | QIODevice::Text))
{
RiaLogging::error(QString("Failed to open %1").arg(fileName));
QString s = QString("Failed to open %1").arg(fileName);
RiaLogging::error(s);
if (errorText) errorText->append(s);
return nullptr;
}
@@ -118,6 +121,11 @@ RimObservedData* RimObservedDataCollection::createAndAddObservedDataFromFileName
observedData->updateMetaData();
observedData->updateOptionSensitivity();
if (errorText && !observedData->errorMessagesFromReader().isEmpty())
{
errorText->append(observedData->errorMessagesFromReader());
}
RiuMainPlotWindow* mainPlotWindow = RiaApplication::instance()->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow)
{