mirror of
https://github.com/OPM/ResInsight.git
synced 2025-02-25 18:55:39 -06:00
* Formation names format changed to allow no space around k-layer numbers. Also added possibility to use one number as k-layer count for the name. Based on previous names last layer * Deleted geomech cache of formation name result when updating the formation names * Added TNH TNQV THQV to plane transformed stresses.
This commit is contained in:
@@ -18,6 +18,7 @@
|
||||
#include "RimFormationNamesCollection.h"
|
||||
|
||||
#include "RimFormationNames.h"
|
||||
#include "QMessageBox"
|
||||
|
||||
CAF_PDM_SOURCE_INIT(RimFormationNamesCollection, "FormationNamesCollectionObject");
|
||||
|
||||
@@ -87,9 +88,23 @@ void RimFormationNamesCollection::importFiles(const QStringList& fileNames)
|
||||
formNamesObjsToReload.push_back(newFNs);
|
||||
}
|
||||
|
||||
QString totalErrorMessage;
|
||||
|
||||
for (RimFormationNames* fmNames: formNamesObjsToReload)
|
||||
{
|
||||
fmNames->readFormationNamesFile(nullptr);
|
||||
QString errormessage;
|
||||
|
||||
fmNames->readFormationNamesFile(&errormessage);
|
||||
if (!errormessage.isEmpty())
|
||||
{
|
||||
totalErrorMessage += "\nError in: " + fmNames->fileName()
|
||||
+ "\n\t" + errormessage;
|
||||
}
|
||||
}
|
||||
|
||||
if (!totalErrorMessage.isEmpty())
|
||||
{
|
||||
QMessageBox::warning(nullptr, "Import Formation Names", totalErrorMessage);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user