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

Avoid throwing exception when opening a file for export

Browse Source
This commit is contained in:
Magne Sjaastad 2023-02-10 15:16:44 +01:00
parent 7652fec895
commit a0d9eeabfa
3 changed files with 20 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -883,15 +883,15 @@ void RicWellPathExportCompletionDataFeatureImpl::sortAndExportCompletionsToFile(
if ( !completionsForMainGrid.empty() )
{
try
{
QFileInfo fi( fileName );
std::shared_ptr<QFile> exportFile =
RicWellPathExportCompletionsFileTools::openFileForExport( folderName,
fi.baseName(),
fi.suffix(),
exportDataSourceAsComment );
QFileInfo fi( fileName );
std::shared_ptr<QFile> exportFile =
RicWellPathExportCompletionsFileTools::openFileForExport( folderName,
fi.baseName(),
fi.suffix(),
exportDataSourceAsComment );
if ( exportFile )
{
std::map<QString, std::vector<RigCompletionData>> completionsForGrid;
completionsForGrid.insert( std::pair<QString, std::vector<RigCompletionData>>( "", completionsForMainGrid ) );
@ -902,24 +902,21 @@ void RicWellPathExportCompletionDataFeatureImpl::sortAndExportCompletionsToFile(
}
exportCompdatAndWpimultTables( eclipseCase, exportFile, completionsForGrid, exportType, exportDataSourceAsComment );
}
catch ( RicWellPathExportCompletionsFileTools::OpenFileException )
{
}
}
if ( !completionsForSubGrids.empty() )
{
try
QFileInfo fi( fileName );
QString lgrFileName = fi.baseName() + "_LGR";
std::shared_ptr<QFile> exportFile =
RicWellPathExportCompletionsFileTools::openFileForExport( folderName,
lgrFileName,
fi.suffix(),
exportDataSourceAsComment );
if ( exportFile )
{
QFileInfo fi( fileName );
QString lgrFileName = fi.baseName() + "_LGR";
std::shared_ptr<QFile> exportFile =
RicWellPathExportCompletionsFileTools::openFileForExport( folderName,
lgrFileName,
fi.suffix(),
exportDataSourceAsComment );
exportWellPathFractureReport( eclipseCase, exportFile, wellPathFractureReportItems );
if ( exportWelspec )
{
@ -927,9 +924,6 @@ void RicWellPathExportCompletionDataFeatureImpl::sortAndExportCompletionsToFile(
}
exportCompdatAndWpimultTables( eclipseCase, exportFile, completionsForSubGrids, exportType, exportDataSourceAsComment );
}
catch ( RicWellPathExportCompletionsFileTools::OpenFileException )
{
}
}
}

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

@ -33,14 +33,6 @@
#include <QDir>
#include <QTextStream>
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicWellPathExportCompletionsFileTools::OpenFileException::OpenFileException( const QString& message )
: message( message )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@ -60,7 +52,7 @@ std::shared_ptr<QFile> RicWellPathExportCompletionsFileTools::openFile( const QS
{
auto errorMessage = QString( "Selected output folder does not exist, and could not be created." );
RiaLogging::error( errorMessage );
throw OpenFileException( errorMessage );
return nullptr;
}
}
@ -71,7 +63,7 @@ std::shared_ptr<QFile> RicWellPathExportCompletionsFileTools::openFile( const QS
{
auto errorMessage = QString( "Export Completions Data: Could not open the file: %1" ).arg( filePath );
RiaLogging::error( errorMessage );
throw OpenFileException( errorMessage );
return nullptr;
}
return exportFile;
}

7
ApplicationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionsFileTools.h
View File

@ -28,13 +28,6 @@ class RimWellPath;
class RicWellPathExportCompletionsFileTools
{
public:
class OpenFileException
{
public:
OpenFileException( const QString& message );
QString message;
};
static const RimWellPath* findWellPathFromExportName( const QString& wellNameForExport );
static std::shared_ptr<QFile>