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

Fault result: Moved result mapping from collection to fault result

Browse Source
This commit is contained in:
Magne Sjaastad
2014-07-31 10:49:23 +02:00
parent 820dbaae5c
commit d424f2f25f
7 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ApplicationCode/ProjectDataModel/RimFaultResultSlot.cpp
View File

@@ -45,7 +45,7 @@ RimFaultResultSlot::RimFaultResultSlot()
{
CAF_PDM_InitObject("Fault Result Slot", "", "", "");
CAF_PDM_InitField(&m_visualizationMode, "VisualizationMode", caf::AppEnum<RimFaultResultSlot::FaultVisualizationMode>(RimFaultResultSlot::CELL_RESULT_MAPPING), "Fault Color Mapping", "", "", "");
CAF_PDM_InitField(&visualizationMode, "VisualizationMode", caf::AppEnum<RimFaultResultSlot::FaultVisualizationMode>(RimFaultResultSlot::CELL_RESULT_MAPPING), "Fault Color Mapping", "", "", "");
CAF_PDM_InitFieldNoDefault(&m_customResultSlot, "CustomResultSlot", "Custom Fault Cell Result", ":/CellResult.png", "", "");
m_customResultSlot = new RimResultSlot();
@@ -74,7 +74,7 @@ void RimFaultResultSlot::setReservoirView(RimReservoirView* ownerReservoirView)
//--------------------------------------------------------------------------------------------------
void RimFaultResultSlot::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{
if (changedField == &m_visualizationMode)
if (changedField == &visualizationMode)
{
updateVisibility();
@@ -97,7 +97,7 @@ void RimFaultResultSlot::initAfterRead()
//--------------------------------------------------------------------------------------------------
void RimFaultResultSlot::updateVisibility()
{
if (this->m_visualizationMode() == FAULT_COLOR || this->m_visualizationMode() == CELL_RESULT_MAPPING)
if (this->visualizationMode() == FAULT_COLOR || this->visualizationMode() == CELL_RESULT_MAPPING)
{
this->m_customResultSlot.setUiHidden(true);
this->m_customResultSlot.setUiChildrenHidden(true);
@@ -114,7 +114,7 @@ void RimFaultResultSlot::updateVisibility()
//--------------------------------------------------------------------------------------------------
RimResultSlot* RimFaultResultSlot::customResultSlot()
{
if (this->m_visualizationMode() == CUSTOM_RESULT_MAPPING)
if (this->visualizationMode() == CUSTOM_RESULT_MAPPING)
{
return this->m_customResultSlot();
}

7
ApplicationCode/ProjectDataModel/RimFaultResultSlot.h
View File

@@ -43,10 +43,12 @@ public:
public:
RimFaultResultSlot();
virtual ~RimFaultResultSlot();
void setReservoirView(RimReservoirView* ownerReservoirView);
RimResultSlot* customResultSlot();
caf::PdmField< caf::AppEnum< FaultVisualizationMode > > visualizationMode;
RimResultSlot* customResultSlot();
void updateVisibility();
protected:
@@ -54,7 +56,6 @@ protected:
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
private:
caf::PdmField< caf::AppEnum< FaultVisualizationMode > > m_visualizationMode;
caf::PdmField<RimResultSlot*> m_customResultSlot;
caf::PdmPointer<RimReservoirView> m_reservoirView;