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

#1029 Refactored to prepare for more Flow Diag. Removed use of specific field visibility methods

Browse Source
This commit is contained in:
Jacob Støren
2016-12-14 10:27:46 +01:00
parent 8f65bd3fee
commit afa381b4b9
8 changed files with 14 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
ApplicationCode/ProjectDataModel/RimCellEdgeColors.cpp
View File

@@ -139,8 +139,6 @@ void RimCellEdgeColors::loadResult()
}
}
updateFieldVisibility();
updateConnectedEditors();
}
@@ -150,8 +148,6 @@ void RimCellEdgeColors::loadResult()
void RimCellEdgeColors::initAfterRead()
{
m_singleVarEdgeResultColors->initAfterRead();
updateFieldVisibility();
}
//--------------------------------------------------------------------------------------------------
@@ -266,9 +262,7 @@ void RimCellEdgeColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrderin
if (isUsingSingleVariable())
{
uiOrdering.add(&(m_singleVarEdgeResultColors->m_resultTypeUiField));
uiOrdering.add(&(m_singleVarEdgeResultColors->m_porosityModelUiField));
uiOrdering.add(&(m_singleVarEdgeResultColors->m_resultVariableUiField));
m_singleVarEdgeResultColors->defineUiOrdering(uiConfigName,uiOrdering );
}
else
{
@@ -385,14 +379,6 @@ void RimCellEdgeColors::cellEdgeMetaData(std::vector<RimCellEdgeMetaData>* metaD
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCellEdgeColors::updateFieldVisibility()
{
m_singleVarEdgeResultColors->updateFieldVisibility();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

2
ApplicationCode/ProjectDataModel/RimCellEdgeColors.h
View File

@@ -99,8 +99,6 @@ protected:
QStringList findResultVariableNames();
private:
void updateFieldVisibility();
void resetResultIndices();
void updateIgnoredScalarValue();

13
ApplicationCode/ProjectDataModel/RimEclipseFaultColors.cpp
View File

@@ -51,7 +51,6 @@ RimEclipseFaultColors::RimEclipseFaultColors()
m_customFaultResultColors.uiCapability()->setUiHidden(true);
updateFieldVisibility();
}
//--------------------------------------------------------------------------------------------------
@@ -88,18 +87,10 @@ void RimEclipseFaultColors::fieldChangedByUi(const caf::PdmFieldHandle* changedF
void RimEclipseFaultColors::initAfterRead()
{
m_customFaultResultColors->initAfterRead();
updateFieldVisibility();
this->updateUiIconFromToggleField();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseFaultColors::updateFieldVisibility()
{
m_customFaultResultColors->updateFieldVisibility();
}
//--------------------------------------------------------------------------------------------------
///
@@ -123,9 +114,7 @@ caf::PdmFieldHandle* RimEclipseFaultColors::objectToggleField()
void RimEclipseFaultColors::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
group1->add(&(m_customFaultResultColors->m_resultTypeUiField));
group1->add(&(m_customFaultResultColors->m_porosityModelUiField));
group1->add(&(m_customFaultResultColors->m_resultVariableUiField));
m_customFaultResultColors->defineUiOrdering(uiConfigName, *group1);
}
//--------------------------------------------------------------------------------------------------

24
ApplicationCode/ProjectDataModel/RimEclipseFaultColors.h
View File

@@ -39,24 +39,22 @@ public:
RimEclipseFaultColors();
virtual ~RimEclipseFaultColors();
void setReservoirView(RimEclipseView* ownerReservoirView);
void setReservoirView(RimEclipseView* ownerReservoirView);
caf::PdmField<bool> showCustomFaultResult;
caf::PdmField<bool> showCustomFaultResult;
bool hasValidCustomResult();
RimEclipseCellColors* customFaultResult();
void updateFieldVisibility();
bool hasValidCustomResult();
RimEclipseCellColors* customFaultResult();
protected:
virtual void initAfterRead();
virtual caf::PdmFieldHandle* objectToggleField();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "");
virtual void initAfterRead();
virtual caf::PdmFieldHandle* objectToggleField();
virtual void fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue);
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) ;
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "");
private:
caf::PdmChildField<RimEclipseCellColors*> m_customFaultResultColors;
caf::PdmPointer<RimEclipseView> m_reservoirView;
caf::PdmChildField<RimEclipseCellColors*> m_customFaultResultColors;
caf::PdmPointer<RimEclipseView> m_reservoirView;
};

4
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@@ -179,9 +179,7 @@ void RimEclipsePropertyFilter::defineUiOrdering(QString uiConfigName, caf::PdmUi
// Fields declared in RimResultDefinition
caf::PdmUiGroup* group1 = uiOrdering.addNewGroup("Result");
group1->add(&(resultDefinition->m_resultTypeUiField));
group1->add(&(resultDefinition->m_porosityModelUiField));
group1->add(&(resultDefinition->m_resultVariableUiField));
resultDefinition->defineUiOrdering(uiConfigName, *group1);
// Fields declared in RimCellFilter
uiOrdering.add(&filterMode);

22
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.cpp
View File

@@ -102,8 +102,6 @@ RimEclipseResultDefinition::~RimEclipseResultDefinition()
void RimEclipseResultDefinition::setEclipseCase(RimEclipseCase* eclipseCase)
{
m_eclipseCase = eclipseCase;
updateFieldVisibility();
}
@@ -486,7 +484,6 @@ void RimEclipseResultDefinition::loadResult()
gridCellResults->findOrLoadScalarResult(m_resultType(), m_resultVariable);
}
updateFieldVisibility();
}
//--------------------------------------------------------------------------------------------------
@@ -619,26 +616,7 @@ bool RimEclipseResultDefinition::hasCategoryResult() const
return this->resultVariable().contains("NUM", Qt::CaseInsensitive);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEclipseResultDefinition::updateFieldVisibility()
{
if (m_eclipseCase &&
m_eclipseCase->reservoirData() &&
m_eclipseCase->reservoirData()->activeCellInfo(RifReaderInterface::FRACTURE_RESULTS) )
{
if (m_eclipseCase->reservoirData()->activeCellInfo(RifReaderInterface::FRACTURE_RESULTS)->reservoirActiveCellCount() == 0)
{
m_porosityModelUiField.uiCapability()->setUiHidden(true);
}
else
{
m_porosityModelUiField.uiCapability()->setUiHidden(false);
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

4
ApplicationCode/ProjectDataModel/RimEclipseResultDefinition.h
View File

@@ -75,10 +75,6 @@ protected:
virtual void initAfterRead();
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
void updateFieldVisibility();
protected:
caf::PdmField< caf::AppEnum< RimDefines::ResultCatType > > m_resultType;
caf::PdmField< caf::AppEnum< RimDefines::PorosityModelType > > m_porosityModel;

1
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
View File

@@ -708,7 +708,6 @@ void RimEclipseView::loadDataAndUpdate()
this->cellEdgeResult()->loadResult();
this->faultResultSettings()->customFaultResult()->loadResult();
this->faultResultSettings()->updateFieldVisibility();
updateViewerWidget();