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

2743 Origin summary import dialog adjustments

Browse Source
This commit is contained in:
Bjørn Erik Jensen
2018-04-16 14:11:31 +02:00
parent c9a1eeef03
commit 0fcc0bea4c
5 changed files with 139 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationCode/FileInterface/RifEclipseSummaryTools.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaSummaryCurveAnalyzer.h"
#include "RifReaderEclipseSummary.h"
#include "RiaStringEncodingTools.h"
#include "RiaFilePathTools.h"
#include "cafAppEnum.h"
@@ -158,7 +159,7 @@ QString RifEclipseSummaryTools::findGridCaseFileFromSummaryHeaderFile(const QStr
util_safe_free(myBase);
util_safe_free(myPath);
return gridCaseFile;
return RiaFilePathTools::toInternalSeparator(gridCaseFile);
}
//--------------------------------------------------------------------------------------------------
@@ -218,9 +219,9 @@ void RifEclipseSummaryTools::findSummaryHeaderFileInfo(const QString& inputFile,
}
}
if (myHeaderFile && headerFile) *headerFile = myHeaderFile;
if (myPath && path) *path = myPath;
if (myBase && base) *base = myBase;
if (myHeaderFile && headerFile) *headerFile = RiaFilePathTools::toInternalSeparator(myHeaderFile);
if (myPath && path) *path = RiaFilePathTools::toInternalSeparator(myPath);
if (myBase && base) *base = RiaFilePathTools::toInternalSeparator(myBase);
if (isFormatted) *isFormatted = formattedFile;
util_safe_free(myHeaderFile);