Skip to content

Commit

Permalink
Janitor: Remove deprecated method.
Browse files Browse the repository at this point in the history
  • Loading branch information
@kriben @magnesj
kriben authored and magnesj committed Sep 11, 2023
1 parent 5ecf621 commit 1899184
Show file tree
Hide file tree
Showing 38 changed files with 109 additions and 195 deletions.
3 changes: 1 addition & 2 deletions ApplicationLibCode/Application/RiaApplication.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -606,8 +606,7 @@ bool RiaApplication::loadProject( const QString& projectFileName, ProjectLoadAct

// Now load the ReservoirViews for the cases
// Add all "native" cases in the project
std::vector<RimCase*> casesToLoad;
m_project->allCases( casesToLoad );
std::vector<RimCase*> casesToLoad = m_project->allGridCases();
{
caf::ProgressInfo caseProgress( casesToLoad.size(), "Reading Cases" );

Expand Down
15 changes: 4 additions & 11 deletions ApplicationLibCode/Application/Tools/RiaProjectModifier.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -193,9 +193,7 @@ void RiaProjectModifier::replaceSourceCases( RimProject* project )
//--------------------------------------------------------------------------------------------------
void RiaProjectModifier::replaceCase( RimProject* project )
{
std::vector<RimCase*> allCases;
project->allCases( allCases );

std::vector<RimCase*> allCases = project->allGridCases();
for ( RimCase* rimCase : allCases )
{
RimEclipseResultCase* eclipseResultCase = dynamic_cast<RimEclipseResultCase*>( rimCase );
Expand Down Expand Up @@ -234,9 +232,7 @@ void RiaProjectModifier::replaceCase( RimProject* project )
//--------------------------------------------------------------------------------------------------
void RiaProjectModifier::replacePropertiesFolder( RimProject* project )
{
std::vector<RimCase*> allCases;
project->allCases( allCases );

std::vector<RimCase*> allCases = project->allGridCases();
for ( RimCase* rimCase : allCases )
{
RimEclipseInputCase* inputCase = dynamic_cast<RimEclipseInputCase*>( rimCase );
Expand Down Expand Up @@ -289,9 +285,7 @@ QString RiaProjectModifier::caseNameFromGridFileName( const QString& fullGridFil
//--------------------------------------------------------------------------------------------------
int RiaProjectModifier::firstCaseId( RimProject* project )
{
std::vector<RimCase*> allCases;
project->allCases( allCases );

std::vector<RimCase*> allCases = project->allGridCases();
for ( RimCase* rimCase : allCases )
{
RimEclipseResultCase* resultCase = dynamic_cast<RimEclipseResultCase*>( rimCase );
Expand Down Expand Up @@ -330,8 +324,7 @@ int RiaProjectModifier::firstGroupId( RimProject* project )
//--------------------------------------------------------------------------------------------------
int RiaProjectModifier::firstInputCaseId( RimProject* project )
{
std::vector<RimCase*> allCases;
project->allCases( allCases );
std::vector<RimCase*> allCases = project->allGridCases();

for ( RimCase* rimCase : allCases )
{
Expand Down
6 changes: 2 additions & 4 deletions ApplicationLibCode/CommandFileInterface/RicfCreateView.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,8 @@ RicfCreateView::RicfCreateView()
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicfCreateView::execute()
{
RimProject* project = RimProject::current();
std::vector<RimCase*> allCases;
project->allCases( allCases );

RimProject* project = RimProject::current();
std::vector<RimCase*> allCases = project->allGridCases();
for ( RimCase* rimCase : allCases )
{
if ( rimCase->caseId() == m_caseId() )
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/CommandFileInterface/RicfImportFormationNames.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,7 @@ caf::PdmScriptResponse RicfImportFormationNames::execute()
if ( formationNames )
{
bool foundCase = false;
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );
std::vector<RimCase*> cases = RimProject::current()->allGridCases();
for ( RimCase* rimCase : cases )
{
if ( m_applyToCaseId() == -1 || ( rimCase->caseId() == m_applyToCaseId() ) )
Expand Down
5 changes: 2 additions & 3 deletions ApplicationLibCode/CommandFileInterface/RicfSetTimeStep.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,11 +69,10 @@ void RicfSetTimeStep::setTimeStepIndex( int timeStepIndex )
//--------------------------------------------------------------------------------------------------
caf::PdmScriptResponse RicfSetTimeStep::execute()
{
RimCase* rimCase = nullptr;
std::vector<RimCase*> allCases;
RimCase* rimCase = nullptr;

{
RimProject::current()->allCases( allCases );
std::vector<RimCase*> allCases = RimProject::current()->allGridCases();

bool foundCase = false;
for ( RimCase* c : allCases )
Expand Down
4 changes: 1 addition & 3 deletions ApplicationLibCode/Commands/ApplicationCommands/RicShowMainWindowFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ void RicShowMainWindowFeature::showMainWindow()

// When the main window is created, make sure all the views are loaded and displayed

std::vector<RimCase*> allGridModels;
RimProject::current()->allCases( allGridModels );

std::vector<RimCase*> allGridModels = RimProject::current()->allGridCases();
for ( RimCase* gridModel : allGridModels )
{
if ( gridModel )
Expand Down
3 changes: 1 addition & 2 deletions ...tionLibCode/Commands/CompletionExportCommands/RicExportCompletionsWellSegmentsFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,7 @@ void RicExportCompletionsWellSegmentsFeature::onActionTriggered( bool isChecked
QString defaultDir = RiaApplication::instance()->lastUsedDialogDirectoryWithFallbackToProjectFolder( "COMPLETIONS" );

RicCaseAndFileExportSettingsUi exportSettings;
std::vector<RimCase*> cases;
app->project()->allCases( cases );
std::vector<RimCase*> cases = app->project()->allGridCases();
for ( auto c : cases )
{
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( c );
Expand Down
3 changes: 1 addition & 2 deletions ...ationLibCode/Commands/CompletionExportCommands/RicWellPathExportCompletionDataFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ void RicWellPathExportCompletionDataFeature::prepareExportSettingsAndExportCompl

if ( !exportSettings->caseToApply() )
{
std::vector<RimCase*> cases;
app->project()->allCases( cases );
std::vector<RimCase*> cases = app->project()->allGridCases();
for ( auto c : cases )
{
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( c );
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/Commands/ExportCommands/RicCreateDepthAdjustedLasFilesUi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -179,8 +179,7 @@ void RicCreateDepthAdjustedLasFilesUi::setDefaultValues()
RimProject* proj = RimProject::current();
if ( proj )
{
std::vector<RimCase*> allCases;
proj->allCases( allCases );
std::vector<RimCase*> allCases = proj->allGridCases();
if ( !allCases.empty() ) selectedCase = allCases[0];

std::vector<RimWellPath*> allWellPaths = proj->activeOilField()->wellPathCollection->allWellPaths();
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/Commands/ExportCommands/RicExportLgrFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -292,8 +292,7 @@ RicExportLgrUi*

if ( !featureUi->caseToApply() && !defaultCase )
{
std::vector<RimCase*> cases;
app->project()->allCases( cases );
std::vector<RimCase*> cases = app->project()->allGridCases();
for ( auto c : cases )
{
RimEclipseCase* eclipseCase = dynamic_cast<RimEclipseCase*>( c );
Expand Down
4 changes: 1 addition & 3 deletions ApplicationLibCode/Commands/ExportCommands/RicSnapshotAllViewsToFileFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ void RicSnapshotAllViewsToFileFeature::exportSnapshotOfViewsIntoFolder( const QS

RiaLogging::info( QString( "Exporting snapshot of all views to %1" ).arg( snapshotFolderName ) );

std::vector<RimCase*> projectCases;
project->allCases( projectCases );

std::vector<RimCase*> projectCases = project->allGridCases();
for ( size_t i = 0; i < projectCases.size(); i++ )
{
RimCase* cas = projectCases[i];
Expand Down
5 changes: 2 additions & 3 deletions ...icationLibCode/Commands/GridCrossPlotCommands/RicCreateSaturationPressurePlotsFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,9 +116,8 @@ void RicCreateSaturationPressurePlotsFeature::onActionTriggered( bool isChecked

std::vector<RimEclipseResultCase*> eclipseCases;
{
RiaApplication* app = RiaApplication::instance();
std::vector<RimCase*> cases;
app->project()->allCases( cases );
RiaApplication* app = RiaApplication::instance();
std::vector<RimCase*> cases = app->project()->allGridCases();
for ( auto* rimCase : cases )
{
auto erc = dynamic_cast<RimEclipseResultCase*>( rimCase );
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/Commands/RicCloseCaseFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,8 +188,7 @@ void RicCloseCaseFeature::deleteEclipseCase( RimEclipseCase* eclipseCase )
{
RimProject* project = RimProject::current();

std::vector<RimCase*> cases;
project->allCases( cases );
std::vector<RimCase*> cases = project->allGridCases();

if ( cases.empty() )
{
Expand Down
4 changes: 1 addition & 3 deletions ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,9 +131,7 @@ void RicImportEnsembleFeature::importSingleEnsemble( const QStringList&
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );
}

std::vector<RimCase*> allCases;
RiaApplication::instance()->project()->allCases( allCases );

std::vector<RimCase*> allCases = RiaApplication::instance()->project()->allGridCases();
if ( allCases.empty() )
{
RiuMainWindow::closeIfOpen();
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/Commands/RicImportFormationNamesFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,8 +127,7 @@ void RicImportFormationNamesFeature::onActionTriggered( bool isChecked )
{
RimProject* proj = RimProject::current();

std::vector<RimCase*> cases;
proj->allCases( cases );
std::vector<RimCase*> cases = proj->allGridCases();

// Legend name is base name of the one formation file, c.f. RicImportFormationNamesFeature::importFormationFiles()
QString legendName = QFileInfo( fileNames.last() ).baseName();
Expand Down
12 changes: 4 additions & 8 deletions ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,8 @@ void RicImportSummaryCasesFeature::onActionTriggered( bool isChecked )
mainPlotWindow->updateMultiPlotToolBar();
}

std::vector<RimCase*> allCases;
app->project()->allCases( allCases );

if ( allCases.size() == 0 )
std::vector<RimCase*> allCases = app->project()->allGridCases();
if ( allCases.empty() )
{
RiuMainWindow::closeIfOpen();
}
Expand Down Expand Up @@ -152,10 +150,8 @@ std::pair<bool, std::vector<RimSummaryCase*>> RicImportSummaryCasesFeature::crea
mainPlotWindow->updateMultiPlotToolBar();

// Close main window if there are no eclipse cases imported
std::vector<RimCase*> allCases;
app->project()->allCases( allCases );

if ( allCases.size() == 0 )
std::vector<RimCase*> allCases = app->project()->allGridCases();
if ( allCases.empty() )
{
RiuMainWindow::closeIfOpen();
}
Expand Down
6 changes: 2 additions & 4 deletions ApplicationLibCode/Commands/RicImportSummaryGroupFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,10 +67,8 @@ void RicImportSummaryGroupFeature::onActionTriggered( bool isChecked )
mainPlotWindow->updateMultiPlotToolBar();
}

std::vector<RimCase*> allCases;
app->project()->allCases( allCases );

if ( allCases.size() == 0 )
std::vector<RimCase*> allCases = app->project()->allGridCases();
if ( allCases.empty() )
{
RiuMainWindow::closeIfOpen();
}
Expand Down
15 changes: 4 additions & 11 deletions ApplicationLibCode/Commands/RicWellLogTools.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,7 @@ RimSimWellInView* RicWellLogTools::selectedSimulationWell( int* branchIndex )
bool RicWellLogTools::hasRftData()
{
RimEclipseResultCase* resultCase;
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );

std::vector<RimCase*> cases = RimProject::current()->allGridCases();
for ( RimCase* rimCase : cases )
{
if ( ( resultCase = dynamic_cast<RimEclipseResultCase*>( rimCase ) ) )
Expand All @@ -101,9 +99,7 @@ bool RicWellLogTools::hasRftData()
bool RicWellLogTools::hasRftDataForWell( const QString& wellName )
{
RimEclipseResultCase* resultCase;
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );

std::vector<RimCase*> cases = RimProject::current()->allGridCases();
for ( RimCase* rimCase : cases )
{
if ( ( resultCase = dynamic_cast<RimEclipseResultCase*>( rimCase ) ) )
Expand Down Expand Up @@ -236,8 +232,7 @@ ExtractionCurveType* RicWellLogTools::addExtractionCurve( RimWellLogTrack*
}
else
{
std::vector<RimCase*> allCases;
RimProject::current()->allCases( allCases );
std::vector<RimCase*> allCases = RimProject::current()->allGridCases();
if ( !allCases.empty() ) caseToApply = allCases.front();
}
}
Expand Down Expand Up @@ -343,9 +338,7 @@ RimWellLogRftCurve* RicWellLogTools::addRftCurve( RimWellLogTrack* plotTrack, co

RimEclipseResultCase* resultCase = nullptr;

std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );

std::vector<RimCase*> cases = RimProject::current()->allGridCases();
for ( RimCase* rimCase : cases )
{
if ( ( resultCase = dynamic_cast<RimEclipseResultCase*>( rimCase ) ) )
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/Commands/WellLogCommands/RicAdd3dWellLogCurveFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@ CAF_CMD_SOURCE_INIT( RicAdd3dWellLogCurveFeature, "RicAdd3dWellLogCurveFeature"
//--------------------------------------------------------------------------------------------------
bool RicAdd3dWellLogCurveFeature::isCommandEnabled() const
{
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );
std::vector<RimCase*> cases = RimProject::current()->allGridCases();
if ( cases.empty() ) return false;

return caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellPath>();
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/Commands/WellLogCommands/RicAdd3dWellLogFileCurveFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@ CAF_CMD_SOURCE_INIT( RicAdd3dWellLogFileCurveFeature, "RicAdd3dWellLogFileCurveF
//--------------------------------------------------------------------------------------------------
bool RicAdd3dWellLogFileCurveFeature::isCommandEnabled() const
{
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );
std::vector<RimCase*> cases = RimProject::current()->allGridCases();
if ( cases.empty() ) return false;

return ( RicWellLogTools::findWellPathWithLogFileFromSelection() != nullptr );
Expand Down
3 changes: 1 addition & 2 deletions ApplicationLibCode/Commands/WellLogCommands/RicAdd3dWellLogRftCurveFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,7 @@ CAF_CMD_SOURCE_INIT( RicAdd3dWellLogRftCurveFeature, "RicAdd3dWellLogRftCurveFea
//--------------------------------------------------------------------------------------------------
bool RicAdd3dWellLogRftCurveFeature::isCommandEnabled() const
{
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );
std::vector<RimCase*> cases = RimProject::current()->allGridCases();
if ( cases.empty() ) return false;

RimWellPath* wellPath = caf::SelectionManager::instance()->selectedItemAncestorOfType<RimWellPath>();
Expand Down
6 changes: 2 additions & 4 deletions ApplicationLibCode/Commands/WellLogCommands/RicNewPltPlotFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -169,8 +169,6 @@ RimSimWellInView* RicNewPltPlotFeature::selectedSimulationWell( int* branchIndex
//--------------------------------------------------------------------------------------------------
bool RicNewPltPlotFeature::caseAvailable() const
{
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );

return cases.size() > 0;
std::vector<RimCase*> cases = RimProject::current()->allGridCases();
return !cases.empty();
}
4 changes: 1 addition & 3 deletions ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogExtractionCurveFeature.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,8 +133,6 @@ void RicNewWellLogExtractionCurveFeature::setupActionLook( QAction* actionToSetu
//--------------------------------------------------------------------------------------------------
bool RicNewWellLogExtractionCurveFeature::caseAvailable()
{
std::vector<RimCase*> cases;
RimProject::current()->allCases( cases );

std::vector<RimCase*> cases = RimProject::current()->allGridCases();
return !cases.empty();
}
3 changes: 1 addition & 2 deletions ApplicationLibCode/Commands/WellLogCommands/RicNewWellLogPlotFeatureImpl.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,7 @@ RimWellLogTrack*

if ( !caseToApply )
{
std::vector<RimCase*> allCases;
RimProject::current()->allCases( allCases );
std::vector<RimCase*> allCases = RimProject::current()->allGridCases();
if ( !allCases.empty() )
{
caseToApply = allCases.front();
Expand Down
4 changes: 1 addition & 3 deletions ApplicationLibCode/ProjectDataModel/Flow/RimWellPltPlot.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,7 @@ void RimWellPltPlot::updateFormationsOnPlot() const
{
/// Set default case. Todo : Use the first of the selected cases in the
/// plot
std::vector<RimCase*> cases;
proj->allCases( cases );

std::vector<RimCase*> cases = proj->allGridCases();
if ( !cases.empty() )
{
formationNamesCase = cases[0];
Expand Down
4 changes: 1 addition & 3 deletions ApplicationLibCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,9 +209,7 @@ void RimWellRftPlot::updateFormationsOnPlot() const
if ( !formationNamesCase )
{
/// Set default case. Todo : Use the first of the selected cases in the plot
std::vector<RimCase*> cases;
proj->allCases( cases );

std::vector<RimCase*> cases = proj->allGridCases();
if ( !cases.empty() )
{
formationNamesCase = cases[0];
Expand Down
6 changes: 2 additions & 4 deletions ApplicationLibCode/ProjectDataModel/RimAdvancedSnapshotExportDefinition.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,8 @@ QList<caf::PdmOptionItemInfo> RimAdvancedSnapshotExportDefinition::calculateValu

std::vector<Rim3dView*> views;

RimProject* proj = RimProject::current();
std::vector<RimCase*> cases;
proj->allCases( cases );

RimProject* proj = RimProject::current();
std::vector<RimCase*> cases = proj->allGridCases();
for ( RimCase* rimCase : cases )
{
for ( Rim3dView* rimView : rimCase->views() )
Expand Down
4 changes: 1 addition & 3 deletions ApplicationLibCode/ProjectDataModel/RimGridCalculation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -289,9 +289,7 @@ QList<caf::PdmOptionItemInfo> RimGridCalculation::calculateValueOptions( const c
RimProject* proj = RimProject::current();
if ( proj )
{
std::vector<RimCase*> cases;
proj->allCases( cases );

std::vector<RimCase*> cases = proj->allGridCases();
for ( RimCase* c : cases )
{
auto* eclipseCase = dynamic_cast<RimEclipseCase*>( c );
Expand Down
Loading

0 comments on commit 1899184

Please sign in to comment.