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

Rename RimSummaryCaseCollection to RimSummaryEnsemble.

Browse Source
This commit is contained in:
Kristian Bendiksen
2024-07-29 15:38:17 +02:00
parent 1d7b40fbdd
commit e9c46c5cec
147 changed files with 852 additions and 862 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
ApplicationLibCode/UserInterface/RiuDragDrop.cpp
View File

@@ -36,8 +36,8 @@
#include "RimSummaryAddress.h"
#include "RimSummaryAddressCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RimSurface.h"
#include "RimSurfaceCollection.h"
#include "RimWellAllocationPlot.h"
@@ -248,7 +248,7 @@ Qt::ItemFlags RiuDragDrop::flags( const QModelIndex& index ) const
if ( dynamic_cast<RimEclipseCase*>( uiItem ) || dynamic_cast<RimWellLogCurve*>( uiItem ) ||
dynamic_cast<RimWellLogChannel*>( uiItem ) || dynamic_cast<RimPlot*>( uiItem ) || dynamic_cast<RimSummaryCase*>( uiItem ) ||
dynamic_cast<RimSummaryCaseCollection*>( uiItem ) || dynamic_cast<RimSurface*>( uiItem ) )
dynamic_cast<RimSummaryEnsemble*>( uiItem ) || dynamic_cast<RimSurface*>( uiItem ) )
{
itemflags |= Qt::ItemIsDragEnabled;
}
@@ -316,7 +316,7 @@ Qt::ItemFlags RiuDragDrop::flags( const QModelIndex& index ) const
}
}
}
else if ( dynamic_cast<RimSummaryCaseCollection*>( uiItem ) )
else if ( dynamic_cast<RimSummaryEnsemble*>( uiItem ) )
{
if ( RiuTypedPdmObjects<RimSummaryCase>::containsTypedObjects( m_dragItems ) )
{
@@ -411,7 +411,7 @@ bool RiuDragDrop::dropMimeData( const QMimeData* data, Qt::DropAction action, in
return handleMultiPlotDrop( action, draggedObjects, multiPlot, row );
}
auto summaryCaseCollection = dropTarget->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
auto summaryCaseCollection = dropTarget->firstAncestorOrThisOfType<RimSummaryEnsemble>();
if ( summaryCaseCollection )
{
return handleSummaryCaseCollectionDrop( action, draggedObjects, summaryCaseCollection );
@@ -570,9 +570,9 @@ bool RiuDragDrop::handleWellLogPlotDrop( Qt::DropAction action,
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
bool RiuDragDrop::handleSummaryCaseCollectionDrop( Qt::DropAction action,
caf::PdmObjectGroup& draggedObjects,
RimSummaryCaseCollection* summaryCaseDropTarget )
bool RiuDragDrop::handleSummaryCaseCollectionDrop( Qt::DropAction action,
caf::PdmObjectGroup& draggedObjects,
RimSummaryEnsemble* summaryCaseDropTarget )
{
std::vector<RimSummaryCase*> summaryCases = RiuTypedPdmObjects<RimSummaryCase>::typedObjectsFromGroup( draggedObjects );
@@ -580,7 +580,7 @@ bool RiuDragDrop::handleSummaryCaseCollectionDrop( Qt::DropAction act
for ( RimSummaryCase* summaryCase : summaryCases )
{
auto summaryCaseCollection = summaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
auto summaryCaseCollection = summaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
if ( summaryCaseCollection )
{
@@ -615,7 +615,7 @@ bool RiuDragDrop::handleSummaryCaseMainCollectionDrop( Qt::DropAction
for ( RimSummaryCase* summaryCase : summaryCases )
{
auto summaryCaseCollection = summaryCase->firstAncestorOrThisOfType<RimSummaryCaseCollection>();
auto summaryCaseCollection = summaryCase->firstAncestorOrThisOfType<RimSummaryEnsemble>();
if ( summaryCaseCollection )
{

6
ApplicationLibCode/UserInterface/RiuDragDrop.h
View File

@@ -32,7 +32,7 @@ class PdmUiTreeView;
class RimMultiPlot;
class RimIdenticalGridCaseGroup;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimSummaryCaseMainCollection;
class RimSummaryCurve;
class RimSummaryPlot;
@@ -79,9 +79,7 @@ private:
bool handleWellLogPlotDrop( Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimWellLogPlot* wellLogPlot, int insertAtPosition );
bool handleMultiPlotDrop( Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimMultiPlot* multiPlot, int insertAtPosition );
bool handleSummaryCaseCollectionDrop( Qt::DropAction action,
caf::PdmObjectGroup& objectGroup,
RimSummaryCaseCollection* summaryCaseCollection );
bool handleSummaryCaseCollectionDrop( Qt::DropAction action, caf::PdmObjectGroup& objectGroup, RimSummaryEnsemble* summaryCaseCollection );
bool handleSummaryCaseMainCollectionDrop( Qt::DropAction action,
caf::PdmObjectGroup& objectGroup,
RimSummaryCaseMainCollection* summaryCaseMainCollection );

10
ApplicationLibCode/UserInterface/RiuSummaryPlot.cpp
View File

@@ -23,8 +23,8 @@
#include "RimEnsembleCurveSet.h"
#include "RimPlot.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryEnsemble.h"
#include "RimSummaryPlot.h"
#include "RiuPlotCurve.h"
@@ -85,9 +85,9 @@ void RiuSummaryPlot::showContextMenu( QPoint pos )
{
std::time_t timeStep = summaryCurve->timeStepsY()[closestCurvePoint];
RimSummaryCaseCollection* ensemble = nullptr;
QString clickedQuantityName;
QStringList allQuantityNamesInPlot;
RimSummaryEnsemble* ensemble = nullptr;
QString clickedQuantityName;
QStringList allQuantityNamesInPlot;
auto clickedEnsembleCurveSet = summaryCurve->firstAncestorOrThisOfType<RimEnsembleCurveSet>();
@@ -95,7 +95,7 @@ void RiuSummaryPlot::showContextMenu( QPoint pos )
if ( clickedEnsembleCurveSet )
{
ensemble = clickedEnsembleCurveSet->summaryCaseCollection();
ensemble = clickedEnsembleCurveSet->summaryEnsemble();
if ( ensemble && ensemble->isEnsemble() )
{
clickedQuantityName = QString::fromStdString( clickedEnsembleCurveSet->summaryAddressY().uiText() );

7
ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.cpp
View File

@@ -20,7 +20,7 @@
#include "RiaSummaryCurveDefinition.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryEnsemble.h"
#include "RiuSummaryVectorSelectionUi.h"
#include "RiuSummaryVectorSelectionWidgetCreator.h"
@@ -94,7 +94,7 @@ void RiuSummaryVectorSelectionDialog::setCaseAndAddress( RimSummaryCase* summary
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryVectorSelectionDialog::setEnsembleAndAddress( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& address )
void RiuSummaryVectorSelectionDialog::setEnsembleAndAddress( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& address )
{
if ( ensemble )
{
@@ -113,8 +113,7 @@ void RiuSummaryVectorSelectionDialog::setEnsembleAndAddress( RimSummaryCaseColle
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuSummaryVectorSelectionDialog::setEnsembleAndAddresses( RimSummaryCaseCollection* ensemble,
std::vector<RifEclipseSummaryAddress> addresses )
void RiuSummaryVectorSelectionDialog::setEnsembleAndAddresses( RimSummaryEnsemble* ensemble, std::vector<RifEclipseSummaryAddress> addresses )
{
if ( ensemble )
{

6
ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionDialog.h
View File

@@ -25,7 +25,7 @@
class RiaSummaryCurveDefinition;
class RifEclipseSummaryAddress;
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RiuSummaryVectorSelectionUi;
class RiuSummaryVectorSelectionWidgetCreator;
@@ -42,8 +42,8 @@ public:
~RiuSummaryVectorSelectionDialog() override;
void setCaseAndAddress( RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& address );
void setEnsembleAndAddress( RimSummaryCaseCollection* ensemble, const RifEclipseSummaryAddress& address );
void setEnsembleAndAddresses( RimSummaryCaseCollection* ensemble, std::vector<RifEclipseSummaryAddress> addresses );
void setEnsembleAndAddress( RimSummaryEnsemble* ensemble, const RifEclipseSummaryAddress& address );
void setEnsembleAndAddresses( RimSummaryEnsemble* ensemble, std::vector<RifEclipseSummaryAddress> addresses );
void setCurveSelection( const std::vector<RiaSummaryCurveDefinition>& selection );
std::vector<RiaSummaryCurveDefinition> curveSelection() const;

20
ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.cpp
View File

@@ -35,8 +35,8 @@
#include "RimSummaryCalculation.h"
#include "RimSummaryCalculationCollection.h"
#include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryEnsemble.h"
#include "RiuSummaryCurveDefinitionKeywords.h"
#include "RiuSummaryQuantityNameInfoProvider.h"
@@ -372,7 +372,7 @@ std::vector<RiaCurveSetDefinition> RiuSummaryVectorSelectionUi::allCurveSetDefin
for ( SummarySource* currSource : selectedSummarySources() )
{
RimSummaryCaseCollection* ensemble = dynamic_cast<RimSummaryCaseCollection*>( currSource );
RimSummaryEnsemble* ensemble = dynamic_cast<RimSummaryEnsemble*>( currSource );
if ( !ensemble ) continue;
std::set<RifEclipseSummaryAddress> addressesFromSource;
@@ -406,8 +406,8 @@ std::vector<RiaSummaryCurveDefinition> RiuSummaryVectorSelectionUi::selection()
std::set<RifEclipseSummaryAddress> selectedAddressesFromUi = buildAddressListFromSelections();
for ( SummarySource* currSource : selectedSummarySources() )
{
RimSummaryCaseCollection* ensemble = dynamic_cast<RimSummaryCaseCollection*>( currSource );
RimSummaryCase* sourceCase = dynamic_cast<RimSummaryCase*>( currSource );
RimSummaryEnsemble* ensemble = dynamic_cast<RimSummaryEnsemble*>( currSource );
RimSummaryCase* sourceCase = dynamic_cast<RimSummaryCase*>( currSource );
if ( ensemble )
{
@@ -528,8 +528,8 @@ void RiuSummaryVectorSelectionUi::setDefaultSelection( const std::vector<Summary
std::vector<RiaSummaryCurveDefinition> curveDefs;
for ( SummarySource* s : selectTheseSources )
{
RimSummaryCase* sumCase = dynamic_cast<RimSummaryCase*>( s );
RimSummaryCaseCollection* ensemble = dynamic_cast<RimSummaryCaseCollection*>( s );
RimSummaryCase* sumCase = dynamic_cast<RimSummaryCase*>( s );
RimSummaryEnsemble* ensemble = dynamic_cast<RimSummaryEnsemble*>( s );
if ( ensemble )
{
curveDefs.push_back( RiaSummaryCurveDefinition( ensemble, defaultAddress ) );
@@ -983,8 +983,8 @@ std::set<RifEclipseSummaryAddress>
std::vector<SummarySource*> sources;
for ( const auto& source : m_selectedSources.value() )
{
RimSummaryCase* sumCase = dynamic_cast<RimSummaryCase*>( source.p() );
RimSummaryCaseCollection* ensemble = dynamic_cast<RimSummaryCaseCollection*>( source.p() );
RimSummaryCase* sumCase = dynamic_cast<RimSummaryCase*>( source.p() );
RimSummaryEnsemble* ensemble = dynamic_cast<RimSummaryEnsemble*>( source.p() );
if ( sumCase )
{
@@ -1040,8 +1040,8 @@ std::set<RifEclipseSummaryAddress>
{
std::set<RifEclipseSummaryAddress> allAddresses;
RimSummaryCase* currCase = dynamic_cast<RimSummaryCase*>( currSource );
RimSummaryCaseCollection* currEnsemble = dynamic_cast<RimSummaryCaseCollection*>( currSource );
RimSummaryCase* currCase = dynamic_cast<RimSummaryCase*>( currSource );
RimSummaryEnsemble* currEnsemble = dynamic_cast<RimSummaryEnsemble*>( currSource );
if ( currCase )
{

2
ApplicationLibCode/UserInterface/RiuSummaryVectorSelectionUi.h
View File

@@ -32,7 +32,7 @@
#define OBSERVED_DATA_AVALUE_POSTFIX "_OBSDATA"
class RimSummaryCase;
class RimSummaryCaseCollection;
class RimSummaryEnsemble;
class RimSummaryCurveAutoName;
class RimSummaryPlot;
class RiaSummaryCurveDefinition;