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

#2901 RFT Plot : Use empty() and move for loops

Browse Source
This commit is contained in:
Magne Sjaastad
2018-05-11 13:26:14 +02:00
parent 803da0668b
commit e1abaa1b6c
1 changed files with 21 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationCode/ProjectDataModel/Flow/RimWellRftPlot.cpp
View File

@@ -296,7 +296,7 @@ void RimWellRftPlot::applyInitialSelections()
} }
std::vector<RimWellLogFile*> wellLogFiles = RimWellPlotTools::wellLogFilesContainingPressure(m_wellPathNameOrSimWellName); std::vector<RimWellLogFile*> wellLogFiles = RimWellPlotTools::wellLogFilesContainingPressure(m_wellPathNameOrSimWellName);
if (wellLogFiles.size() > 0) if (!wellLogFiles.empty())
{ {
sourcesToSelect.push_back(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED)); sourcesToSelect.push_back(RifDataSourceForRftPlt(RifDataSourceForRftPlt::OBSERVED));
for (RimWellLogFile* const wellLogFile : wellLogFiles) for (RimWellLogFile* const wellLogFile : wellLogFiles)
@@ -316,7 +316,7 @@ void RimWellRftPlot::applyInitialSelections()
{ {
timeStepsToSelect.insert(timeStep); timeStepsToSelect.insert(timeStep);
} }
if (gridTimeSteps.size() > 0) timeStepsToSelect.insert(*gridTimeSteps.begin()); if (!gridTimeSteps.empty()) timeStepsToSelect.insert(*gridTimeSteps.begin());
m_selectedTimeSteps = std::vector<QDateTime>(timeStepsToSelect.begin(), timeStepsToSelect.end()); m_selectedTimeSteps = std::vector<QDateTime>(timeStepsToSelect.begin(), timeStepsToSelect.end());
@@ -633,34 +633,36 @@ QList<caf::PdmOptionItemInfo> RimWellRftPlot::calculateValueOptions(const caf::P
else if (fieldNeedingOptions == &m_selectedSources) else if (fieldNeedingOptions == &m_selectedSources)
{ {
const std::vector<RimEclipseResultCase*> rftCases = RimWellPlotTools::rftCasesForWell(simWellName); const std::vector<RimEclipseResultCase*> rftCases = RimWellPlotTools::rftCasesForWell(simWellName);
if (rftCases.size() > 0) if (!rftCases.empty())
{ {
options.push_back(caf::PdmOptionItemInfo::createHeader( options.push_back(caf::PdmOptionItemInfo::createHeader(
RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::RFT), true)); RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::RFT), true));
}
for (const auto& rftCase : rftCases) for (const auto& rftCase : rftCases)
{ {
auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::RFT, rftCase); auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::RFT, rftCase);
auto item = caf::PdmOptionItemInfo(rftCase->caseUserDescription(), QVariant::fromValue(addr)); auto item = caf::PdmOptionItemInfo(rftCase->caseUserDescription(), QVariant::fromValue(addr));
item.setLevel(1); item.setLevel(1);
options.push_back(item); options.push_back(item);
}
} }
const std::vector<RimEclipseResultCase*> gridCases = RimWellPlotTools::gridCasesForWell(simWellName); const std::vector<RimEclipseResultCase*> gridCases = RimWellPlotTools::gridCasesForWell(simWellName);
if (gridCases.size() > 0) if (!gridCases.empty())
{ {
options.push_back(caf::PdmOptionItemInfo::createHeader( options.push_back(caf::PdmOptionItemInfo::createHeader(
RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::GRID), true)); RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::GRID), true));
}
for (const auto& gridCase : gridCases) for (const auto& gridCase : gridCases)
{ {
auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::GRID, gridCase); auto addr = RifDataSourceForRftPlt(RifDataSourceForRftPlt::GRID, gridCase);
auto item = caf::PdmOptionItemInfo(gridCase->caseUserDescription(), QVariant::fromValue(addr)); auto item = caf::PdmOptionItemInfo(gridCase->caseUserDescription(), QVariant::fromValue(addr));
item.setLevel(1); item.setLevel(1);
options.push_back(item); options.push_back(item);
}
} }
if (RimWellPlotTools::wellLogFilesContainingPressure(m_wellPathNameOrSimWellName).size() > 0) if (!RimWellPlotTools::wellLogFilesContainingPressure(m_wellPathNameOrSimWellName).empty())
{ {
options.push_back(caf::PdmOptionItemInfo::createHeader( options.push_back(caf::PdmOptionItemInfo::createHeader(
RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::OBSERVED), true)); RifDataSourceForRftPlt::sourceTypeUiText(RifDataSourceForRftPlt::OBSERVED), true));