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

#6188 Analysis plots: improve handling of empty data selection

Browse Source
This commit is contained in:
Gaute Lindkvist
2020-07-30 14:03:50 +02:00
parent 1130fad55c
commit 2614852d8c
7 changed files with 22 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ApplicationCode/Application/RiaSummaryCurveDefinition.cpp
View File

@@ -200,8 +200,13 @@ bool RiaSummaryCurveDefinition::operator<( const RiaSummaryCurveDefinition& othe
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RiaSummaryCurveDefinitionAnalyser::RiaSummaryCurveDefinitionAnalyser( std::vector<RiaSummaryCurveDefinition> curveDefs ) void RiaSummaryCurveDefinitionAnalyser::setCurveDefinitions( const std::vector<RiaSummaryCurveDefinition>& curveDefs )
{ {
m_singleSummaryCases.clear();
m_ensembles.clear();
m_quantityNames.clear();
m_summaryItems.clear();
for ( const auto& curveDef : curveDefs ) for ( const auto& curveDef : curveDefs )
{ {
bool valid = false; bool valid = false;

3
ApplicationCode/Application/RiaSummaryCurveDefinition.h
View File

@@ -63,7 +63,8 @@ private:
class RiaSummaryCurveDefinitionAnalyser class RiaSummaryCurveDefinitionAnalyser
{ {
public: public:
RiaSummaryCurveDefinitionAnalyser( std::vector<RiaSummaryCurveDefinition> curveDefs ); RiaSummaryCurveDefinitionAnalyser() = default;
void setCurveDefinitions( const std::vector<RiaSummaryCurveDefinition>& curveDefs );
std::set<RimSummaryCase*> m_singleSummaryCases; // All summary cases used std::set<RimSummaryCase*> m_singleSummaryCases; // All summary cases used
std::set<RimSummaryCaseCollection*> m_ensembles; // All the ensembles referenced by the summary cases std::set<RimSummaryCaseCollection*> m_ensembles; // All the ensembles referenced by the summary cases

15
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@@ -488,7 +488,14 @@ void RimAnalysisPlot::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering
} }
} }
m_selectedVarsUiField = vectorNames; if ( !vectorNames.isEmpty() )
{
m_selectedVarsUiField = vectorNames;
}
else
{
m_selectedVarsUiField = "Select Data Sources -->";
}
caf::PdmUiGroup* timeStepGrp = uiOrdering.addNewGroup( "Time Steps" ); caf::PdmUiGroup* timeStepGrp = uiOrdering.addNewGroup( "Time Steps" );
timeStepGrp->add( &m_addTimestepUiField ); timeStepGrp->add( &m_addTimestepUiField );
@@ -1569,10 +1576,10 @@ RiaSummaryCurveDefinitionAnalyser* RimAnalysisPlot::getOrCreateSelectedCurveDefA
{ {
if ( !m_analyserOfSelectedCurveDefs ) if ( !m_analyserOfSelectedCurveDefs )
{ {
m_analyserOfSelectedCurveDefs = std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>( m_analyserOfSelectedCurveDefs =
new RiaSummaryCurveDefinitionAnalyser( this->curveDefinitionsWithoutEnsembleReference() ) ); std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>( new RiaSummaryCurveDefinitionAnalyser );
} }
m_analyserOfSelectedCurveDefs->setCurveDefinitions( this->curveDefinitionsWithoutEnsembleReference() );
return m_analyserOfSelectedCurveDefs.get(); return m_analyserOfSelectedCurveDefs.get();
} }

5
ApplicationCode/ProjectDataModel/CorrelationPlots/RimAbstractCorrelationPlot.cpp
View File

@@ -291,10 +291,11 @@ RiaSummaryCurveDefinitionAnalyser* RimAbstractCorrelationPlot::getOrCreateSelect
{ {
if ( !m_analyserOfSelectedCurveDefs ) if ( !m_analyserOfSelectedCurveDefs )
{ {
m_analyserOfSelectedCurveDefs = std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>( m_analyserOfSelectedCurveDefs =
new RiaSummaryCurveDefinitionAnalyser( this->curveDefinitions() ) ); std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>( new RiaSummaryCurveDefinitionAnalyser );
} }
m_analyserOfSelectedCurveDefs->setCurveDefinitions( this->curveDefinitions() );
return m_analyserOfSelectedCurveDefs.get(); return m_analyserOfSelectedCurveDefs.get();
} }

3
ApplicationCode/ProjectDataModel/CorrelationPlots/RimCorrelationMatrixPlot.cpp
View File

@@ -359,9 +359,6 @@ void RimCorrelationMatrixPlot::onLoadDataAndUpdate()
m_selectedVarsUiField = selectedVarsText(); m_selectedVarsUiField = selectedVarsText();
m_analyserOfSelectedCurveDefs = std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>(
new RiaSummaryCurveDefinitionAnalyser( this->curveDefinitions() ) );
if ( m_plotWidget ) if ( m_plotWidget )
{ {
m_plotWidget->detachItems( QwtPlotItem::Rtti_PlotBarChart ); m_plotWidget->detachItems( QwtPlotItem::Rtti_PlotBarChart );

3
ApplicationCode/ProjectDataModel/CorrelationPlots/RimCorrelationPlot.cpp
View File

@@ -197,9 +197,6 @@ void RimCorrelationPlot::onLoadDataAndUpdate()
{ {
updateMdiWindowVisibility(); updateMdiWindowVisibility();
m_analyserOfSelectedCurveDefs = std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>(
new RiaSummaryCurveDefinitionAnalyser( this->curveDefinitions() ) );
m_selectedVarsUiField = selectedVarsText(); m_selectedVarsUiField = selectedVarsText();
if ( m_plotWidget && m_analyserOfSelectedCurveDefs ) if ( m_plotWidget && m_analyserOfSelectedCurveDefs )

3
ApplicationCode/ProjectDataModel/CorrelationPlots/RimParameterResultCrossPlot.cpp
View File

@@ -161,9 +161,6 @@ void RimParameterResultCrossPlot::onLoadDataAndUpdate()
{ {
updateMdiWindowVisibility(); updateMdiWindowVisibility();
m_analyserOfSelectedCurveDefs = std::unique_ptr<RiaSummaryCurveDefinitionAnalyser>(
new RiaSummaryCurveDefinitionAnalyser( this->curveDefinitions() ) );
m_selectedVarsUiField = selectedVarsText(); m_selectedVarsUiField = selectedVarsText();
if ( m_plotWidget && m_analyserOfSelectedCurveDefs ) if ( m_plotWidget && m_analyserOfSelectedCurveDefs )