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

Move files

Browse Source 
Fix includes
This commit is contained in:
Magne Sjaastad 2025-02-12 13:06:58 +01:00
parent ea9a1b7d85
commit 04cd253fc6
46 changed files with 606 additions and 329 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationLibCode/Application/RiaPreferencesSummary.cpp
View File

@ -18,7 +18,7 @@
#include "RiaPreferencesSummary.h"
#include "PlotTemplateCommands/RicSummaryPlotTemplateTools.h"
#include "Summary/RiaSummaryPlotTemplateTools.h"
#include "RiaApplication.h"
#include "RiaColorTables.h"

4
ApplicationLibCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@ -20,7 +20,7 @@
#include "ApplicationCommands/RicShowMainWindowFeature.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "SummaryPlotCommands/RicNewSummaryCurveFeature.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
@ -199,7 +199,7 @@ bool RiaImportEclipseCaseTools::openEclipseCasesFromFile( const QStringList& fil
if ( !candidateCases.empty() && RiaGuiApplication::isRunning() && RiuPlotMainWindow::instance()->isVisible() )
{
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( { candidateCases.front() }, {} );
RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( { candidateCases.front() }, {} );
RiuPlotMainWindowTools::setExpanded( candidateCases.front() );
}
}

6
ApplicationLibCode/Application/Tools/Summary/CMakeLists_files.cmake
View File

@ -6,6 +6,9 @@ set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryDefines.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryStringTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryPlotTools.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryPlotBuilder.h
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryPlotTemplateTools.h
)
set(SOURCE_GROUP_SOURCE_FILES
@ -16,6 +19,9 @@ set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryDefines.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryStringTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryPlotTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryPlotBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/RiaSummaryPlotTemplateTools.cpp
)
list(APPEND CODE_HEADER_FILES ${SOURCE_GROUP_HEADER_FILES})

194
ApplicationLibCode/Application/Tools/Summary/RiaSummaryPlotBuilder.cpp Normal file
View File

