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

#1059 Rename

Browse Source
This commit is contained in:
Magne Sjaastad 2017-01-05 07:57:37 +01:00
parent a9984c4bd5
commit a61b3ad5f6
10 changed files with 58 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Commands/ViewLink/RicLinkVisibleViewsFeatureUi.cpp
View File

@ -75,7 +75,7 @@ RimView* RicLinkVisibleViewsFeatureUi::masterView()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RicLinkVisibleViewsFeatureUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) QList<caf::PdmOptionItemInfo> RicLinkVisibleViewsFeatureUi::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> optionList; QList<caf::PdmOptionItemInfo> options;
if (fieldNeedingOptions == &m_masterView) if (fieldNeedingOptions == &m_masterView)
{ {
@ -90,9 +90,9 @@ QList<caf::PdmOptionItemInfo> RicLinkVisibleViewsFeatureUi::calculateValueOption
icon = rimCase->uiCapability()->uiIcon(); icon = rimCase->uiCapability()->uiIcon();
} }
optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(v), v, false, icon)); options.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(v), v, false, icon));
} }
} }
return optionList; return options;
} }

8
ApplicationCode/ProjectDataModel/RimCase.cpp
View File

@ -69,7 +69,7 @@ cvf::Vec3d RimCase::displayModelOffset() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCase::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) QList<caf::PdmOptionItemInfo> RimCase::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> optionList; QList<caf::PdmOptionItemInfo> options;
if(fieldNeedingOptions == &activeFormationNames) if(fieldNeedingOptions == &activeFormationNames)
{ {
@ -78,12 +78,12 @@ QList<caf::PdmOptionItemInfo> RimCase::calculateValueOptions(const caf::PdmField
{ {
for(RimFormationNames* fnames : proj->activeOilField()->formationNamesCollection()->formationNamesList()) for(RimFormationNames* fnames : proj->activeOilField()->formationNamesCollection()->formationNamesList())
{ {
optionList.push_back(caf::PdmOptionItemInfo(fnames->fileNameWoPath(), fnames, false, fnames->uiCapability()->uiIcon())); options.push_back(caf::PdmOptionItemInfo(fnames->fileNameWoPath(), fnames, false, fnames->uiCapability()->uiIcon()));
} }
} }
optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); options.push_front(caf::PdmOptionItemInfo("None", nullptr));
} }
return optionList; return options;
} }

8
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@ -190,7 +190,7 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeColors::calculateValueOptions(const caf
//TODO: Must also handle input properties //TODO: Must also handle input properties
//varList += m_reservoirView->gridCellResults()->resultNames(RimDefines::INPUT_PROPERTY); //varList += m_reservoirView->gridCellResults()->resultNames(RimDefines::INPUT_PROPERTY);
QList<caf::PdmOptionItemInfo> optionList; QList<caf::PdmOptionItemInfo> options;
std::map<QString, caf::FixedArray<QString, 6> > varBaseNameToVarsMap; std::map<QString, caf::FixedArray<QString, 6> > varBaseNameToVarsMap;
@ -237,15 +237,15 @@ QList<caf::PdmOptionItemInfo> RimCellEdgeColors::calculateValueOptions(const caf
} }
optionUiName += ")"; optionUiName += ")";
optionList.push_back(caf::PdmOptionItemInfo( optionUiName, QVariant(it->first))); options.push_back(caf::PdmOptionItemInfo( optionUiName, QVariant(it->first)));
} }
optionList.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), "")); options.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), ""));
if (useOptionsOnly) *useOptionsOnly = true; if (useOptionsOnly) *useOptionsOnly = true;
return optionList; return options;
} }
} }

8
ApplicationCode/ProjectDataModel/RimCellFilter.cpp
View File

