#2428 Fracture: Reorganize Fracture Colors tree item

This commit is contained in:
Rebecca Cox committed 2018-01-31 15:11:46 +01:00
1 parent d7fa97f052
commit e50f7bf66f
10 files changed
+78 -59

No files matched your search

@@ -70,19 +70,6 @@
CAF_PDM_XML_ABSTRACT_SOURCE_INIT(RimFracture, "Fracture");
namespace caf {
template<>
void caf::AppEnum< RimFracture::StimPlanResultColorType >::setUp()
{
addItem(RimFracture::COLOR_INTERPOLATION, "COLOR_INTERPOLATION", "On");
addItem(RimFracture::SINGLE_ELEMENT_COLOR, "SINGLE_ELEMENT_COLOR", "Off");
setDefault(RimFracture::COLOR_INTERPOLATION);
}
} // End namespace caf
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -154,8 +141,6 @@ RimFracture::RimFracture(void)
m_wellFractureAzimuthAngleWarning.uiCapability()->setUiReadOnly(true);
m_wellFractureAzimuthAngleWarning.xmlCapability()->disableIO();
CAF_PDM_InitFieldNoDefault(&m_stimPlanCellVizMode, "StimPlanCellVizMode", "StimPlan Color Interpolation", "", "", "");
m_fracturePartMgr = new RivWellFracturePartMgr(this);
}
@@ -190,14 +175,6 @@ void RimFracture::setStimPlanTimeIndexToPlot(int timeIndex)
m_stimPlanTimeIndexToPlot = timeIndex;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimFracture::StimPlanResultColorType RimFracture::stimPlanResultColorType() const
{
return m_stimPlanCellVizMode();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
@@ -227,7 +204,6 @@ void RimFracture::fieldChangedByUi(const caf::PdmFieldHandle* changedField, cons
if (changedField == &m_azimuth ||
changedField == &m_fractureTemplate ||
changedField == &m_stimPlanTimeIndexToPlot ||
changedField == &m_stimPlanCellVizMode ||
changedField == this->objectToggleField() ||
changedField == &m_dip ||
changedField == &m_tilt ||
@@ -520,14 +496,12 @@ void RimFracture::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiO
if (dynamic_cast<RimStimPlanFractureTemplate*>(fracTemplate))
{
m_stimPlanTimeIndexToPlot.uiCapability()->setUiHidden(false);
m_stimPlanCellVizMode.uiCapability()->setUiHidden(false);
m_stimPlanTimeIndexToPlot.uiCapability()->setUiReadOnly(true);
}
else
{
m_stimPlanTimeIndexToPlot.uiCapability()->setUiHidden(true);
m_stimPlanCellVizMode.uiCapability()->setUiHidden(true);
}
}
else