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

Merge pull request #4950 from OPM/summary-curve-filter-recently-used-to-registry

Browse Source 
Summary curve filter recently used
This commit is contained in:
Magne Sjaastad
2019-10-30 11:12:59 +01:00
committed by GitHub
parent f7f3e72700 18c52b0e18
commit e4fd536d21
20 changed files with 314 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/Summary/RimCsvUserData.h
View File

@@ -20,7 +20,7 @@
#include "RimObservedSummaryData.h"
#include "../../Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h"
#include "SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeatureUi.h"
#include "cafPdmChildField.h"
#include "cafPdmField.h"

96
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveFilterCollection.cpp
View File

@@ -142,59 +142,71 @@ void RimEnsembleCurveFilterCollection::fieldChangedByUi( const caf::PdmFieldHand
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveFilterCollection::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
uiOrdering.add( &m_newFilterButton );
for ( auto& filter : m_filters )
RimEnsembleCurveSet* curveSet = nullptr;
this->firstAncestorOrThisOfType( curveSet );
if ( curveSet )
{
QString groupTitle;
auto selEnsembleParam = filter->selectedEnsembleParameter();
if ( selEnsembleParam.isNumeric() )
// Show the color control group
curveSet->appendColorGroup( uiOrdering );
}
{
caf::PdmUiGroup* group = uiOrdering.addNewGroup( "Filters" );
group->add( &m_newFilterButton );
for ( auto& filter : m_filters )
{
groupTitle = filter->ensembleParameterName();
QString groupTitle;
auto selEnsembleParam = filter->selectedEnsembleParameter();
if ( selEnsembleParam.isNumeric() )
{
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += QString( " [%2 .. %3]" )
.arg( QString::number( filter->minValue() ) )
.arg( QString::number( filter->maxValue() ) );
}
}
else if ( selEnsembleParam.isText() )
{
groupTitle = filter->ensembleParameterName();
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += " { ";
bool first = true;
for ( auto cat : filter->categories() )
if ( !filter->isActive() )
{
if ( !first ) groupTitle += ", ";
groupTitle += cat;
first = false;
groupTitle += " - [Disabled]";
}
groupTitle += " }";
if ( groupTitle.size() > 45 )
else
{
groupTitle = groupTitle.left( 40 ) + "... }";
groupTitle += QString( " [%2 .. %3]" )
.arg( QString::number( filter->minValue() ) )
.arg( QString::number( filter->maxValue() ) );
}
}
}
else if ( selEnsembleParam.isText() )
{
groupTitle = filter->ensembleParameterName();
caf::PdmUiGroup* filterGroup = uiOrdering.addNewGroupWithKeyword( groupTitle,
if ( !filter->isActive() )
{
groupTitle += " - [Disabled]";
}
else
{
groupTitle += " { ";
bool first = true;
for ( const auto& cat : filter->categories() )
{
if ( !first ) groupTitle += ", ";
groupTitle += cat;
first = false;
}
groupTitle += " }";
if ( groupTitle.size() > 45 )
{
groupTitle = groupTitle.left( 40 ) + "... }";
}
}
}
caf::PdmUiGroup* filterGroup = group->addNewGroupWithKeyword( groupTitle,
QString( "EnsembleFilter_" ) +
filter->filterId() );
filter->defineUiOrdering( uiConfigName, *filterGroup );
filter->defineUiOrdering( uiConfigName, *filterGroup );
}
}
uiOrdering.skipRemainingFields( true );

34
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.cpp
View File