@ -128,7 +128,7 @@ caf::PdmFieldHandle* RimCellFilter::objectToggleField()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> optionList; QList<caf::PdmOptionItemInfo> options;
if (&m_selectedCategoryValues == fieldNeedingOptions) if (&m_selectedCategoryValues == fieldNeedingOptions)
{ {
@ -141,7 +141,7 @@ QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions(const caf::Pd
int categoryValue = m_categoryValues[i]; int categoryValue = m_categoryValues[i];
QString categoryName = m_categoryNames[i]; QString categoryName = m_categoryNames[i];
optionList.push_back(caf::PdmOptionItemInfo(categoryName, categoryValue)); options.push_back(caf::PdmOptionItemInfo(categoryName, categoryValue));
} }
} }
else else
@ -149,12 +149,12 @@ QList<caf::PdmOptionItemInfo> RimCellFilter::calculateValueOptions(const caf::Pd
for (auto it : m_categoryValues) for (auto it : m_categoryValues)
{ {
QString str = QString::number(it); QString str = QString::number(it);
optionList.push_back(caf::PdmOptionItemInfo(str, it)); options.push_back(caf::PdmOptionItemInfo(str, it));
} }
} }
} }
return optionList; return options;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

18
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -298,23 +298,23 @@ void RimEclipseResultDefinition::updateResultNameHasChanged()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> optionItems; QList<caf::PdmOptionItemInfo> options;
if ( m_resultTypeUiField() != RimDefines::FLOW_DIAGNOSTICS ) if ( m_resultTypeUiField() != RimDefines::FLOW_DIAGNOSTICS )
{ {
if ( fieldNeedingOptions == &m_resultVariableUiField ) if ( fieldNeedingOptions == &m_resultVariableUiField )
{ {
optionItems = calcOptionsForVariableUiFieldStandard(); options = calcOptionsForVariableUiFieldStandard();
} }
} }
else else
{ {
if ( fieldNeedingOptions == &m_resultVariableUiField ) if ( fieldNeedingOptions == &m_resultVariableUiField )
{ {
optionItems.push_back(caf::PdmOptionItemInfo("Time Of Flight (Average)", RIG_FLD_TOF_RESNAME)); options.push_back(caf::PdmOptionItemInfo("Time Of Flight (Average)", RIG_FLD_TOF_RESNAME));
optionItems.push_back(caf::PdmOptionItemInfo("Tracer Cell Fraction (Sum)", RIG_FLD_CELL_FRACTION_RESNAME)); options.push_back(caf::PdmOptionItemInfo("Tracer Cell Fraction (Sum)", RIG_FLD_CELL_FRACTION_RESNAME));
optionItems.push_back(caf::PdmOptionItemInfo("Max Fraction Tracer", RIG_FLD_MAX_FRACTION_TRACER_RESNAME)); options.push_back(caf::PdmOptionItemInfo("Max Fraction Tracer", RIG_FLD_MAX_FRACTION_TRACER_RESNAME));
optionItems.push_back(caf::PdmOptionItemInfo("Injector Producer Communication", RIG_FLD_COMMUNICATION_RESNAME)); options.push_back(caf::PdmOptionItemInfo("Injector Producer Communication", RIG_FLD_COMMUNICATION_RESNAME));
} }
else if (fieldNeedingOptions == &m_flowSolutionUiField) else if (fieldNeedingOptions == &m_flowSolutionUiField)
{ {
@ -325,7 +325,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
std::vector<RimFlowDiagSolution*> flowSols = eclCase->flowDiagSolutions(); std::vector<RimFlowDiagSolution*> flowSols = eclCase->flowDiagSolutions();
for (RimFlowDiagSolution* flowSol : flowSols) for (RimFlowDiagSolution* flowSol : flowSols)
{ {
optionItems.push_back(caf::PdmOptionItemInfo(flowSol->userDescription(), flowSol)); options.push_back(caf::PdmOptionItemInfo(flowSol->userDescription(), flowSol));
} }
} }
} }
@ -351,7 +351,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
for (auto nameIt: prefixedTracerNamesMap) for (auto nameIt: prefixedTracerNamesMap)
{ {
optionItems.push_back(caf::PdmOptionItemInfo(nameIt.first, QVariant(nameIt.second))); options.push_back(caf::PdmOptionItemInfo(nameIt.first, QVariant(nameIt.second)));
} }
} }
} }
@ -359,7 +359,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calculateValueOptions(
(*useOptionsOnly) = true; (*useOptionsOnly) = true;
return optionItems; return options;
} }

