OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

#2625 Completion Type Legend : Update property editor categories

Browse Source
This commit is contained in:
Magne Sjaastad
2018-03-21 09:06:16 +01:00
parent 41d92832a7
commit 0f696b81fe
2 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
+11 -4
View File
@@ -389,12 +389,19 @@ void RimEclipsePropertyFilter::computeResultValueRange()
} }
else if (resultDefinition->resultVariable() == RiaDefines::completionTypeResultName()) else if (resultDefinition->resultVariable() == RiaDefines::completionTypeResultName())
{ {
std::vector<QString> ctNames; std::vector<std::pair<QString, int>> categoryNameAndValues;
for (QString ctName : caf::AppEnum<RiaDefines::CompletionType>::uiTexts())
{ {
ctNames.push_back(ctName); const std::vector<int>& visibleCatetories = results->uniqueCellScalarValues(resultDefinition->scalarResultIndex());
for (auto categoryValue : visibleCatetories)
{
if (caf::AppEnum<RiaDefines::CompletionType>::isValid(categoryValue))
{
auto text = caf::AppEnum<RiaDefines::CompletionType>::uiText(RiaDefines::CompletionType(categoryValue));
categoryNameAndValues.push_back(std::make_pair(text, categoryValue));
}
}
} }
setCategoryNames(ctNames); setCategoryNamesAndValues(categoryNameAndValues);
} }
else else
{ {
ApplicationCode/ProjectDataModel/RimEclipseView.cpp
+10 -2
View File
@@ -1360,7 +1360,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired()
{ {
std::vector<RimCellEdgeMetaData> metaData; std::vector<RimCellEdgeMetaData> metaData;
cellEdgeResult()->cellEdgeMetaData(&metaData); cellEdgeResult()->cellEdgeMetaData(&metaData);
for (const auto cellEdgeMeta : metaData) for (const auto& cellEdgeMeta : metaData)
{ {
if (cellEdgeMeta.m_resultVariable == RiaDefines::completionTypeResultName()) if (cellEdgeMeta.m_resultVariable == RiaDefines::completionTypeResultName())
{ {
@@ -1374,7 +1374,7 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired()
isDependingOnCompletionType = true; isDependingOnCompletionType = true;
} }
for (auto propFilter : m_propertyFilterCollection()->propertyFilters) for (const auto& propFilter : m_propertyFilterCollection()->propertyFilters)
{ {
if (propFilter->isActive() && propFilter->resultDefinition->resultVariable() == RiaDefines::completionTypeResultName()) if (propFilter->isActive() && propFilter->resultDefinition->resultVariable() == RiaDefines::completionTypeResultName())
{ {
@@ -1386,6 +1386,14 @@ void RimEclipseView::calculateCompletionTypeAndRedrawIfRequired()
{ {
this->loadDataAndUpdate(); this->loadDataAndUpdate();
} }
for (const auto& propFilter : m_propertyFilterCollection()->propertyFilters)
{
if (propFilter->isActive() && propFilter->resultDefinition->resultVariable() == RiaDefines::completionTypeResultName())
{
propFilter->updateConnectedEditors();
}
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------