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

Always use export folder if defined

Browse Source 
Rename to m_customFileNameIncludingPath, and split into folder and file name for export object
This commit is contained in:
Magne Sjaastad
2023-02-10 15:11:03 +01:00
parent 947185bdcc
commit 6ad42817c6
4 changed files with 42 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@@ -72,22 +72,19 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForAllCompletions(
{
{
QString fileName;
QString folderName;
QFileInfo fi( exportSettings.customFileName() );
if ( !exportSettings.customFileName().isEmpty() )
{
fileName = fi.baseName() + "_MSW";
folderName = fi.absolutePath();
fileName = fi.baseName() + "_MSW";
}
else
{
fileName = QString( "UnifiedCompletions_MSW_%1" ).arg( exportSettings.caseToApply->caseUserDescription() );
folderName = exportSettings.folder;
}
unifiedExportFile =
RicWellPathExportCompletionsFileTools::openFileForExport( folderName,
RicWellPathExportCompletionsFileTools::openFileForExport( exportSettings.folder,
fileName,
fi.suffix(),
exportSettings.exportDataSourceAsComment() );
@@ -95,22 +92,19 @@ void RicWellPathExportMswCompletionsImpl::exportWellSegmentsForAllCompletions(
{
QString lgrFileName;
QString folderName;
QFileInfo fi( exportSettings.customFileName() );
if ( !exportSettings.customFileName().isEmpty() )
{
lgrFileName = fi.baseName() + "_LGR_MSW";
folderName = fi.absolutePath();
}
else
{
lgrFileName =
QString( "UnifiedCompletions_LGR_MSW_%1" ).arg( exportSettings.caseToApply->caseUserDescription() );
folderName = exportSettings.folder;
}
unifiedLgrExportFile =
RicWellPathExportCompletionsFileTools::openFileForExport( folderName,
RicWellPathExportCompletionsFileTools::openFileForExport( exportSettings.folder,
lgrFileName,
fi.suffix(),
exportSettings.exportDataSourceAsComment() );