#1868 CellRangeFilter : Show correct label text when range filter is created

This commit is contained in:
Magne Sjaastad
2017-09-07 09:16:51 +02:00
parent beea898dc6
commit 3c107e6f9e

View File

@@ -203,11 +203,28 @@ void RimCellRangeFilter::defineEditorAttribute(const caf::PdmFieldHandle* field,
myAttr->m_minimum = 1; myAttr->m_minimum = 1;
myAttr->m_maximum = static_cast<int>(grid->cellCountK()); myAttr->m_maximum = static_cast<int>(grid->cellCountK());
} }
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
bool readOnlyState = isRangeFilterControlled();
std::vector<caf::PdmFieldHandle*> objFields;
this->fields(objFields);
for (size_t i = 0; i < objFields.size(); i ++)
{
objFields[i]->uiCapability()->setUiReadOnly(readOnlyState);
}
const cvf::StructGridInterface* grid = selectedGrid();
RimCase* rimCase = nullptr; RimCase* rimCase = nullptr;
this->firstAncestorOrThisOfTypeAsserted(rimCase); this->firstAncestorOrThisOfTypeAsserted(rimCase);
const cvf::StructGridInterface* mainGrid = RigReservoirGridTools::mainGrid(rimCase); const cvf::StructGridInterface* mainGrid = RigReservoirGridTools::mainGrid(rimCase);
RimView* rimView = nullptr; RimView* rimView = nullptr;
this->firstAncestorOrThisOfTypeAsserted(rimView); this->firstAncestorOrThisOfTypeAsserted(rimView);
RigActiveCellInfo* actCellInfo = RigReservoirGridTools::activeCellInfo(rimView); RigActiveCellInfo* actCellInfo = RigReservoirGridTools::activeCellInfo(rimView);
@@ -244,21 +261,6 @@ void RimCellRangeFilter::defineEditorAttribute(const caf::PdmFieldHandle* field,
} }
} }
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimCellRangeFilter::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
bool readOnlyState = isRangeFilterControlled();
std::vector<caf::PdmFieldHandle*> objFields;
this->fields(objFields);
for (size_t i = 0; i < objFields.size(); i ++)
{
objFields[i]->uiCapability()->setUiReadOnly(readOnlyState);
}
}
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------