14
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@ -861,7 +861,7 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
} }
} }
QList<caf::PdmOptionItemInfo> optionList; QList<caf::PdmOptionItemInfo> options;
if (fieldNeedingOptions == &m_mappingMode) if (fieldNeedingOptions == &m_mappingMode)
{ {
@ -879,7 +879,7 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
for(MappingType mapType: mappingTypes) for(MappingType mapType: mappingTypes)
{ {
optionList.push_back(caf::PdmOptionItemInfo(MappingEnum::uiText(mapType), mapType)); options.push_back(caf::PdmOptionItemInfo(MappingEnum::uiText(mapType), mapType));
} }
} }
else if (fieldNeedingOptions == &m_colorRangeMode) else if (fieldNeedingOptions == &m_colorRangeMode)
@ -903,18 +903,18 @@ QList<caf::PdmOptionItemInfo> RimLegendConfig::calculateValueOptions(const caf::
for(ColorRangesType colType: rangeTypes) for(ColorRangesType colType: rangeTypes)
{ {
optionList.push_back(caf::PdmOptionItemInfo(ColorRangeEnum::uiText(colType), colType)); options.push_back(caf::PdmOptionItemInfo(ColorRangeEnum::uiText(colType), colType));
} }
} }
else if (fieldNeedingOptions == &m_rangeMode) else if (fieldNeedingOptions == &m_rangeMode)
{ {
if (!m_isAllTimeStepsRangeDisabled) { if (!m_isAllTimeStepsRangeDisabled) {
optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS), RimLegendConfig::AUTOMATIC_ALLTIMESTEPS)); options.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_ALLTIMESTEPS), RimLegendConfig::AUTOMATIC_ALLTIMESTEPS));
} }
optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP), RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP)); options.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP), RimLegendConfig::AUTOMATIC_CURRENT_TIMESTEP));
optionList.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::USER_DEFINED), RimLegendConfig::USER_DEFINED)); options.push_back(caf::PdmOptionItemInfo(RangeModeEnum::uiText(RimLegendConfig::USER_DEFINED), RimLegendConfig::USER_DEFINED));
} }
return optionList; return options;
} }

10
ApplicationCode/ProjectDataModel/RimViewController.cpp
View File

@ -95,7 +95,7 @@ RimViewController::~RimViewController(void)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly) QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> optionList; QList<caf::PdmOptionItemInfo> options;
if (fieldNeedingOptions == &m_managedView) if (fieldNeedingOptions == &m_managedView)
{ {
@ -125,17 +125,17 @@ QList<caf::PdmOptionItemInfo> RimViewController::calculateValueOptions(const caf
icon = rimCase->uiCapability()->uiIcon(); icon = rimCase->uiCapability()->uiIcon();
} }
optionList.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(view), view, false, icon)); options.push_back(caf::PdmOptionItemInfo(RimViewLinker::displayNameForView(view), view, false, icon));
} }
} }
if (optionList.size() > 0) if (options.size() > 0)
{ {
optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); options.push_front(caf::PdmOptionItemInfo("None", nullptr));
} }
} }
return optionList; return options;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

20
ApplicationCode/ProjectDataModel/RimWellLogFileCurve.cpp
View File

@ -196,10 +196,10 @@ void RimWellLogFileCurve::defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrd
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> optionList; QList<caf::PdmOptionItemInfo> options;
optionList = RimWellLogCurve::calculateValueOptions(fieldNeedingOptions, useOptionsOnly); options = RimWellLogCurve::calculateValueOptions(fieldNeedingOptions, useOptionsOnly);
if (optionList.size() > 0) return optionList; if (options.size() > 0) return options;
if (fieldNeedingOptions == &m_wellPath) if (fieldNeedingOptions == &m_wellPath)
{ {
@ -213,13 +213,13 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
// Only include well paths coming from a well log file // Only include well paths coming from a well log file
if (wellPaths[i]->m_wellLogFile()) if (wellPaths[i]->m_wellLogFile())
{ {
optionList.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), wellPaths[i])); options.push_back(caf::PdmOptionItemInfo(wellPaths[i]->name(), wellPaths[i]));
} }
} }
if (optionList.size() > 0) if (options.size() > 0)
{ {
optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); options.push_front(caf::PdmOptionItemInfo("None", nullptr));
} }
} }
} }
@ -236,18 +236,18 @@ QList<caf::PdmOptionItemInfo> RimWellLogFileCurve::calculateValueOptions(const c
for (size_t i = 0; i < fileLogs->size(); i++) for (size_t i = 0; i < fileLogs->size(); i++)
{ {
QString wellLogChannelName = (*fileLogs)[i]->name(); QString wellLogChannelName = (*fileLogs)[i]->name();
optionList.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName)); options.push_back(caf::PdmOptionItemInfo(wellLogChannelName, wellLogChannelName));
} }
} }
} }
if (optionList.size() == 0) if (options.size() == 0)
{ {
optionList.push_back(caf::PdmOptionItemInfo("None", "None")); options.push_back(caf::PdmOptionItemInfo("None", "None"));
} }
} }
return optionList; return options;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------

