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

(#226) CellEdge Result: Check box in tree.

Browse Source 
The MULT result is not yet set as default property.
This commit is contained in:
Jacob Støren
2015-07-01 14:16:33 +02:00
parent dccfe9afb3
commit 46bca827aa
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@@ -38,6 +38,9 @@ RimCellEdgeColors::RimCellEdgeColors()
{ {
CAF_PDM_InitObject("Cell Edge Result", "", "", ""); CAF_PDM_InitObject("Cell Edge Result", "", "", "");
CAF_PDM_InitField(&enableCellEdgeColors, "EnableCellEdgeColors", true, "Enable cell edge results", "", "", "");
enableCellEdgeColors.setUiHidden(true);
CAF_PDM_InitFieldNoDefault(&resultVariable, "CellEdgeVariable", "Result property", "", "", ""); CAF_PDM_InitFieldNoDefault(&resultVariable, "CellEdgeVariable", "Result property", "", "", "");
CAF_PDM_InitField(&useXVariable, "UseXVariable", true, "Use X values", "", "", ""); CAF_PDM_InitField(&useXVariable, "UseXVariable", true, "Use X values", "", "", "");
CAF_PDM_InitField(&useYVariable, "UseYVariable", true, "Use Y values", "", "", ""); CAF_PDM_InitField(&useYVariable, "UseYVariable", true, "Use Y values", "", "", "");
@@ -279,6 +282,8 @@ void RimCellEdgeColors::resetResultIndices()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
bool RimCellEdgeColors::hasResult() const bool RimCellEdgeColors::hasResult() const
{ {
if (!enableCellEdgeColors()) return false;
bool hasResult = false; bool hasResult = false;
int cubeFaceIndex; int cubeFaceIndex;
for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex) for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex)
@@ -361,3 +366,11 @@ void RimCellEdgeColors::posNegClosestToZero(double& pos, double& neg)
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
caf::PdmFieldHandle* RimCellEdgeColors::objectToggleField()
{
return &enableCellEdgeColors;
}

14
ApplicationCode/ProjectDataModel/RimCellEdgeColors.h
View File

@@ -54,9 +54,6 @@ public:
void setReservoirView(RimEclipseView* ownerReservoirView); void setReservoirView(RimEclipseView* ownerReservoirView);
caf::PdmField<QString> resultVariable; caf::PdmField<QString> resultVariable;
caf::PdmField<bool> useXVariable;
caf::PdmField<bool> useYVariable;
caf::PdmField<bool> useZVariable;
caf::PdmField<RimLegendConfig*> legendConfig; caf::PdmField<RimLegendConfig*> legendConfig;
double ignoredScalarValue() { return m_ignoredResultScalar; } double ignoredScalarValue() { return m_ignoredResultScalar; }
@@ -74,9 +71,18 @@ protected:
QStringList findResultVariableNames(); QStringList findResultVariableNames();
private: private:
void resetResultIndices(); void resetResultIndices();
void updateIgnoredScalarValue(); void updateIgnoredScalarValue();
protected:
virtual caf::PdmFieldHandle* objectToggleField();
caf::PdmField<bool> enableCellEdgeColors;
caf::PdmField<bool> useXVariable;
caf::PdmField<bool> useYVariable;
caf::PdmField<bool> useZVariable;
caf::FixedArray<std::pair<QString, size_t>, 6 > m_resultNameToIndexPairs; caf::FixedArray<std::pair<QString, size_t>, 6 > m_resultNameToIndexPairs;
caf::PdmPointer<RimEclipseView> m_reservoirView; caf::PdmPointer<RimEclipseView> m_reservoirView;
double m_ignoredResultScalar; double m_ignoredResultScalar;