mirror of
				https://github.com/OPM/ResInsight.git
				synced 2025-02-25 18:55:39 -06:00 
			
		
		
		
	(#226) CellEdge Result: Check box in tree.
The MULT result is not yet set as default property.
This commit is contained in:
		@@ -38,6 +38,9 @@ RimCellEdgeColors::RimCellEdgeColors()
 | 
			
		||||
{
 | 
			
		||||
    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_InitField(&useXVariable, "UseXVariable", true, "Use X values", "", "", "");
 | 
			
		||||
    CAF_PDM_InitField(&useYVariable, "UseYVariable", true, "Use Y values", "", "", "");
 | 
			
		||||
@@ -279,6 +282,8 @@ void RimCellEdgeColors::resetResultIndices()
 | 
			
		||||
//--------------------------------------------------------------------------------------------------
 | 
			
		||||
bool RimCellEdgeColors::hasResult() const
 | 
			
		||||
{
 | 
			
		||||
    if (!enableCellEdgeColors()) return false;
 | 
			
		||||
 | 
			
		||||
    bool hasResult = false;
 | 
			
		||||
    int cubeFaceIndex;
 | 
			
		||||
    for (cubeFaceIndex = 0; cubeFaceIndex < 6; ++cubeFaceIndex)
 | 
			
		||||
@@ -361,3 +366,11 @@ void RimCellEdgeColors::posNegClosestToZero(double& pos, double& neg)
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
//--------------------------------------------------------------------------------------------------
 | 
			
		||||
/// 
 | 
			
		||||
//--------------------------------------------------------------------------------------------------
 | 
			
		||||
caf::PdmFieldHandle* RimCellEdgeColors::objectToggleField()
 | 
			
		||||
{
 | 
			
		||||
   return &enableCellEdgeColors;
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -54,9 +54,6 @@ public:
 | 
			
		||||
    void                                  setReservoirView(RimEclipseView* ownerReservoirView);
 | 
			
		||||
 | 
			
		||||
    caf::PdmField<QString>                resultVariable;
 | 
			
		||||
    caf::PdmField<bool>                   useXVariable;
 | 
			
		||||
    caf::PdmField<bool>                   useYVariable;
 | 
			
		||||
    caf::PdmField<bool>                   useZVariable;
 | 
			
		||||
 | 
			
		||||
    caf::PdmField<RimLegendConfig*>       legendConfig;
 | 
			
		||||
    double                                ignoredScalarValue() { return m_ignoredResultScalar; }
 | 
			
		||||
@@ -74,11 +71,20 @@ protected:
 | 
			
		||||
    QStringList                           findResultVariableNames();
 | 
			
		||||
 | 
			
		||||
private:
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
    void                                  resetResultIndices();
 | 
			
		||||
    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::PdmPointer<RimEclipseView>                m_reservoirView;
 | 
			
		||||
    caf::PdmPointer<RimEclipseView>                  m_reservoirView;
 | 
			
		||||
    double                                           m_ignoredResultScalar;
 | 
			
		||||
};
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user