@ -0,0 +1,194 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RiaSummaryPlotBuilder.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiaSummaryPlotBuilder::RiaSummaryPlotBuilder()
: m_individualPlotPerDataSource( false )
, m_graphCurveGrouping( RiaSummaryPlotBuilder::RicGraphCurveGrouping::NONE )
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSummaryPlotBuilder::setDataSources( const std::vector<RimSummaryCase*>& summaryCases, const std::vector<RimSummaryEnsemble*>& ensembles )
{
m_summaryCases = summaryCases;
m_ensembles = ensembles;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSummaryPlotBuilder::setAddresses( const std::set<RifEclipseSummaryAddress>& addresses )
{
m_addresses = addresses;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSummaryPlotBuilder::setIndividualPlotPerDataSource( bool enable )
{
m_individualPlotPerDataSource = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiaSummaryPlotBuilder::setGrouping( RicGraphCurveGrouping groping )
{
m_graphCurveGrouping = groping;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryPlot*> RiaSummaryPlotBuilder::createPlots() const
{
std::vector<RimSummaryPlot*> plots;
if ( m_individualPlotPerDataSource )
{
if ( m_graphCurveGrouping == RicGraphCurveGrouping::SINGLE_CURVES )
{
for ( const auto& adr : m_addresses )
{
for ( auto summaryCase : m_summaryCases )
{
auto plot = RiaSummaryPlotTools::createPlot( { adr }, { summaryCase }, {} );
plots.push_back( plot );
}
for ( auto ensemble : m_ensembles )
{
auto plot = RiaSummaryPlotTools::createPlot( { adr }, {}, { ensemble } );
plots.push_back( plot );
}
}
}
else if ( m_graphCurveGrouping == RicGraphCurveGrouping::CURVES_FOR_OBJECT )
{
RiaSummaryAddressAnalyzer analyzer;
analyzer.appendAddresses( m_addresses );
auto groups = analyzer.addressesGroupedByObject();
for ( const auto& group : groups )
{
std::set<RifEclipseSummaryAddress> addresses;
addresses.insert( group.begin(), group.end() );
if ( addresses.empty() ) continue;
for ( auto summaryCase : m_summaryCases )
{
auto plot = RiaSummaryPlotTools::createPlot( addresses, { summaryCase }, {} );
plots.push_back( plot );
}
for ( auto ensemble : m_ensembles )
{
auto plot = RiaSummaryPlotTools::createPlot( addresses, {}, { ensemble } );
plots.push_back( plot );
}
}
}
else if ( m_graphCurveGrouping == RicGraphCurveGrouping::NONE )
{
for ( auto summaryCase : m_summaryCases )
{
auto plot = RiaSummaryPlotTools::createPlot( m_addresses, { summaryCase }, {} );
plots.push_back( plot );
}
for ( auto ensemble : m_ensembles )
{
auto plot = RiaSummaryPlotTools::createPlot( m_addresses, {}, { ensemble } );
plots.push_back( plot );
}
}
}
else // all data sources in same plot
{
if ( m_graphCurveGrouping == RicGraphCurveGrouping::SINGLE_CURVES )
{
for ( const auto& adr : m_addresses )
{
if ( !m_summaryCases.empty() )
{
auto plot = RiaSummaryPlotTools::createPlot( { adr }, m_summaryCases, {} );
plots.push_back( plot );
}
if ( !m_ensembles.empty() )
{
auto plot = RiaSummaryPlotTools::createPlot( { adr }, {}, m_ensembles );
plots.push_back( plot );
}
}
}
else if ( m_graphCurveGrouping == RicGraphCurveGrouping::CURVES_FOR_OBJECT )
{
RiaSummaryAddressAnalyzer analyzer;
analyzer.appendAddresses( m_addresses );
auto groups = analyzer.addressesGroupedByObject();
for ( const auto& group : groups )
{
std::set<RifEclipseSummaryAddress> addresses;
addresses.insert( group.begin(), group.end() );
if ( addresses.empty() ) continue;
if ( !m_summaryCases.empty() )
{
auto plot = RiaSummaryPlotTools::createPlot( addresses, m_summaryCases, {} );
plots.push_back( plot );
}
if ( !m_ensembles.empty() )
{
auto plot = RiaSummaryPlotTools::createPlot( addresses, {}, m_ensembles );
plots.push_back( plot );
}
}
}
else if ( m_graphCurveGrouping == RicGraphCurveGrouping::NONE )
{
if ( !m_summaryCases.empty() )
{
auto plot = RiaSummaryPlotTools::createPlot( m_addresses, m_summaryCases, {} );
plots.push_back( plot );
}
if ( !m_ensembles.empty() )
{
auto plot = RiaSummaryPlotTools::createPlot( m_addresses, {}, m_ensembles );
plots.push_back( plot );
}
}
}
return plots;
}

62
ApplicationLibCode/Application/Tools/Summary/RiaSummaryPlotBuilder.h Normal file
View File

@ -0,0 +1,62 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
class RifEclipseSummaryAddress;
class RimSummaryCase;
class RimSummaryEnsemble;
class RimSummaryPlot;
#include <set>
#include <vector>
//==================================================================================================
///
//==================================================================================================
class RiaSummaryPlotBuilder
{
public:
enum class RicGraphCurveGrouping
{
SINGLE_CURVES,
CURVES_FOR_OBJECT,
NONE
};
public:
RiaSummaryPlotBuilder();
void setDataSources( const std::vector<RimSummaryCase*>& summaryCases, const std::vector<RimSummaryEnsemble*>& ensembles );
void setAddresses( const std::set<RifEclipseSummaryAddress>& addresses );
void setIndividualPlotPerDataSource( bool enable );
void setGrouping( RicGraphCurveGrouping groping );
std::vector<RimSummaryPlot*> createPlots() const;
private:
std::set<RifEclipseSummaryAddress> m_addresses;
std::vector<RimSummaryCase*> m_summaryCases;
std::vector<RimSummaryEnsemble*> m_ensembles;
bool m_individualPlotPerDataSource;
RicGraphCurveGrouping m_graphCurveGrouping;
};

5
ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryPlotTemplateTools.cpp
View File

@ -16,7 +16,7 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicSummaryPlotTemplateTools.h"
#include "RiaSummaryPlotTemplateTools.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"
@ -24,8 +24,7 @@
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RicSelectPlotTemplateUi.h"
#include "PlotTemplateCommands/RicSelectPlotTemplateUi.h"
#include "RifSummaryReaderInterface.h"

0
ApplicationLibCode/Commands/PlotTemplateCommands/RicSummaryPlotTemplateTools.h → ApplicationLibCode/Application/Tools/Summary/RiaSummaryPlotTemplateTools.h
View File

241
ApplicationLibCode/Commands/PlotBuilderCommands/RicSummaryPlotBuilder.cpp → ApplicationLibCode/Application/Tools/Summary/RiaSummaryPlotTools.cpp
View File

@ -16,18 +16,14 @@
//
/////////////////////////////////////////////////////////////////////////////////
#include "RicSummaryPlotBuilder.h"
#include "RiaSummaryPlotTools.h"
#include "PlotTemplateCommands/RicSummaryPlotTemplateTools.h"
#include "SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
#include "RiaPreferencesSummary.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryTools.h"
#include "RiaSummaryPlotTemplateTools.h"
#include "RifEclipseSummaryAddress.h"
#include "RifReaderEclipseSummary.h"
#include "RifSummaryReaderInterface.h"
#include "RimEnsembleCurveSet.h"
@ -47,181 +43,13 @@
#include "RiuPlotMainWindowTools.h"
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RicSummaryPlotBuilder::RicSummaryPlotBuilder()
: m_individualPlotPerDataSource( false )
, m_graphCurveGrouping( RicSummaryPlotBuilder::RicGraphCurveGrouping::NONE )
namespace RiaSummaryPlotTools
{
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::setDataSources( const std::vector<RimSummaryCase*>& summaryCases, const std::vector<RimSummaryEnsemble*>& ensembles )
{
m_summaryCases = summaryCases;
m_ensembles = ensembles;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::setAddresses( const std::set<RifEclipseSummaryAddress>& addresses )
{
m_addresses = addresses;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::setIndividualPlotPerDataSource( bool enable )
{
m_individualPlotPerDataSource = enable;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::setGrouping( RicGraphCurveGrouping groping )
{
m_graphCurveGrouping = groping;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryPlot*> RicSummaryPlotBuilder::createPlots() const
{
std::vector<RimSummaryPlot*> plots;
if ( m_individualPlotPerDataSource )
{
if ( m_graphCurveGrouping == RicGraphCurveGrouping::SINGLE_CURVES )
{
for ( const auto& adr : m_addresses )
{
for ( auto summaryCase : m_summaryCases )
{
auto plot = createPlot( { adr }, { summaryCase }, {} );
plots.push_back( plot );
}
for ( auto ensemble : m_ensembles )
{
auto plot = createPlot( { adr }, {}, { ensemble } );
plots.push_back( plot );
}
}
}
else if ( m_graphCurveGrouping == RicGraphCurveGrouping::CURVES_FOR_OBJECT )
{
RiaSummaryAddressAnalyzer analyzer;
analyzer.appendAddresses( m_addresses );
auto groups = analyzer.addressesGroupedByObject();
for ( const auto& group : groups )
{
std::set<RifEclipseSummaryAddress> addresses;
addresses.insert( group.begin(), group.end() );
if ( addresses.empty() ) continue;
for ( auto summaryCase : m_summaryCases )
{
auto plot = createPlot( addresses, { summaryCase }, {} );
plots.push_back( plot );
}
for ( auto ensemble : m_ensembles )
{
auto plot = createPlot( addresses, {}, { ensemble } );
plots.push_back( plot );
}
}
}
else if ( m_graphCurveGrouping == RicGraphCurveGrouping::NONE )
{
for ( auto summaryCase : m_summaryCases )
{
auto plot = createPlot( m_addresses, { summaryCase }, {} );
plots.push_back( plot );
}
for ( auto ensemble : m_ensembles )
{
auto plot = createPlot( m_addresses, {}, { ensemble } );
plots.push_back( plot );
}
}
}
else // all data sources in same plot
{
if ( m_graphCurveGrouping == RicGraphCurveGrouping::SINGLE_CURVES )
{
for ( const auto& adr : m_addresses )
{
if ( !m_summaryCases.empty() )
{
auto plot = createPlot( { adr }, m_summaryCases, {} );
plots.push_back( plot );
}
if ( !m_ensembles.empty() )
{
auto plot = createPlot( { adr }, {}, m_ensembles );
plots.push_back( plot );
}
}
}
else if ( m_graphCurveGrouping == RicGraphCurveGrouping::CURVES_FOR_OBJECT )
{
RiaSummaryAddressAnalyzer analyzer;
analyzer.appendAddresses( m_addresses );
auto groups = analyzer.addressesGroupedByObject();
for ( const auto& group : groups )
{
std::set<RifEclipseSummaryAddress> addresses;
addresses.insert( group.begin(), group.end() );
if ( addresses.empty() ) continue;
if ( !m_summaryCases.empty() )
{
auto plot = createPlot( addresses, m_summaryCases, {} );
plots.push_back( plot );
}
if ( !m_ensembles.empty() )
{
auto plot = createPlot( addresses, {}, m_ensembles );
plots.push_back( plot );
}
}
}
else if ( m_graphCurveGrouping == RicGraphCurveGrouping::NONE )
{
if ( !m_summaryCases.empty() )
{
auto plot = createPlot( m_addresses, m_summaryCases, {} );
plots.push_back( plot );
}
if ( !m_ensembles.empty() )
{
auto plot = createPlot( m_addresses, {}, m_ensembles );
plots.push_back( plot );
}
}
}
return plots;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::set<RifEclipseSummaryAddress> RicSummaryPlotBuilder::addressesForSource( caf::PdmObject* summarySource )
std::set<RifEclipseSummaryAddress> addressesForSource( caf::PdmObject* summarySource )
{
auto ensemble = dynamic_cast<RimSummaryEnsemble*>( summarySource );
if ( ensemble )
@ -245,7 +73,7 @@ std::set<RifEclipseSummaryAddress> RicSummaryPlotBuilder::addressesForSource( ca
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSet* RicSummaryPlotBuilder::createCurveSet( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& addr )
RimEnsembleCurveSet* createCurveSet( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& addr )
{
auto curveSet = new RimEnsembleCurveSet();
@ -258,7 +86,7 @@ RimEnsembleCurveSet* RicSummaryPlotBuilder::createCurveSet( RimSummaryEnsemble*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurve* RicSummaryPlotBuilder::createCurve( RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& addr )
RimSummaryCurve* createCurve( RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& addr )
{
auto curve = new RimSummaryCurve();
@ -271,7 +99,7 @@ RimSummaryCurve* RicSummaryPlotBuilder::createCurve( RimSummaryCase* summaryCase
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimPlot*> RicSummaryPlotBuilder::duplicatePlots( const std::vector<RimPlot*>& sourcePlots )
std::vector<RimPlot*> duplicatePlots( const std::vector<RimPlot*>& sourcePlots )
{
std::vector<RimPlot*> plots;
@ -281,7 +109,7 @@ std::vector<RimPlot*> RicSummaryPlotBuilder::duplicatePlots( const std::vector<R
{
// TODO: Workaround for fixing the PdmPointer in RimEclipseResultDefinition
// caf::PdmPointer<RimEclipseCase> m_eclipseCase;
// This pdmpointer must be changed to a ptrField
// This PdmPointer must be changed to a ptrField
auto saturationPressurePlotOriginal = dynamic_cast<RimSaturationPressurePlot*>( plot );
auto saturationPressurePlotCopy = dynamic_cast<RimSaturationPressurePlot*>( copy );
@ -300,7 +128,7 @@ std::vector<RimPlot*> RicSummaryPlotBuilder::duplicatePlots( const std::vector<R
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryPlot*> RicSummaryPlotBuilder::duplicateSummaryPlots( const std::vector<RimSummaryPlot*>& sourcePlots )
std::vector<RimSummaryPlot*> duplicateSummaryPlots( const std::vector<RimSummaryPlot*>& sourcePlots )
{
std::vector<RimSummaryPlot*> plots;
@ -319,7 +147,7 @@ std::vector<RimSummaryPlot*> RicSummaryPlotBuilder::duplicateSummaryPlots( const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimMultiPlot* RicSummaryPlotBuilder::createAndAppendMultiPlot( const std::vector<RimPlot*>& plots )
RimMultiPlot* createAndAppendMultiPlot( const std::vector<RimPlot*>& plots )
{
RimMultiPlotCollection* plotCollection = RimMainPlotCollection::current()->multiPlotCollection();
@ -348,7 +176,7 @@ RimMultiPlot* RicSummaryPlotBuilder::createAndAppendMultiPlot( const std::vector
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( const std::vector<caf::PdmObjectHandle*>& objects )
RimSummaryMultiPlot* createAndAppendSummaryMultiPlot( const std::vector<caf::PdmObjectHandle*>& objects )
{
RimSummaryMultiPlotCollection* plotCollection = RimMainPlotCollection::current()->summaryMultiPlotCollection();
@ -379,7 +207,7 @@ RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::appendPlotsToMultiPlot( RimMultiPlot* multiPlot, const std::vector<RimPlot*>& plots )
void appendPlotsToMultiPlot( RimMultiPlot* multiPlot, const std::vector<RimPlot*>& plots )
{
for ( auto plot : plots )
{
@ -399,9 +227,9 @@ void RicSummaryPlotBuilder::appendPlotsToMultiPlot( RimMultiPlot* multiPlot, con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles,
bool skipCreationOfPlotBasedOnPreferences )
RimSummaryMultiPlot* createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles,
bool skipCreationOfPlotBasedOnPreferences )
{
RiaPreferencesSummary* prefs = RiaPreferencesSummary::current();
@ -476,7 +304,7 @@ RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPl
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlotNoAutoSettings( RimSummaryPlot* plot )
RimSummaryMultiPlot* createAndAppendSingleSummaryMultiPlotNoAutoSettings( RimSummaryPlot* plot )
{
auto* plotCollection = RimMainPlotCollection::current()->summaryMultiPlotCollection();
@ -513,7 +341,7 @@ RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( const std::vector<RimSummaryPlot*>& plots )
RimSummaryMultiPlot* createAndAppendSummaryMultiPlot( const std::vector<RimSummaryPlot*>& plots )
{
auto* plotCollection = RimMainPlotCollection::current()->summaryMultiPlotCollection();
@ -557,7 +385,7 @@ RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( con
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( RimSummaryPlot* plot )
RimSummaryMultiPlot* createAndAppendSingleSummaryMultiPlot( RimSummaryPlot* plot )
{
std::vector<RimSummaryPlot*> plots{ plot };
@ -567,7 +395,7 @@ RimSummaryMultiPlot* RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlo
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::appendPlotsToSummaryMultiPlot( RimSummaryMultiPlot* multiPlot, const std::vector<RimSummaryPlot*>& plots )
void appendPlotsToSummaryMultiPlot( RimSummaryMultiPlot* multiPlot, const std::vector<RimSummaryPlot*>& plots )
{
multiPlot->startBatchAddOperation();
for ( auto plot : plots )
@ -585,7 +413,7 @@ void RicSummaryPlotBuilder::appendPlotsToSummaryMultiPlot( RimSummaryMultiPlot*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlot* RicSummaryPlotBuilder::createPlot( const std::vector<RimSummaryCurve*>& summaryCurves )
RimSummaryPlot* createPlot( const std::vector<RimSummaryCurve*>& summaryCurves )
{
auto* plot = new RimSummaryPlot();
plot->enableAutoPlotTitle( true );
@ -603,9 +431,9 @@ RimSummaryPlot* RicSummaryPlotBuilder::createPlot( const std::vector<RimSummaryC
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlot* RicSummaryPlotBuilder::createPlot( const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
RimSummaryPlot* createPlot( const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
auto* plot = new RimSummaryPlot();
plot->enableAutoPlotTitle( true );
@ -620,9 +448,9 @@ RimSummaryPlot* RicSummaryPlotBuilder::createPlot( const std::set<RifEclipseSumm
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlot* RicSummaryPlotBuilder::createCrossPlot( const std::vector<RiaSummaryCurveAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
RimSummaryPlot* createCrossPlot( const std::vector<RiaSummaryCurveAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
auto* summaryPlot = new RimSummaryPlot();
summaryPlot->enableAutoPlotTitle( true );
@ -655,10 +483,10 @@ RimSummaryPlot* RicSummaryPlotBuilder::createCrossPlot( const std::vector<RiaSum
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RicSummaryPlotBuilder::appendCurvesToPlot( RimSummaryPlot* summaryPlot,
const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
void appendCurvesToPlot( RimSummaryPlot* summaryPlot,
const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles )
{
for ( const auto& addr : addresses )
{
@ -680,9 +508,7 @@ void RicSummaryPlotBuilder::appendCurvesToPlot( RimSummaryPlot*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimEnsembleCurveSet* RicSummaryPlotBuilder::addNewEnsembleCurve( RimSummaryPlot* summaryPlot,
const RiaSummaryCurveAddress& curveAddress,
RimSummaryEnsemble* ensemble )
RimEnsembleCurveSet* addNewEnsembleCurve( RimSummaryPlot* summaryPlot, const RiaSummaryCurveAddress& curveAddress, RimSummaryEnsemble* ensemble )
{
auto* curveSet = new RimEnsembleCurveSet();
@ -712,9 +538,7 @@ RimEnsembleCurveSet* RicSummaryPlotBuilder::addNewEnsembleCurve( RimSummaryPlot*
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryCurve* RicSummaryPlotBuilder::addNewSummaryCurve( RimSummaryPlot* summaryPlot,
const RiaSummaryCurveAddress& curveAddress,
RimSummaryCase* summaryCase )
RimSummaryCurve* addNewSummaryCurve( RimSummaryPlot* summaryPlot, const RiaSummaryCurveAddress& curveAddress, RimSummaryCase* summaryCase )
{
auto curve = new RimSummaryCurve();
@ -737,3 +561,4 @@ RimSummaryCurve* RicSummaryPlotBuilder::addNewSummaryCurve( RimSummaryPlot*
return curve;
}
} // namespace RiaSummaryPlotTools

88
ApplicationLibCode/Application/Tools/Summary/RiaSummaryPlotTools.h Normal file
View File

@ -0,0 +1,88 @@
////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2021- Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#pragma once
class RimPlot;
class RimMultiPlot;
class RifEclipseSummaryAddress;
class RimSummaryCase;
class RimSummaryEnsemble;
class RimSummaryPlot;
class RimEnsembleCurveSet;
class RimSummaryCurve;
class RimSummaryMultiPlot;
class RiaSummaryCurveAddress;
namespace caf
{
class PdmObject;
class PdmObjectHandle;
} // namespace caf
#include <set>
#include <vector>
//==================================================================================================
///
//==================================================================================================
namespace RiaSummaryPlotTools
{
std::set<RifEclipseSummaryAddress> addressesForSource( caf::PdmObject* summarySource );
RimEnsembleCurveSet* createCurveSet( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& addr );
RimSummaryCurve* createCurve( RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& addr );
std::vector<RimPlot*> duplicatePlots( const std::vector<RimPlot*>& plots );
std::vector<RimSummaryPlot*> duplicateSummaryPlots( const std::vector<RimSummaryPlot*>& plots );
RimMultiPlot* createAndAppendMultiPlot( const std::vector<RimPlot*>& plots );
void appendPlotsToMultiPlot( RimMultiPlot* multiPlot, const std::vector<RimPlot*>& plots );
RimSummaryMultiPlot* createAndAppendDefaultSummaryMultiPlot( const std::vector<RimSummaryCase*>& cases,
const std::vector<RimSummaryEnsemble*>& ensembles,
bool skipCreationOfPlotBasedOnPreferences = true );
RimSummaryMultiPlot* createAndAppendSingleSummaryMultiPlotNoAutoSettings( RimSummaryPlot* plot );
RimSummaryMultiPlot* createAndAppendSingleSummaryMultiPlot( RimSummaryPlot* plot );
RimSummaryMultiPlot* createAndAppendSummaryMultiPlot( const std::vector<RimSummaryPlot*>& plots );
RimSummaryMultiPlot* createAndAppendSummaryMultiPlot( const std::vector<caf::PdmObjectHandle*>& objects );
void appendPlotsToSummaryMultiPlot( RimSummaryMultiPlot* multiPlot, const std::vector<RimSummaryPlot*>& plots );
RimSummaryPlot* createPlot( const std::vector<RimSummaryCurve*>& summaryCurves );
RimSummaryPlot* createPlot( const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles );
RimSummaryPlot* createCrossPlot( const std::vector<RiaSummaryCurveAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles );
void appendCurvesToPlot( RimSummaryPlot* summaryPlot,
const std::set<RifEclipseSummaryAddress>& addresses,
const std::vector<RimSummaryCase*>& summaryCases,
const std::vector<RimSummaryEnsemble*>& ensembles );
RimEnsembleCurveSet*
addNewEnsembleCurve( RimSummaryPlot* summaryPlot, const RiaSummaryCurveAddress& curveAddress, RimSummaryEnsemble* ensemble );
RimSummaryCurve* addNewSummaryCurve( RimSummaryPlot* summaryPlot, const RiaSummaryCurveAddress& curveAddress, RimSummaryCase* summaryCase );
}; // namespace RiaSummaryPlotTools

7
ApplicationLibCode/Commands/FlowCommands/RicPlotProductionRateFeature.cpp
View File

@ -19,8 +19,8 @@
#include "RicPlotProductionRateFeature.h"
#include "RiaGuiApplication.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifEclipseSummaryAddress.h"
#include "RifSummaryReaderInterface.h"
@ -40,7 +40,6 @@
#include "RimSummaryCurveAppearanceCalculator.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryPlot.h"
#include "Summary/RiaSummaryTools.h"
#include "RiuPlotMainWindow.h"
@ -101,7 +100,7 @@ void RicPlotProductionRateFeature::onActionTriggered( bool isChecked )
description += well->name();
RimSummaryPlot* plot = new RimSummaryPlot();
plot->setUiName( description );
RimSummaryMultiPlot* multiPlot = RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( plot );
RimSummaryMultiPlot* multiPlot = RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( plot );
if ( RimSimWellInViewTools::isInjector( well ) )
{

2
ApplicationLibCode/Commands/PlotBuilderCommands/CMakeLists_files.cmake
View File

@ -1,6 +1,5 @@
set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RicNewMultiPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotBuilder.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryMultiPlotFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryPlotFromDataVectorFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryMultiPlotFromDataVectorFeature.h
@ -17,7 +16,6 @@ set(SOURCE_GROUP_HEADER_FILES
set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicNewMultiPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotBuilder.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryMultiPlotFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryPlotFromDataVectorFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicNewSummaryMultiPlotFromDataVectorFeature.cpp

5
ApplicationLibCode/Commands/PlotBuilderCommands/RicAppendSummaryPlotsForObjectsFeature.cpp
View File

@ -24,10 +24,9 @@
#include "RiaStdStringTools.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryAddressModifier.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicSummaryPlotBuilder.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryCase.h"
@ -74,7 +73,7 @@ void RicAppendSummaryPlotsForObjectsFeature::appendPlots( RimSummaryMultiPlot*
for ( auto summaryAdrCollection : sumAddressCollections )
{
auto duplicatedPlots = RicSummaryPlotBuilder::duplicateSummaryPlots( plotsForOneInstance );
auto duplicatedPlots = RiaSummaryPlotTools::duplicateSummaryPlots( plotsForOneInstance );
for ( auto duplicatedPlot : duplicatedPlots )
{

10
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewEmptySummaryMultiPlotFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicNewEmptySummaryMultiPlotFeature.h"
#include "RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
@ -27,8 +27,6 @@
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
#include "RicSummaryPlotBuilder.h"
#include "cafSelectionManager.h"
#include "cvfAssert.h"
@ -45,9 +43,9 @@ void RicNewEmptySummaryMultiPlotFeature::onActionTriggered( bool isChecked )
std::vector<RimSummaryEnsemble*> selectedEnsembles;
bool skipCreationOfPlotBasedOnPreferences = false;
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( selectedIndividualSummaryCases,
selectedEnsembles,
skipCreationOfPlotBasedOnPreferences );
RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( selectedIndividualSummaryCases,
selectedEnsembles,
skipCreationOfPlotBasedOnPreferences );
}
//--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewMultiPlotFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicNewMultiPlotFeature.h"
#include "RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RimPlot.h"
#include "RimWellLogTrack.h"
@ -54,9 +54,9 @@ caf::PdmScriptResponse RicNewMultiPlotFeature::execute()
plots.push_back( reinterpret_cast<RimPlot*>( ptr ) );
}
auto copyOfPlots = RicSummaryPlotBuilder::duplicatePlots( plots );
auto copyOfPlots = RiaSummaryPlotTools::duplicatePlots( plots );
RicSummaryPlotBuilder::createAndAppendMultiPlot( copyOfPlots );
RiaSummaryPlotTools::createAndAppendMultiPlot( copyOfPlots );
}
return caf::PdmScriptResponse();

10
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryMultiPlotFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicNewSummaryMultiPlotFeature.h"
#include "RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
@ -27,8 +27,6 @@
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
#include "RicSummaryPlotBuilder.h"
#include "cafSelectionManager.h"
#include "cvfAssert.h"
@ -80,9 +78,9 @@ void RicNewSummaryMultiPlotFeature::onActionTriggered( bool isChecked )
}
bool skipCreationOfPlotBasedOnPreferences = false;
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( selectedIndividualSummaryCases,
selectedEnsembles,
skipCreationOfPlotBasedOnPreferences );
RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( selectedIndividualSummaryCases,
selectedEnsembles,
skipCreationOfPlotBasedOnPreferences );
}
//--------------------------------------------------------------------------------------------------

7
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryMultiPlotFromDataVectorFeature.cpp
View File

@ -19,6 +19,7 @@
#include "RicNewSummaryMultiPlotFromDataVectorFeature.h"
#include "RiaPreferencesSummary.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimSummaryAddress.h"
@ -26,8 +27,6 @@
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "RicSummaryPlotBuilder.h"
#include "RifEclipseSummaryAddress.h"
#include "RifReaderEclipseSummary.h"
@ -132,11 +131,11 @@ void RicNewSummaryMultiPlotFromDataVectorFeature::onActionTriggered( bool isChec
}
}
auto newPlot = RicSummaryPlotBuilder::createPlot( eclipseAddresses, selectedCases, selectedEnsembles );
auto newPlot = RiaSummaryPlotTools::createPlot( eclipseAddresses, selectedCases, selectedEnsembles );
std::vector<RimSummaryPlot*> plots{ newPlot };
RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( plots );
RiaSummaryPlotTools::createAndAppendSummaryMultiPlot( plots );
}
//--------------------------------------------------------------------------------------------------

8
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryPlotFromCurveFeature.cpp
View File

@ -18,11 +18,11 @@
#include "RicNewSummaryPlotFromCurveFeature.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RimSummaryCurve.h"
#include "RimSummaryPlot.h"
#include "RicSummaryPlotBuilder.h"
#include <QAction>
#include <QVariant>
@ -41,11 +41,11 @@ void RicNewSummaryPlotFromCurveFeature::onActionTriggered( bool isChecked )
auto curveCopy = curve->copyObject<RimSummaryCurve>();
curveCopy->setShowInLegend( true );
RimSummaryPlot* plot = RicSummaryPlotBuilder::createPlot( { curveCopy } );
RimSummaryPlot* plot = RiaSummaryPlotTools::createPlot( { curveCopy } );
std::vector<RimSummaryPlot*> plots = { plot };
RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( plots );
RiaSummaryPlotTools::createAndAppendSummaryMultiPlot( plots );
}
}

10
ApplicationLibCode/Commands/PlotBuilderCommands/RicNewSummaryPlotFromDataVectorFeature.cpp
View File

@ -18,11 +18,11 @@
#include "RicNewSummaryPlotFromDataVectorFeature.h"
#include "RimSummaryAddress.h"
#include "RimSummaryPlot.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicSummaryPlotBuilder.h"
#include "RimSummaryAddress.h"
#include "RimSummaryPlot.h"
#include "RifEclipseSummaryAddress.h"
@ -99,8 +99,8 @@ void RicNewSummaryPlotFromDataVectorFeature::onActionTriggered( bool isChecked )
}
}
auto newPlot = RicSummaryPlotBuilder::createPlot( eclipseAddresses, selectedCases, selectedEnsembles );
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( newPlot );
auto newPlot = RiaSummaryPlotTools::createPlot( eclipseAddresses, selectedCases, selectedEnsembles );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( newPlot );
}
//--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/Commands/PlotBuilderCommands/RicSplitMultiPlotFeature.cpp
View File

@ -18,7 +18,7 @@
#include "RicSplitMultiPlotFeature.h"
#include "RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RimEnsembleCurveSet.h"
#include "RimSummaryAddress.h"
@ -26,8 +26,6 @@
#include "RimSummaryCurve.h"
#include "RimSummaryPlot.h"
#include "RicSummaryPlotBuilder.h"
#include "cafSelectionManager.h"
#include "cvfAssert.h"
@ -73,7 +71,7 @@ void RicSplitMultiPlotFeature::onActionTriggered( bool isChecked )
objects.push_back( addr );
}
RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( objects );
RiaSummaryPlotTools::createAndAppendSummaryMultiPlot( objects );
for ( auto object : objects )
delete object;

4
ApplicationLibCode/Commands/PlotBuilderCommands/RicSummaryPlotBuilder.h
View File

@ -41,7 +41,7 @@ class PdmObjectHandle;
//==================================================================================================
///
//==================================================================================================
class RicSummaryPlotBuilder
class RiaSummaryPlotBuilder
{
public:
enum class RicGraphCurveGrouping
@ -52,7 +52,7 @@ public:
};
public:
RicSummaryPlotBuilder();
RiaSummaryPlotBuilder();
void setDataSources( const std::vector<RimSummaryCase*>& summaryCases, const std::vector<RimSummaryEnsemble*>& ensembles );

2
ApplicationLibCode/Commands/PlotTemplateCommands/CMakeLists_files.cmake
View File

@ -1,6 +1,5 @@
set(SOURCE_GROUP_HEADER_FILES
${CMAKE_CURRENT_LIST_DIR}/RicSelectPlotTemplateUi.h
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotTemplateTools.h
${CMAKE_CURRENT_LIST_DIR}/RicReloadPlotTemplatesFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateByShortcutFeature.h
${CMAKE_CURRENT_LIST_DIR}/RicSaveMultiPlotTemplateFeature.h
@ -15,7 +14,6 @@ set(SOURCE_GROUP_HEADER_FILES
set(SOURCE_GROUP_SOURCE_FILES
${CMAKE_CURRENT_LIST_DIR}/RicSelectPlotTemplateUi.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSummaryPlotTemplateTools.cpp
${CMAKE_CURRENT_LIST_DIR}/RicReloadPlotTemplatesFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicCreatePlotFromTemplateByShortcutFeature.cpp
${CMAKE_CURRENT_LIST_DIR}/RicSaveMultiPlotTemplateFeature.cpp

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicCreateMultiPlotFromSelectionFeature.cpp
View File

@ -18,8 +18,8 @@
#include "RicCreateMultiPlotFromSelectionFeature.h"
#include "RicSummaryPlotTemplateTools.h"
#include "RimSummaryMultiPlot.h"
#include "Summary/RiaSummaryPlotTemplateTools.h"
#include "RiuPlotMainWindowTools.h"

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicCreateNewPlotFromTemplateFeature.cpp
View File

@ -24,7 +24,7 @@
#include "RiaPreferences.h"
#include "RicSelectCaseOrEnsembleUi.h"
#include "RicSummaryPlotTemplateTools.h"
#include "Summary/RiaSummaryPlotTemplateTools.h"
#include "RimSummaryCase.h"
#include "RimSummaryEnsemble.h"

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicCreatePlotFromTemplateByShortcutFeature.cpp
View File

@ -21,7 +21,7 @@
#include "RiaGuiApplication.h"
#include "RiaPreferences.h"
#include "RicSummaryPlotTemplateTools.h"
#include "Summary/RiaSummaryPlotTemplateTools.h"
#include "RimSummaryMultiPlot.h"

2
ApplicationLibCode/Commands/PlotTemplateCommands/RicSaveMultiPlotTemplateFeature.cpp
View File

@ -20,7 +20,7 @@
#include "RicReloadPlotTemplatesFeature.h"
#include "RicSaveMultiPlotTemplateFeatureSettings.h"
#include "RicSummaryPlotTemplateTools.h"
#include "Summary/RiaSummaryPlotTemplateTools.h"
#include "RiaGuiApplication.h"
#include "RiaLogging.h"

4
ApplicationLibCode/Commands/RicImportEnsembleFeature.cpp
View File

@ -24,6 +24,7 @@
#include "RiaPreferences.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryDefines.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RicCreateSummaryCaseCollectionFeature.h"
@ -43,7 +44,6 @@
#include "RiuMainWindow.h"
#include "RiuPlotMainWindow.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h"
#include <QAction>
@ -128,7 +128,7 @@ void RicImportEnsembleFeature::importSingleEnsemble( const QStringList&
summaryCase->updateAutoShortName();
}
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );
RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );
}
std::vector<RimCase*> allCases = RiaApplication::instance()->project()->allGridCases();

6
ApplicationLibCode/Commands/RicImportSummaryCasesFeature.cpp
View File

@ -19,6 +19,7 @@
#include "RicImportSummaryCasesFeature.h"
#include "Summary/RiaSummaryDefines.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "SummaryPlotCommands/RicNewSummaryCurveFeature.h"
#include "RiaGuiApplication.h"
@ -43,7 +44,6 @@
#include "RiuPlotMainWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
@ -83,7 +83,7 @@ void RicImportSummaryCasesFeature::onActionTriggered( bool isChecked )
{
for ( auto sumcase : cases )
{
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( { sumcase }, {} );
RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( { sumcase }, {} );
}
}
@ -133,7 +133,7 @@ std::pair<bool, std::vector<RimSummaryCase*>> RicImportSummaryCasesFeature::crea
RimSummaryMultiPlot* plotToSelect = nullptr;
for ( auto sumCase : cases )
{
plotToSelect = RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( { sumCase }, {} );
plotToSelect = RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( { sumCase }, {} );
}
if ( plotToSelect )

7
ApplicationLibCode/Commands/SummaryPlotCommands/RicCreateCrossPlotFeature.cpp
View File

@ -18,10 +18,9 @@
#include "RicCreateCrossPlotFeature.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RiaPreferencesSummary.h"
#include "Summary/RiaSummaryCurveAddress.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RifEclipseSummaryAddress.h"
@ -112,9 +111,9 @@ void RicCreateCrossPlotFeature::onSubMenuActionTriggered( bool isChecked )
auto selectedCases = caf::firstAncestorOfTypeFromSelectedObject<RimSummaryCase>();
auto selectedEnsembles = caf::firstAncestorOfTypeFromSelectedObject<RimSummaryEnsemble>();
auto newPlot = RicSummaryPlotBuilder::createCrossPlot( { curveAddress }, { selectedCases }, { selectedEnsembles } );
auto newPlot = RiaSummaryPlotTools::createCrossPlot( { curveAddress }, { selectedCases }, { selectedEnsembles } );
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( newPlot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( newPlot );
}
//--------------------------------------------------------------------------------------------------

6
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewDefaultSummaryPlotFeature.cpp
View File

@ -18,9 +18,9 @@
#include "RicNewDefaultSummaryPlotFeature.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RicEditSummaryPlotFeature.h"
#include "RicNewSummaryCurveFeature.h"
#include "RicNewSummaryEnsembleCurveSetFeature.h"
@ -85,7 +85,7 @@ RimSummaryPlot* RicNewDefaultSummaryPlotFeature::createFromSummaryCases( const s
newPlot->applyDefaultCurveAppearances();
newPlot->loadDataAndUpdate();
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( newPlot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( newPlot );
return newPlot;
}
@ -131,7 +131,7 @@ void RicNewDefaultSummaryPlotFeature::onActionTriggered( bool isChecked )
{
RimSummaryPlot* plot = new RimSummaryPlot();
plot->enableAutoPlotTitle( true );
RicSummaryPlotBuilder::appendPlotsToSummaryMultiPlot( multiPlot, { plot } );
RiaSummaryPlotTools::appendPlotsToSummaryMultiPlot( multiPlot, { plot } );
return;
}

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
View File

@ -19,11 +19,11 @@
#include "RicNewGridTimeHistoryCurveFeature.h"
#include "RiaGuiApplication.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RigFemResultAddress.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RicNewSummaryCurveFeature.h"
#include "RicSelectSummaryPlotUI.h"
#include "RicWellLogTools.h"
@ -117,7 +117,7 @@ RimSummaryPlot* RicNewGridTimeHistoryCurveFeature::userSelectedSummaryPlot()
{
RimSummaryPlot* plot = new RimSummaryPlot();
plot->setUiName( featureUi.newPlotName() );
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( plot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( plot );
plot->loadDataAndUpdate();
summaryPlot = plot;

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryCrossPlotCurveFeature.cpp
View File

@ -19,6 +19,7 @@
#include "RicNewSummaryCrossPlotCurveFeature.h"
#include "RiaGuiApplication.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
@ -32,7 +33,6 @@
#include "RiuPlotMainWindow.h"
#include "RiuPlotMainWindowTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
#include "cafSelectionManager.h"
@ -68,7 +68,7 @@ void RicNewSummaryCrossPlotCurveFeature::onActionTriggered( bool isChecked )
}
RiaSummaryCurveAddress addr( RifEclipseSummaryAddress::fieldAddress( "FOPT" ), RifEclipseSummaryAddress::fieldAddress( "FGOR" ) );
auto newCurve = RicSummaryPlotBuilder::addNewSummaryCurve( plot, addr, defaultCase );
auto newCurve = RiaSummaryPlotTools::addNewSummaryCurve( plot, addr, defaultCase );
newCurve->setColor( curveColor );
newCurve->loadDataAndUpdate( true );

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.cpp
View File

@ -22,6 +22,7 @@
#include "RiaGuiApplication.h"
#include "RiaPreferencesSummary.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RimEnsembleCurveFilter.h"
@ -42,7 +43,6 @@
#include "RiuPlotMainWindow.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "WellLogCommands/RicWellLogPlotCurveFeatureImpl.h"
#include "cafSelectionManager.h"
@ -114,7 +114,7 @@ RimSummaryPlot* RicNewSummaryEnsembleCurveSetFeature::createPlotForCurveSetsAndU
RimSummaryPlot* plot = new RimSummaryPlot();
plot->enableAutoPlotTitle( true );
RimSummaryMultiPlot* multiPlot = RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( plot );
RimSummaryMultiPlot* multiPlot = RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( plot );
RimEnsembleCurveSet* firstCurveSetCreated = nullptr;
for ( RimSummaryEnsemble* ensemble : ensembles )

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteAsciiDataToSummaryPlotFeature.cpp
View File

@ -19,8 +19,8 @@
#include "RicPasteAsciiDataToSummaryPlotFeature.h"
#include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RicPasteAsciiDataToSummaryPlotFeatureUi.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RiaLogging.h"
@ -91,7 +91,7 @@ void RicPasteAsciiDataToSummaryPlotFeature::onActionTriggered( bool isChecked )
summaryPlot = new RimSummaryPlot();
summaryPlot->enableAutoPlotTitle( true );
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( summaryPlot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( summaryPlot );
}
caf::PdmSettings::writeFieldsToApplicationStore( &pasteOptions, pasteOptions.contextString() );

4
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteSummaryMultiPlotFeature.cpp
View File

@ -18,12 +18,12 @@
#include "RicPasteSummaryMultiPlotFeature.h"
#include "Summary/RiaSummaryTools.h"
#include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RimSummaryMultiPlot.h"
#include "RimSummaryMultiPlotCollection.h"
#include "Summary/RiaSummaryTools.h"
#include "cafPdmDefaultObjectFactory.h"
#include "cafPdmObjectGroup.h"

6
ApplicationLibCode/Commands/SummaryPlotCommands/RicPasteSummaryPlotFeature.cpp
View File

@ -19,7 +19,7 @@
#include "RicPasteSummaryPlotFeature.h"
#include "OperationsUsingObjReferences/RicPasteFeatureImpl.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RimMultiPlot.h"
#include "RimSummaryPlot.h"
@ -45,8 +45,8 @@ void RicPasteSummaryPlotFeature::copyPlotAndAddToCollection( RimSummaryPlot* sou
auto multiPlot = caf::firstAncestorOfTypeFromSelectedObject<RimMultiPlot>();
if ( multiPlot )
{
auto plots = RicSummaryPlotBuilder::duplicatePlots( { sourcePlot } );
RicSummaryPlotBuilder::appendPlotsToMultiPlot( multiPlot, plots );
auto plots = RiaSummaryPlotTools::duplicatePlots( { sourcePlot } );
RiaSummaryPlotTools::appendPlotsToMultiPlot( multiPlot, plots );
multiPlot->loadDataAndUpdate();

5
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotEditorUi.cpp
View File

@ -22,6 +22,7 @@
#include "RiaCurveSetDefinition.h"
#include "RiaGuiApplication.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RiuSummaryCurveDefinitionKeywords.h"
@ -50,8 +51,6 @@
#include "RiuSummaryVectorSelectionUi.h"
#include "RiuTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "cafPdmUiComboBoxEditor.h"
#include "cafPdmUiPushButtonEditor.h"
@ -843,7 +842,7 @@ void RicSummaryPlotEditorUi::createNewPlot()
if ( !m_plotContainer )
{
std::vector<RimSummaryPlot*> plots;
m_plotContainer = RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( plots );
m_plotContainer = RiaSummaryPlotTools::createAndAppendSummaryMultiPlot( plots );
}
if ( m_plotContainer )

10
ApplicationLibCode/Commands/SummaryPlotCommands/RicSummaryPlotFeatureImpl.cpp
View File

@ -27,9 +27,9 @@
#include "RiaLogging.h"
#include "RiaPreferencesSummary.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryStringTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RicCreateSummaryCaseCollectionFeature.h"
#include "RicImportGeneralDataFeature.h"
#include "RicImportSummaryCasesFeature.h"
@ -342,7 +342,7 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
newPlot->setNormalizationEnabled( isNormalizedY );
newPlot->loadDataAndUpdate();
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( newPlot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( newPlot );
}
else // Multiple plots, one for each separate summary address, put them all in a summary multiplot
{
@ -362,7 +362,7 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
summaryPlot->loadDataAndUpdate();
}
RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( summaryPlots );
RiaSummaryPlotTools::createAndAppendSummaryMultiPlot( summaryPlots );
}
}
@ -430,7 +430,7 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
newPlot->loadDataAndUpdate();
lastPlotCreated = newPlot;
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( newPlot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( newPlot );
}
}
else // Multiplot
@ -484,7 +484,7 @@ void RicSummaryPlotFeatureImpl::createSummaryPlotsFromArgumentLine( const QStrin
newPlot->loadDataAndUpdate();
lastPlotCreated = newPlot;
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( newPlot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( newPlot );
}
}
}

2
ApplicationLibCode/Commands/Sumo/RicCreateSumoEnsembleFeature.cpp
View File

@ -20,8 +20,6 @@
#include "RiaDefines.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "Cloud/RimCloudDataSourceCollection.h"
#include "Sumo/RimSummarySumoDataSource.h"

5
ApplicationLibCode/ProjectDataModel/Cloud/RimCloudDataSourceCollection.cpp
View File

@ -19,10 +19,9 @@
#include "RimCloudDataSourceCollection.h"
#include "RiaApplication.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSummaryCaseMainCollection.h"
@ -92,7 +91,7 @@ void RimCloudDataSourceCollection::createEnsemblesFromSelectedDataSources( const
RiaSummaryTools::summaryCaseMainCollection()->addEnsemble( ensemble );
ensemble->loadDataAndUpdate();
RicSummaryPlotBuilder::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );
RiaSummaryPlotTools::createAndAppendDefaultSummaryMultiPlot( {}, { ensemble } );
}
RiaSummaryTools::summaryCaseMainCollection()->updateAllRequiredEditors();

5
ApplicationLibCode/ProjectDataModel/RimMainPlotCollection.cpp
View File

@ -21,8 +21,7 @@
#include "RiaPlotCollectionScheduler.h"
#include "Summary/RiaSummaryDefines.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "RimAbstractPlotCollection.h"
#include "RimAnalysisPlotCollection.h"
@ -173,7 +172,7 @@ void RimMainPlotCollection::initAfterRead()
{
m_summaryPlotCollection_OBSOLETE()->removePlot( singlePlot );
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlotNoAutoSettings( singlePlot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlotNoAutoSettings( singlePlot );
}
}

4
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryMultiPlot.cpp
View File

@ -24,12 +24,12 @@
#include "RiaTimeTTools.h"
#include "Summary/RiaSummaryAddressAnalyzer.h"
#include "Summary/RiaSummaryAddressModifier.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryStringTools.h"
#include "PlotBuilderCommands/RicAppendSummaryPlotsForObjectsFeature.h"
#include "PlotBuilderCommands/RicAppendSummaryPlotsForSummaryAddressesFeature.h"
#include "PlotBuilderCommands/RicAppendSummaryPlotsForSummaryCasesFeature.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RifEclEclipseSummary.h"
#include "RifEclipseRftAddress.h"
@ -1563,7 +1563,7 @@ void RimSummaryMultiPlot::appendSubPlotByStepping( int direction )
if ( plots.empty() ) return;
// duplicate them
auto newPlots = RicSummaryPlotBuilder::duplicatePlots( plots );
auto newPlots = RiaSummaryPlotTools::duplicatePlots( plots );
if ( newPlots.empty() ) return;
for ( auto plot : newPlots )

15
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlot.cpp
View File

@ -29,11 +29,11 @@
#include "RiaStdStringTools.h"
#include "Summary/RiaSummaryCurveDefinition.h"
#include "Summary/RiaSummaryDefines.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "RifEclipseSummaryAddressDefines.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "SummaryPlotCommands/RicSummaryPlotEditorUi.h"
#include "RimAsciiDataCurve.h"
@ -2281,7 +2281,7 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleEnsembleDrop( RimSummaryEnsemble
{
if ( ensembles.count( ensemble ) > 0 ) continue;
auto curveSet = RicSummaryPlotBuilder::addNewEnsembleCurve( this, addr, ensemble );
auto curveSet = RiaSummaryPlotTools::addNewEnsembleCurve( this, addr, ensemble );
curveSetsToUpdate.push_back( curveSet );
newCurves++;
}
@ -2383,7 +2383,7 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleAddressCollectionDrop( RimSummar
auto addresses = curveDef.ensemble()->ensembleSummaryAddresses();
if ( addresses.find( curveDef.summaryAddressY() ) != addresses.end() )
{
auto curveSet = RicSummaryPlotBuilder::addNewEnsembleCurve( this, curveDef.summaryCurveAddress(), curveDef.ensemble() );
auto curveSet = RiaSummaryPlotTools::addNewEnsembleCurve( this, curveDef.summaryCurveAddress(), curveDef.ensemble() );
curveSetsToUpdate.push_back( curveSet );
newCurves++;
}
@ -2454,11 +2454,10 @@ RimSummaryPlot::CurveInfo RimSummaryPlot::handleSummaryAddressDrop( RimSummaryAd
if ( !skipAddress )
{
auto curveSet =
RicSummaryPlotBuilder::addNewEnsembleCurve( this,
RiaSummaryCurveAddress( RifEclipseSummaryAddress::timeAddress(),
droppedAddress ),
ensemble );
auto curveSet = RiaSummaryPlotTools::addNewEnsembleCurve( this,
RiaSummaryCurveAddress( RifEclipseSummaryAddress::timeAddress(),
droppedAddress ),
ensemble );
curveSetsToUpdate.push_back( curveSet );
newCurves++;

21
ApplicationLibCode/ProjectDataModel/Summary/RimSummaryPlotManager.cpp
View File

@ -21,6 +21,8 @@
#include "RiaStdStringTools.h"
#include "RiaStringListSerializer.h"
#include "RiaTextStringTools.h"
#include "Summary/RiaSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryStringTools.h"
#include "Summary/RiaSummaryTools.h"
@ -39,7 +41,6 @@
#include "RimSummaryMultiPlotCollection.h"
#include "RimSummaryPlot.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
#include "RiuPlotMainWindowTools.h"
@ -405,13 +406,13 @@ void RimSummaryPlotManager::createNewPlot()
}
}
RicSummaryPlotBuilder plotBuilder;
RiaSummaryPlotBuilder plotBuilder;
plotBuilder.setAddresses( filteredAddressesFromSource );
plotBuilder.setDataSources( summaryCases, ensembles );
RicSummaryPlotBuilder::RicGraphCurveGrouping grouping = RicSummaryPlotBuilder::RicGraphCurveGrouping::NONE;
if ( m_individualPlotPerVector ) grouping = RicSummaryPlotBuilder::RicGraphCurveGrouping::SINGLE_CURVES;
if ( m_individualPlotPerObject ) grouping = RicSummaryPlotBuilder::RicGraphCurveGrouping::CURVES_FOR_OBJECT;
RiaSummaryPlotBuilder::RicGraphCurveGrouping grouping = RiaSummaryPlotBuilder::RicGraphCurveGrouping::NONE;
if ( m_individualPlotPerVector ) grouping = RiaSummaryPlotBuilder::RicGraphCurveGrouping::SINGLE_CURVES;
if ( m_individualPlotPerObject ) grouping = RiaSummaryPlotBuilder::RicGraphCurveGrouping::CURVES_FOR_OBJECT;
plotBuilder.setGrouping( grouping );
plotBuilder.setIndividualPlotPerDataSource( m_individualPlotPerDataSource );
@ -419,13 +420,13 @@ void RimSummaryPlotManager::createNewPlot()
auto summaryPlots = plotBuilder.createPlots();
if ( m_createMultiPlot )
{
RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( summaryPlots );
RiaSummaryPlotTools::createAndAppendSummaryMultiPlot( summaryPlots );
}
else
{
for ( auto plot : summaryPlots )
{
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( plot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( plot );
plot->loadDataAndUpdate();
}
}
@ -491,11 +492,11 @@ std::set<RifEclipseSummaryAddress> RimSummaryPlotManager::filteredAddresses()
std::set<RifEclipseSummaryAddress> nativeAddresses;
if ( !summaryCases.empty() )
{
nativeAddresses = RicSummaryPlotBuilder::addressesForSource( summaryCases.front() );
nativeAddresses = RiaSummaryPlotTools::addressesForSource( summaryCases.front() );
}
else if ( !ensembles.empty() )
{
nativeAddresses = RicSummaryPlotBuilder::addressesForSource( ensembles.front() );
nativeAddresses = RiaSummaryPlotTools::addressesForSource( ensembles.front() );
}
if ( nativeAddresses.empty() ) return {};
@ -517,7 +518,7 @@ void RimSummaryPlotManager::appendCurvesToPlot( RimSummaryPlot* destinationPlot
findFilteredSummaryCasesAndEnsembles( summaryCases, ensembles );
std::set<RifEclipseSummaryAddress> filteredAddressesFromSource = filteredAddresses();
RicSummaryPlotBuilder::appendCurvesToPlot( destinationPlot, filteredAddressesFromSource, summaryCases, ensembles );
RiaSummaryPlotTools::appendCurvesToPlot( destinationPlot, filteredAddressesFromSource, summaryCases, ensembles );
destinationPlot->applyDefaultCurveAppearances();
destinationPlot->loadDataAndUpdate();

123
ApplicationLibCode/ProjectDataModel/Tools/RimAutomationSettings.cpp Normal file
View File

@ -0,0 +1,123 @@
/////////////////////////////////////////////////////////////////////////////////
//
// Copyright (C) 2025 Equinor ASA
//
// ResInsight is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, either version 3 of the License, or
// (at your option) any later version.
//
// ResInsight is distributed in the hope that it will be useful, but WITHOUT ANY
// WARRANTY; without even the implied warranty of MERCHANTABILITY or
// FITNESS FOR A PARTICULAR PURPOSE.
//
// See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
// for more details.
//
/////////////////////////////////////////////////////////////////////////////////
#include "RimAutomationSettings.h"
#include "Summary/RiaSummaryTools.h"
#include "RimSummaryMultiPlotCollection.h"
#include "Summary/RimSummaryPlot.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RiuPlotMainWindowTools.h"
#include "cafPdmUiPushButtonEditor.h"
CAF_PDM_SOURCE_INIT( RimAutomationSettings, "RimAutomationSettings" );
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimAutomationSettings::RimAutomationSettings()
{
CAF_PDM_InitObject( "Automation Settings", ":/gear.svg" );
CAF_PDM_InitFieldNoDefault( &m_cellSelectionDestination,
"CellSelectionDestination",
"Cell Selection Destination",
"",
"Add curves to the selected Summary Plot when clicking on cells in a 3D view." );
CAF_PDM_InitFieldNoDefault( &m_createSummaryPlot, "CreateSummaryPlot", "Create Summary Plot" );
caf::PdmUiPushButtonEditor::configureEditorLabelHidden( &m_createSummaryPlot );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlot* RimAutomationSettings::cellSelectionDestination() const
{
return m_cellSelectionDestination();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAutomationSettings::fieldChangedByUi( const caf::PdmFieldHandle* changedField, const QVariant& oldValue, const QVariant& newValue )
{
if ( changedField == &m_createSummaryPlot )
{
if ( m_createSummaryPlot )
{
RimSummaryPlot* newPlot = new RimSummaryPlot();
RiaSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( newPlot );
RiuPlotMainWindowTools::selectAsCurrentItem( this );
m_cellSelectionDestination = newPlot;
}
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAutomationSettings::defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering )
{
auto group = uiOrdering.addNewGroup( "Destination Plot for Cell Selection" );
group->add( &m_cellSelectionDestination );
m_cellSelectionDestination.uiCapability()->setUiLabelPosition( caf::PdmUiItemInfo::HIDDEN );
// group->add( &m_createSummaryPlot );
uiOrdering.skipRemainingFields();
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QList<caf::PdmOptionItemInfo> RimAutomationSettings::calculateValueOptions( const caf::PdmFieldHandle* fieldNeedingOptions )
{
QList<caf::PdmOptionItemInfo> options;
if ( fieldNeedingOptions == &m_cellSelectionDestination )
{
if ( auto summaryPlotColl = RiaSummaryTools::summaryMultiPlotCollection() )
{
summaryPlotColl->summaryPlotItemInfos( &options );
}
options.push_back( caf::PdmOptionItemInfo( "None", nullptr ) );
}
return options;
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAutomationSettings::defineEditorAttribute( const caf::PdmFieldHandle* field, QString uiConfigName, caf::PdmUiEditorAttribute* attribute )
{
if ( field == &m_createSummaryPlot )
{
if ( auto* attr = dynamic_cast<caf::PdmUiPushButtonEditorAttribute*>( attribute ) )
{
attr->m_buttonText = "Create Plot";
}
}
}

4
ApplicationLibCode/ProjectDataModelCommands/RimcSummaryPlotCollection.cpp
View File

@ -18,7 +18,7 @@
#include "RimcSummaryPlotCollection.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "SummaryPlotCommands/RicNewDefaultSummaryPlotFeature.h"
#include "SummaryPlotCommands/RicNewSummaryEnsembleCurveSetFeature.h"
#include "SummaryPlotCommands/RicSummaryPlotFeatureImpl.h"
@ -84,7 +84,7 @@ caf::PdmObjectHandle* RimcSummaryPlotCollection_newSummaryPlot::execute()
if ( newPlot )
{
newPlot->loadDataAndUpdate();
RicSummaryPlotBuilder::createAndAppendSingleSummaryMultiPlot( newPlot );
RiaSummaryPlotTools::createAndAppendSingleSummaryMultiPlot( newPlot );
}
return newPlot;

5
ApplicationLibCode/UserInterface/RiuPlotMainWindow.cpp
View File

@ -24,10 +24,9 @@
#include "RiaPreferences.h"
#include "RiaPreferencesSystem.h"
#include "RiaRegressionTestRunner.h"
#include "Summary/RiaSummaryPlotTools.h"
#include "Summary/RiaSummaryTools.h"
#include "PlotBuilderCommands/RicSummaryPlotBuilder.h"
#include "RimEnsembleCurveSetCollection.h"
#include "RimMainPlotCollection.h"
#include "RimMultiPlot.h"
@ -1057,7 +1056,7 @@ void RiuPlotMainWindow::dropEvent( QDropEvent* event )
if ( RiuDragDrop::handleGenericDropEvent( event, objects ) )
{
RicSummaryPlotBuilder::createAndAppendSummaryMultiPlot( objects );
RiaSummaryPlotTools::createAndAppendSummaryMultiPlot( objects );
}
}