16
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurve.cpp
View File

@ -295,8 +295,8 @@ RimDefines::PlotAxis RimSummaryCurve::yAxis() const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> optionList = this->RimPlotCurve::calculateValueOptions(fieldNeedingOptions,useOptionsOnly); QList<caf::PdmOptionItemInfo> options = this->RimPlotCurve::calculateValueOptions(fieldNeedingOptions,useOptionsOnly);
if (!optionList.isEmpty()) return optionList; if (!options.isEmpty()) return options;
if (fieldNeedingOptions == &m_summaryCase) if (fieldNeedingOptions == &m_summaryCase)
@ -308,12 +308,12 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions(const caf::
for (RimSummaryCase* rimCase : cases) for (RimSummaryCase* rimCase : cases)
{ {
optionList.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase)); options.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase));
} }
if (optionList.size() > 0) if (options.size() > 0)
{ {
optionList.push_front(caf::PdmOptionItemInfo("None", nullptr)); options.push_front(caf::PdmOptionItemInfo("None", nullptr));
} }
} }
else if(fieldNeedingOptions == &m_uiFilterResultSelection) else if(fieldNeedingOptions == &m_uiFilterResultSelection)
@ -337,16 +337,16 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurve::calculateValueOptions(const caf::
{ {
std::string name = addrIntPair.first.uiText(); std::string name = addrIntPair.first.uiText();
QString s = QString::fromStdString(name); QString s = QString::fromStdString(name);
optionList.push_back(caf::PdmOptionItemInfo(s, addrIntPair.second)); options.push_back(caf::PdmOptionItemInfo(s, addrIntPair.second));
} }
} }
optionList.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), addressCount)); options.push_front(caf::PdmOptionItemInfo(RimDefines::undefinedResultName(), addressCount));
if(useOptionsOnly) *useOptionsOnly = true; if(useOptionsOnly) *useOptionsOnly = true;
} }
} }
return optionList; return options;
} }

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryCurveFilter.cpp
View File

@ -155,7 +155,7 @@ void RimSummaryCurveFilter::createCurves(RimSummaryCase* summaryCase, const QStr
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimSummaryCurveFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly) QList<caf::PdmOptionItemInfo> RimSummaryCurveFilter::calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly)
{ {
QList<caf::PdmOptionItemInfo> optionList; QList<caf::PdmOptionItemInfo> options;
if (fieldNeedingOptions == &m_selectedSummaryCases) if (fieldNeedingOptions == &m_selectedSummaryCases)
{ {
@ -166,7 +166,7 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurveFilter::calculateValueOptions(const
for (RimSummaryCase* rimCase : cases) for (RimSummaryCase* rimCase : cases)
{ {
optionList.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase)); options.push_back(caf::PdmOptionItemInfo(rimCase->caseName(), rimCase));
} }
} }
else if(fieldNeedingOptions == &m_uiFilterResultMultiSelection) else if(fieldNeedingOptions == &m_uiFilterResultMultiSelection)
@ -177,13 +177,13 @@ QList<caf::PdmOptionItemInfo> RimSummaryCurveFilter::calculateValueOptions(const
{ {
std::string name = address.uiText(); std::string name = address.uiText();
QString s = QString::fromStdString(name); QString s = QString::fromStdString(name);
optionList.push_back(caf::PdmOptionItemInfo(s, QVariant::fromValue(address))); options.push_back(caf::PdmOptionItemInfo(s, QVariant::fromValue(address)));
} }
} }
if(useOptionsOnly) *useOptionsOnly = true; if(useOptionsOnly) *useOptionsOnly = true;
return optionList; return options;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------