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

#1322 Generalized update functions

Browse Source
This commit is contained in:
Magne Sjaastad 2017-03-17 16:09:48 +01:00
parent db5277e950
commit aae4751ede
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@ -33,10 +33,10 @@
#include "RimEclipseResultCase.h" #include "RimEclipseResultCase.h"
#include "RimEclipseView.h" #include "RimEclipseView.h"
#include "RimFlowDiagSolution.h" #include "RimFlowDiagSolution.h"
#include "RimPlotCurve.h"
#include "RimReservoirCellResultsStorage.h" #include "RimReservoirCellResultsStorage.h"
#include "RimView.h" #include "RimView.h"
#include "RimViewLinker.h" #include "RimViewLinker.h"
#include "RimWellLogCurve.h"
#include "cafPdmUiListEditor.h" #include "cafPdmUiListEditor.h"
@ -242,7 +242,7 @@ void RimEclipseResultDefinition::updateAnyFieldHasChanged()
cellColors->updateConnectedEditors(); cellColors->updateConnectedEditors();
} }
RimWellLogCurve* curve = nullptr; RimPlotCurve* curve = nullptr;
this->firstAncestorOrThisOfType(curve); this->firstAncestorOrThisOfType(curve);
if (curve) if (curve)
{ {
@ -339,7 +339,7 @@ void RimEclipseResultDefinition::loadDataAndUpdate()
} }
} }
RimWellLogCurve* curve = nullptr; RimPlotCurve* curve = nullptr;
this->firstAncestorOrThisOfType(curve); this->firstAncestorOrThisOfType(curve);
if (curve) if (curve)
{ {
@ -521,7 +521,7 @@ QList<caf::PdmOptionItemInfo> RimEclipseResultDefinition::calcOptionsForVariable
// Remove Per Cell Face options // Remove Per Cell Face options
{ {
RimWellLogCurve* curve = nullptr; RimPlotCurve* curve = nullptr;
this->firstAncestorOrThisOfType(curve); this->firstAncestorOrThisOfType(curve);
RimEclipsePropertyFilter* propFilter = nullptr; RimEclipsePropertyFilter* propFilter = nullptr;

4
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@ -93,13 +93,15 @@ public:
void setTofAndSelectTracer(const QString& tracerName); void setTofAndSelectTracer(const QString& tracerName);
// Public function to allow use from objects having a result definition as child field
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
protected: protected:
virtual void updateLegendCategorySettings() {}; virtual void updateLegendCategorySettings() {};
virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly); virtual QList<caf::PdmOptionItemInfo> calculateValueOptions(const caf::PdmFieldHandle* fieldNeedingOptions, bool* useOptionsOnly);
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue); virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void initAfterRead(); virtual void initAfterRead();
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
protected: protected:
caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > > m_resultType; caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > > m_resultType;