@@ -639,19 +639,7 @@ void RimEnsembleCurveSet::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
curveDataGroup->add( &m_plotAxis );
}
caf::PdmUiGroup* colorsGroup = uiOrdering.addNewGroup( "Colors" );
m_colorMode.uiCapability()->setUiReadOnly( !m_yValuesSummaryCaseCollection() );
colorsGroup->add( &m_colorMode );
if ( m_colorMode == SINGLE_COLOR )
{
colorsGroup->add( &m_color );
}
else if ( m_colorMode == BY_ENSEMBLE_PARAM )
{
m_ensembleParameter.uiCapability()->setUiReadOnly( !m_yValuesSummaryCaseCollection() );
colorsGroup->add( &m_ensembleParameter );
}
appendColorGroup( uiOrdering );
{
caf::PdmUiGroup* nameGroup = uiOrdering.addNewGroup( "Curve Name" );
@@ -674,6 +662,26 @@ void RimEnsembleCurveSet::defineUiOrdering( QString uiConfigName, caf::PdmUiOrde
uiOrdering.skipRemainingFields( true );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimEnsembleCurveSet::appendColorGroup( caf::PdmUiOrdering& uiOrdering )
{
caf::PdmUiGroup* colorsGroup = uiOrdering.addNewGroup( "Colors" );
m_colorMode.uiCapability()->setUiReadOnly( !m_yValuesSummaryCaseCollection() );
colorsGroup->add( &m_colorMode );
if ( m_colorMode == SINGLE_COLOR )
{
colorsGroup->add( &m_color );
}
else if ( m_colorMode == BY_ENSEMBLE_PARAM )
{
m_ensembleParameter.uiCapability()->setUiReadOnly( !m_yValuesSummaryCaseCollection() );
colorsGroup->add( &m_ensembleParameter );
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

8
ApplicationCode/ProjectDataModel/Summary/RimEnsembleCurveSet.h
View File

@@ -125,6 +125,8 @@ public:
bool hasP90Data() const;
bool hasMeanData() const;
void appendColorGroup( caf::PdmUiOrdering& uiOrdering );
private:
void updateEnsembleCurves( const std::vector<RimSummaryCase*>& sumCases );
void updateStatisticsCurves( const std::vector<RimSummaryCase*>& sumCases );
@@ -138,6 +140,7 @@ private:
QList<caf::PdmOptionItemInfo> calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions,
bool* useOptionsOnly ) override;
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void defineUiTreeOrdering( caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "" ) override;
void fieldChangedByUi( const caf::PdmFieldHandle* changedField,
@@ -145,7 +148,7 @@ private:
const QVariant& newValue ) override;
void appendOptionItemsForSummaryAddresses( QList<caf::PdmOptionItemInfo>* options,
RimSummaryCaseCollection* summaryCaseGroup);
RimSummaryCaseCollection* summaryCaseGroup );
void updateCurveColors();
void updateQwtPlotAxis();
@@ -154,7 +157,6 @@ private:
QString createAutoName() const;
void updateLegendMappingMode();
void sortParameterVectorByBinnedVariation( std::vector<NameParameterPair>& parameterVector ) const;
private:
caf::PdmField<bool> m_showCurves;
@@ -190,5 +192,5 @@ private:
bool m_isCurveSetFiltered;
// Obsolete fields
caf::PdmChildField<RimSummaryFilter_OBSOLETE*> m_yValuesSummaryFilter_OBSOLETE;
caf::PdmChildField<RimSummaryFilter_OBSOLETE*> m_yValuesSummaryFilter_OBSOLETE;
};

25
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.cpp
View File

@@ -21,6 +21,7 @@
#include "RiaApplication.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
#include "RiaStringListSerializer.h"
#include "RiaSummaryCurveDefinition.h"
#include "RifSummaryReaderInterface.h"
@@ -384,14 +385,10 @@ void RimSummaryPlotFilterTextCurveSetEditor::fieldChangedByUi( const caf::PdmFie
m_curveFilterText = curveFilterTextWithoutOutdatedLabel();
{
if ( m_historyItems.indexOf( m_curveFilterText ) == -1 )
{
m_historyItems.push_front( m_curveFilterText );
while ( m_historyItems.size() > 10 )
{
m_historyItems.pop_back();
}
}
RiaStringListSerializer stringListSerializer( curveFilterRecentlyUsedRegistryKey() );
int maxItemCount = 10;
stringListSerializer.addString( m_curveFilterText, maxItemCount );
}
m_curveFilterText.uiCapability()->updateConnectedEditors();
@@ -485,7 +482,9 @@ QList<caf::PdmOptionItemInfo>
if ( fieldNeedingOptions == &m_curveFilterText )
{
for ( const auto& s : m_historyItems )
RiaStringListSerializer stringListSerializer( curveFilterRecentlyUsedRegistryKey() );
for ( const auto& s : stringListSerializer.textStrings() )
{
options.push_back( caf::PdmOptionItemInfo( s, s ) );
}
@@ -607,3 +606,11 @@ QString RimSummaryPlotFilterTextCurveSetEditor::curveFilterTextWithoutOutdatedLa
return filterText;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimSummaryPlotFilterTextCurveSetEditor::curveFilterRecentlyUsedRegistryKey()
{
return "curveFilterRecentlyUsedStrings";
}

4
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotFilterTextCurveSetEditor.h
View File

@@ -57,11 +57,13 @@ private:
std::vector<SummarySource*> selectedSummarySources() const;
QString curveFilterTextWithoutOutdatedLabel() const;
static QString curveFilterRecentlyUsedRegistryKey();
private:
caf::PdmPtrArrayField<SummarySource*> m_selectedSources;
caf::PdmField<QString> m_curveFilterLabelText;
caf::PdmField<QString> m_curveFilterText;
QStringList m_historyItems;
bool m_isFieldRecentlyChangedFromGui;
};