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

#7973 Export Completions : Further improvements

Browse Source 
Fix typo
Make sure compdat export works for custom file name
This commit is contained in:
Magne Sjaastad 2021-09-09 15:16:34 +02:00
parent 6173b4f421
commit 0e0bd751f6
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeatureImpl.cpp
View File

@ -268,11 +268,22 @@ void RicWellPathExportCompletionDataFeatureImpl::exportCompletions( const std::v
if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::ExportSplit::UNIFIED_FILE ) if ( exportSettings.fileSplit == RicExportCompletionDataSettingsUi::ExportSplit::UNIFIED_FILE )
{ {
QString fileName = exportSettings.customFileName(); QString fileName;
if ( fileName.isEmpty() ) fileName = QString( "UnifiedCompletions_%1" ).arg( eclipseCaseName ); QString folderName;
if ( exportSettings.customFileName().isEmpty() )
{
fileName = QString( "UnifiedCompletions_%1" ).arg( eclipseCaseName );
folderName = exportSettings.folder;
}
else
{
fileName = exportSettings.customFileName();
QFileInfo fi( fileName );
folderName = fi.absolutePath();
}
sortAndExportCompletionsToFile( exportSettings.caseToApply, sortAndExportCompletionsToFile( exportSettings.caseToApply,
exportSettings.folder, folderName,
fileName, fileName,
completions, completions,
fractureDataReportItems, fractureDataReportItems,

2
ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportMswCompletionsImpl.cpp
View File

@ -77,7 +77,7 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForAllCompletions(
QFileInfo fi( exportSettings.customFileName() ); QFileInfo fi( exportSettings.customFileName() );
if ( !exportSettings.customFileName().isEmpty() ) if ( !exportSettings.customFileName().isEmpty() )
{ {
fileName = fi.baseName(); fileName = fi.baseName() + "_MSW";
folderName = fi.absolutePath(); folderName = fi.absolutePath();
} }
else else