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

#282 Improved filter name for value selection

Browse Source
This commit is contained in:
Magne Sjaastad 2016-08-05 10:09:19 +02:00
parent eae6012b77
commit 8feac4289d
2 changed files with 33 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ApplicationCode/Commands/RicEclipsePropertyFilterInsertFeature.cpp
View File

@ -64,5 +64,6 @@ void RicEclipsePropertyFilterInsertFeature::onActionTriggered(bool isChecked)
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RicEclipsePropertyFilterInsertFeature::setupActionLook(QAction* actionToSetup) void RicEclipsePropertyFilterInsertFeature::setupActionLook(QAction* actionToSetup)
{ {
actionToSetup->setIcon(QIcon(":/CellFilter_Values.png"));
actionToSetup->setText("Insert Property Filter"); actionToSetup->setText("Insert Property Filter");
} }

38
ApplicationCode/ProjectDataModel/RimEclipsePropertyFilter.cpp
View File

@ -77,7 +77,7 @@ RimEclipsePropertyFilter::RimEclipsePropertyFilter()
CAF_PDM_InitFieldNoDefault(&m_selectedValues, "SelectedValues", "Values", "", "", ""); CAF_PDM_InitFieldNoDefault(&m_selectedValues, "SelectedValues", "Values", "", "", "");
CAF_PDM_InitField(&m_valueSelection, "Value Selection", true, "Value Selection", "", "", ""); CAF_PDM_InitField(&m_valueSelection, "ValueSelection", true, "Value Selection", "", "", "");
m_upperBound.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName()); m_upperBound.uiCapability()->setUiEditorTypeName(caf::PdmUiDoubleSliderEditor::uiEditorTypeName());
updateIconState(); updateIconState();
@ -382,12 +382,38 @@ void RimEclipsePropertyFilter::computeResultValueRange()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimEclipsePropertyFilter::updateFilterName() void RimEclipsePropertyFilter::updateFilterName()
{ {
QString newFiltername; QString newFiltername = resultDefinition->resultVariable() + " (";
newFiltername = resultDefinition->resultVariable() + " ("
+ QString::number(m_lowerBound()) + " .. " + QString::number(m_upperBound) + ")";
this->name = newFiltername;
uiCapability()->updateConnectedEditors(); if (isValueSelectionActive())
{
if (m_selectedValues().size() == m_uniqueCellValues.size())
{
newFiltername += QString::number(m_selectedValues()[0]);
newFiltername += "..";
newFiltername += QString::number(m_selectedValues()[m_selectedValues().size() - 1]);
}
else
{
for (size_t i = 0; i < m_selectedValues().size(); i++)
{
int val = m_selectedValues()[i];
newFiltername += QString::number(val);
if (i < m_selectedValues().size() - 1)
{
newFiltername += ", ";
}
}
}
newFiltername += ")";
}
else
{
newFiltername += QString::number(m_lowerBound) + " .. " + QString::number(m_upperBound) + ")";
}
this->name = newFiltername;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------