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
Download Patch File Download Diff File Expand all files Collapse all files

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";
}
}
}