OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#1028 Flow Diag Solution object. #1029 Flow Diag Result type in Result Definition along with some refactoring.

Browse Source
This commit is contained in:
Jacob Støren
2016-12-14 09:50:30 +01:00
parent cd6ee6466b
commit 8f65bd3fee
9 changed files with 472 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
+21 -7
View File
@@ -26,11 +26,13 @@
#include "cafPdmField.h"
#include "cafPdmObject.h"
#include "cafPdmPointer.h"
#include "cafPdmPtrField.h"
class RigCaseCellResultsData;
class RimEclipseCase;
class RimEclipseView;
class RimReservoirCellResultsStorage;
class RimFlowDiagSolution;
//==================================================================================================
///
@@ -62,38 +64,50 @@ public:
RimReservoirCellResultsStorage* currentGridCellResults() const;
virtual void initAfterRead();
virtual void updateLegendCategorySettings() {};
void updateResultNameHasChanged();
void updateAnyFieldHasChanged();
protected:
virtual void updateLegendCategorySettings() {};
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 initAfterRead();
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
protected:
void updateFieldVisibility();
protected:
caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > > m_resultType;
caf::PdmField< caf::AppEnum< RimDefines::PorosityModelType > > m_porosityModel;
caf::PdmField<QString> m_resultVariable;
caf::PdmPtrField<RimFlowDiagSolution*> m_flowSolution;
caf::PdmField<std::vector<QString> > m_selectedTracers;
friend class RimEclipsePropertyFilter;
friend class RimEclipseFaultColors;
friend class RimWellLogExtractionCurve;
// User interface only fields, to support "filtering"-like behaviour etc.
caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > > m_resultTypeUiField;
caf::PdmField< caf::AppEnum< RimDefines::PorosityModelType > > m_porosityModelUiField;
caf::PdmField<QString> m_resultVariableUiField;
caf::PdmPtrField<RimFlowDiagSolution*> m_flowSolutionUiField;
caf::PdmField<std::vector<QString> > m_selectedTracersUiField;
caf::PdmPointer<RimEclipseCase> m_eclipseCase;
private:
QList<caf::PdmOptionItemInfo> calculateValueOptionsForSpecifiedDerivedListPosition(bool showDerivedResultsFirstInList, const caf::PdmFieldHandle* fieldNeedingOptions, bool * useOptionsOnly);
QStringList getResultVariableListForCurrentUIFieldSettings();
bool hasDualPorFractureResult();
QList<caf::PdmOptionItemInfo> calcOptionsForVariableUiFieldStandard();
QStringList getResultNamesForCurrentUiResultType();
static void removePerCellFaceOptionItems(QList<caf::PdmOptionItemInfo>& optionItems);
};