OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

#1174 Rename to loadDataAndUpdate

Browse Source
This commit is contained in:
Magne Sjaastad 2017-02-15 10:40:32 +01:00
parent f5db37fcf7
commit b6b544f13f
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ApplicationCode/Commands/FlowCommands/RicShowContributingWellsFeature.cpp
View File

@ -63,7 +63,7 @@ void RicShowContributingWellsFeature::onActionTriggered(bool isChecked)
{
activeView->cellResult()->setResultType(RimDefines::FLOW_DIAGNOSTICS);
activeView->cellResult()->setResultVariable("MaxFractionTracer");
activeView->cellResult()->updateResultNameHasChanged();
activeView->cellResult()->loadDataAndUpdate();
activeView->cellResult()->updateConnectedEditors();
@ -97,7 +97,7 @@ void RicShowContributingWellsFeature::onActionTriggered(bool isChecked)
propertyFilter->resultDefinition()->setEclipseCase(activeView->eclipseCase());
propertyFilter->resultDefinition()->setTofAndSelectTracer(wellAllocationPlot->wellName());
propertyFilter->resultDefinition()->updateResultNameHasChanged();
propertyFilter->resultDefinition()->loadDataAndUpdate();
propertyFilterCollection->updateConnectedEditors();

2
ApplicationCode/ProjectDataModel/RimEclipseInputProperty.cpp
View File

@ -121,7 +121,7 @@ void RimEclipseInputProperty::fieldChangedByUi(const caf::PdmFieldHandle* change
it->setResultVariable(newName);
}
it->updateResultNameHasChanged();
it->loadDataAndUpdate();
it->updateAnyFieldHasChanged();
}
}

6
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -196,14 +196,14 @@ void RimEclipseResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* cha
m_flowSolution = m_flowSolutionUiField();
m_selectedTracers = m_selectedTracersUiField();
}
updateResultNameHasChanged();
loadDataAndUpdate();
}
if ( &m_selectedTracersUiField == changedField )
{
m_flowSolution = m_flowSolutionUiField();
m_selectedTracers = m_selectedTracersUiField();
updateResultNameHasChanged();
loadDataAndUpdate();
}
updateAnyFieldHasChanged();
@ -290,7 +290,7 @@ void RimEclipseResultDefinition::assignFlowSolutionFromCase()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseResultDefinition::updateResultNameHasChanged()
void RimEclipseResultDefinition::loadDataAndUpdate()
{
RimView* view = nullptr;
this->firstAncestorOrThisOfType(view);

4
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -27,13 +27,13 @@
#include "cafPdmObject.h"
#include "cafPdmPointer.h"
#include "cafPdmPtrField.h"
#include "RigFlowDiagResultAddress.h"
class RigCaseCellResultsData;
class RimEclipseCase;
class RimEclipseView;
class RimReservoirCellResultsStorage;
class RimFlowDiagSolution;
class RigFlowDiagResultAddress;
//==================================================================================================
@ -84,7 +84,7 @@ public:
RimReservoirCellResultsStorage* currentGridCellResults() const;
void updateResultNameHasChanged();
void loadDataAndUpdate();
void updateAnyFieldHasChanged();
void setTofAndSelectTracer(const QString& tracerName);