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

clang-format: Set column width to 140

Browse Source 
* Set column width to 140
* Use c++20
* Remove redundant virtual
This commit is contained in:
Magne Sjaastad
2023-02-26 10:48:40 +01:00
committed by GitHub
parent 8768e186d8
commit f8c5cf389f
1535 changed files with 10456 additions and 19398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
ApplicationLibCode/Commands/RicCreateEnsembleSurfaceFeature.cpp
View File

@@ -55,13 +55,12 @@ void RicCreateEnsembleSurfaceFeature::openDialogAndExecuteCommand()
QString pathFilter( "*" );
QString fileNameFilter( "*" );
RicRecursiveFileSearchDialogResult result =
RicRecursiveFileSearchDialog::runRecursiveSearchDialog( nullptr,
"Choose Eclipse Cases",
defaultDir,
pathFilter,
fileNameFilter,
QStringList( ".EGRID" ) );
RicRecursiveFileSearchDialogResult result = RicRecursiveFileSearchDialog::runRecursiveSearchDialog( nullptr,
"Choose Eclipse Cases",
defaultDir,
pathFilter,
fileNameFilter,
QStringList( ".EGRID" ) );
if ( !result.ok || result.files.isEmpty() )
{
@@ -71,16 +70,12 @@ void RicCreateEnsembleSurfaceFeature::openDialogAndExecuteCommand()
// Read min/max k layer from first grid case
int minLayerK = -1;
int maxLayerK = -1;
if ( !RimcCommandRouter_extractSurfaces::readMinMaxLayerFromGridFile( result.files[0], minLayerK, maxLayerK ) )
return;
if ( !RimcCommandRouter_extractSurfaces::readMinMaxLayerFromGridFile( result.files[0], minLayerK, maxLayerK ) ) return;
RicCreateEnsembleSurfaceUi* ui = RimProject::current()->dialogData()->createEnsembleSurfaceUi();
ui->setLayersMinMax( minLayerK, maxLayerK );
RiuPropertyViewTabWidget propertyDialog( Riu3DMainWindowTools::mainWindowWidget(),
ui,
"Create Ensemble Surface",
ui->tabNames() );
RiuPropertyViewTabWidget propertyDialog( Riu3DMainWindowTools::mainWindowWidget(), ui, "Create Ensemble Surface", ui->tabNames() );
if ( propertyDialog.exec() == QDialog::Accepted )
{
@@ -92,8 +87,7 @@ void RicCreateEnsembleSurfaceFeature::openDialogAndExecuteCommand()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicCreateEnsembleSurfaceFeature::executeCommand( const RicCreateEnsembleSurfaceUi& ui,
const std::vector<QString>& fileNames )
void RicCreateEnsembleSurfaceFeature::executeCommand( const RicCreateEnsembleSurfaceUi& ui, const std::vector<QString>& fileNames )
{
std::vector layers = ui.layers();