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

#588 GeoMech Color result: Make active result visible in property editor when selecting a object ofType/containing Result definition

Browse Source
This commit is contained in:
Rebecca Cox
2018-02-13 10:49:26 +01:00
parent b8c9989d0b
commit b49396b88c
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.cpp
View File

@@ -94,8 +94,7 @@ RimGeoMechResultDefinition::RimGeoMechResultDefinition(void)
m_resultVariableUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName()); m_resultVariableUiField.uiCapability()->setUiEditorTypeName(caf::PdmUiListEditor::uiEditorTypeName());
m_resultVariableUiField.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP); m_resultVariableUiField.uiCapability()->setUiLabelPosition(caf::PdmUiItemInfo::TOP);
m_isChangedByField = false;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -122,6 +121,14 @@ void RimGeoMechResultDefinition::defineUiOrdering(QString uiConfigName, caf::Pdm
timeLapseGr->add(&m_timeLapseBaseTimestepUiField); timeLapseGr->add(&m_timeLapseBaseTimestepUiField);
} }
if (!m_isChangedByField)
{
m_resultPositionTypeUiField = m_resultPositionType;
m_resultVariableUiField = composeFieldCompString(m_resultFieldName(), m_resultComponentName());
}
m_isChangedByField = false;
uiOrdering.skipRemainingFields(true); uiOrdering.skipRemainingFields(true);
} }
@@ -187,6 +194,8 @@ void RimGeoMechResultDefinition::setGeoMechCase(RimGeoMechCase* geomCase)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue) void RimGeoMechResultDefinition::fieldChangedByUi(const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue)
{ {
m_isChangedByField = true;
if( &m_resultPositionTypeUiField == changedField if( &m_resultPositionTypeUiField == changedField
|| &m_isTimeLapseResultUiField == changedField || &m_isTimeLapseResultUiField == changedField
|| &m_timeLapseBaseTimestepUiField == changedField) || &m_timeLapseBaseTimestepUiField == changedField)

3
ApplicationCode/ProjectDataModel/RimGeoMechResultDefinition.h
View File

@@ -113,6 +113,7 @@ private:
caf::PdmField<bool> m_isTimeLapseResultUiField; caf::PdmField<bool> m_isTimeLapseResultUiField;
caf::PdmField<int> m_timeLapseBaseTimestepUiField; caf::PdmField<int> m_timeLapseBaseTimestepUiField;
caf::PdmPointer<RimGeoMechCase> m_geomCase; caf::PdmPointer<RimGeoMechCase> m_geomCase;
bool m_isChangedByField;
}; };