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

#5001 Improve filtering of measurement collection.

Browse Source
This commit is contained in:
Kristian Bendiksen
2019-11-25 19:48:11 +01:00
parent b4fea5f00a
commit ea7df94649
6 changed files with 66 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
ApplicationCode/ProjectDataModel/RimWellMeasurementCollection.cpp
View File

@@ -24,6 +24,7 @@
#include "cafCmdFeatureMenuBuilder.h"
#include "cafPdmUiTableViewEditor.h"
#include "cafPdmUiTreeOrdering.h"
#include "cafPdmUiTreeSelectionEditor.h"
CAF_PDM_SOURCE_INIT( RimWellMeasurementCollection, "WellMeasurements" );
@@ -38,6 +39,13 @@ RimWellMeasurementCollection::RimWellMeasurementCollection()
m_measurements.uiCapability()->setUiEditorTypeName( caf::PdmUiTableViewEditor::uiEditorTypeName() );
m_measurements.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::TOP );
m_measurements.uiCapability()->setCustomContextMenuEnabled( true );
CAF_PDM_InitFieldNoDefault( &m_measurementKinds, "MeasurementKinds", "Measurent Kinds", "", "", "" );
m_measurementKinds.uiCapability()->setAutoAddingOptionFromValue( false );
m_measurementKinds.uiCapability()->setUiEditorTypeName( caf::PdmUiTreeSelectionEditor::uiEditorTypeName() );
m_measurementKinds.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
m_measurementKinds.xmlCapability()->disableIO();
this->setName( "Well Measurements" );
}
@@ -177,7 +185,7 @@ void RimWellMeasurementCollection::fieldChangedByUi( const caf::PdmFieldHandle*
const QVariant& oldValue,
const QVariant& newValue )
{
if ( changedField == &m_isChecked )
if ( changedField == &m_isChecked || changedField == &m_measurementKinds )
{
RimProject* proj;
this->firstAncestorOrThisOfTypeAsserted( proj );
@@ -185,3 +193,33 @@ void RimWellMeasurementCollection::fieldChangedByUi( const caf::PdmFieldHandle*
this->updateAllReferringTracks();
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo>
RimWellMeasurementCollection::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly )
{
QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_measurementKinds )
{
std::set<QString> measurementKindsInData;
for ( auto measurement : measurements() )
{
measurementKindsInData.insert( measurement->kind() );
}
for ( auto measurementKind : measurementKindsInData )
{
options.push_back( caf::PdmOptionItemInfo( measurementKind, measurementKind ) );
}
}
return options;
}
std::vector<QString> RimWellMeasurementCollection::measurementKinds() const
{
return m_measurementKinds;
}