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

#2028 Summary : Use SummaryTools to access summary objects

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-20 10:54:48 +02:00
parent 167f56f95a
commit 07b3778a75
12 changed files with 25 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ApplicationCode/Application/Tools/RiaSummaryTools.h
View File

@@ -28,6 +28,7 @@ class QString;
class RiaSummaryTools
{
public:
static RimSummaryPlotCollection* summaryPlotCollection();
static void notifyCalculatedCurveNameHasChanged(const QString& previousCurveName, const QString& currentCurveName);
static RimSummaryPlotCollection* summaryPlotCollection();
static void notifyCalculatedCurveNameHasChanged(const QString& previousCurveName,
const QString& currentCurveName);
};

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

@@ -38,6 +38,7 @@
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
#include "RimView.h"
#include "RiaSummaryTools.h"
#include "RiuMainPlotWindow.h"
#include "RiuMainWindow.h"
@@ -79,11 +80,7 @@ void RicPlotProductionRateFeature::onActionTriggered(bool isChecked)
RimSummaryCaseMainCollection* sumCaseColl = project->activeOilField() ? project->activeOilField()->summaryCaseMainCollection() : nullptr;
if (!sumCaseColl) return;
RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
CAF_ASSERT(mainPlotColl);
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
CAF_ASSERT(summaryPlotColl);
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
std::vector<RimSimWellInView*> collection;
caf::SelectionManager::instance()->objectsByType(&collection);

6
ApplicationCode/Commands/RicCloseObservedDataFeature.cpp
View File

@@ -19,8 +19,8 @@
#include "RicCloseObservedDataFeature.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimObservedData.h"
#include "RimObservedDataCollection.h"
#include "RimProject.h"
@@ -49,9 +49,7 @@ void RicCloseObservedDataFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
void RicCloseObservedDataFeature::deleteObservedData(const std::vector<RimObservedData*>& data)
{
RimSummaryPlotCollection* summaryPlotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
CVF_ASSERT(summaryPlotColl);
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
for (RimObservedData* observedData : data)
{

4
ApplicationCode/Commands/RicCloseSummaryCaseFeature.cpp
View File

@@ -19,6 +19,7 @@
#include "RicCloseSummaryCaseFeature.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
@@ -49,8 +50,7 @@ void RicCloseSummaryCaseFeature::setupActionLook(QAction* actionToSetup)
//--------------------------------------------------------------------------------------------------
void RicCloseSummaryCaseFeature::deleteSummaryCases(const std::vector<RimSummaryCase*>& cases)
{
RimSummaryPlotCollection* summaryPlotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
CVF_ASSERT(summaryPlotColl);
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
for (RimSummaryCase* summaryCase : cases)
{

3
ApplicationCode/Commands/RicDeleteSummaryCaseCollectionFeature.cpp
View File

@@ -20,6 +20,7 @@
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimSummaryCase.h"
@@ -43,7 +44,7 @@ CAF_CMD_SOURCE_INIT(RicDeleteSummaryCaseCollectionFeature, "RicDeleteSummaryCase
//--------------------------------------------------------------------------------------------------
void RicDeleteSummaryCaseCollectionFeature::deleteSummaryCaseCollection(RimSummaryCaseCollection* caseCollection)
{
RimSummaryPlotCollection* summaryPlotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
for (RimSummaryCase* summaryCase : caseCollection->allSummaryCases())
{

4
ApplicationCode/Commands/RicReloadSummaryCaseFeature.cpp
View File

@@ -20,6 +20,7 @@
#include "RiaApplication.h"
#include "RiaLogging.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
@@ -64,8 +65,7 @@ bool RicReloadSummaryCaseFeature::isCommandEnabled()
//--------------------------------------------------------------------------------------------------
void RicReloadSummaryCaseFeature::onActionTriggered(bool isChecked)
{
RimSummaryPlotCollection* summaryPlotColl = RiaApplication::instance()->project()->mainPlotCollection()->summaryPlotCollection();
CVF_ASSERT(summaryPlotColl);
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
std::vector<RimSummaryCase*> caseSelection = selectedSummaryCases();
for (RimSummaryCase* summaryCase : caseSelection)

12
ApplicationCode/Commands/SummaryPlotCommands/RicNewGridTimeHistoryCurveFeature.cpp
View File

@@ -30,9 +30,7 @@
#include "RimGeoMechResultDefinition.h"
#include "RimGeoMechView.h"
#include "RimGridTimeHistoryCurve.h"
#include "RimMainPlotCollection.h"
#include "RimProject.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryPlot.h"
#include "RimSummaryPlotCollection.h"
@@ -46,6 +44,7 @@
#include "cvfColor3.h"
#include <QAction>
#include "RiaSummaryTools.h"
CAF_CMD_SOURCE_INIT(RicNewGridTimeHistoryCurveFeature, "RicNewGridTimeHistoryCurveFeature");
@@ -81,14 +80,7 @@ RimSummaryPlot* RicNewGridTimeHistoryCurveFeature::userSelectedSummaryPlot()
{
const QString lastUsedSummaryPlotKey("lastUsedSummaryPlotKey");
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
CVF_ASSERT(mainPlotColl);
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
CVF_ASSERT(summaryPlotColl);
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
RimSummaryPlot* defaultSelectedPlot = nullptr;
{

7
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFeature.cpp
View File

@@ -23,6 +23,7 @@
#include "RimMainPlotCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RiaSummaryTools.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryPlot.h"
@@ -57,11 +58,7 @@ void RicNewSummaryCurveFeature::onActionTriggered(bool isChecked)
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
CVF_ASSERT(mainPlotColl);
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
CVF_ASSERT(summaryPlotColl);
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
RimSummaryPlot* plot = selectedSummaryPlot();
if (plot)

8
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryCurveFilterFeature.cpp
View File

@@ -19,11 +19,11 @@
#include "RicNewSummaryCurveFilterFeature.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
#include "RimSummaryCaseMainCollection.h"
#include "RimSummaryCurve.h"
#include "RimSummaryCurveFilter.h"
#include "RimSummaryPlot.h"
@@ -58,11 +58,7 @@ void RicNewSummaryCurveFilterFeature::onActionTriggered(bool isChecked)
RimProject* project = RiaApplication::instance()->project();
CVF_ASSERT(project);
RimMainPlotCollection* mainPlotColl = project->mainPlotCollection();
CVF_ASSERT(mainPlotColl);
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
CVF_ASSERT(summaryPlotColl);
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
RimSummaryPlot* plot = selectedSummaryPlot();
if (plot)

16
ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.cpp
View File

@@ -19,6 +19,7 @@
#include "RicSelectSummaryPlotUI.h"
#include "RiaApplication.h"
#include "RiaSummaryTools.h"
#include "RimEclipseResultCase.h"
#include "RimEclipseView.h"
@@ -91,7 +92,7 @@ QList<caf::PdmOptionItemInfo> RicSelectSummaryPlotUI::calculateValueOptions(cons
if (fieldNeedingOptions == &m_selectedSummaryPlot)
{
RimSummaryPlotCollection* summaryPlotColl = summaryPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
summaryPlotColl->summaryPlotItemInfos(&options);
}
@@ -104,7 +105,7 @@ QList<caf::PdmOptionItemInfo> RicSelectSummaryPlotUI::calculateValueOptions(cons
//--------------------------------------------------------------------------------------------------
void RicSelectSummaryPlotUI::defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering)
{
if (summaryPlotCollection()->summaryPlots().size() == 0)
if (RiaSummaryTools::summaryPlotCollection()->summaryPlots().size() == 0)
{
m_createNewPlot = true;
}
@@ -121,14 +122,3 @@ void RicSelectSummaryPlotUI::defineUiOrdering(QString uiConfigName, caf::PdmUiOr
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RimSummaryPlotCollection* RicSelectSummaryPlotUI::summaryPlotCollection()
{
RimProject* project = RiaApplication::instance()->project();
return project->mainPlotCollection()->summaryPlotCollection();
}

3
ApplicationCode/Commands/SummaryPlotCommands/RicSelectSummaryPlotUI.h
View File

@@ -47,9 +47,6 @@ public:
protected:
virtual void defineUiOrdering(QString uiConfigName, caf::PdmUiOrdering& uiOrdering) override;
private:
static RimSummaryPlotCollection* summaryPlotCollection();
private:
caf::PdmPtrField<RimSummaryPlot*> m_selectedSummaryPlot;
caf::PdmField<bool> m_createNewPlot;

9
ApplicationCode/ProjectDataModel/Summary/RimSummaryCase.cpp
View File

@@ -18,6 +18,8 @@
#include "RimSummaryCase.h"
#include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h"
#include "RimOilField.h"
#include "RimProject.h"
@@ -95,12 +97,7 @@ void RimSummaryCase::fieldChangedByUi(const caf::PdmFieldHandle* changedField, c
updateTreeItemName();
}
RimProject* proj = NULL;
this->firstAncestorOrThisOfType(proj);
RimMainPlotCollection* mainPlotColl = proj->mainPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = mainPlotColl->summaryPlotCollection();
RimSummaryPlotCollection* summaryPlotColl = RiaSummaryTools::summaryPlotCollection();
summaryPlotColl->updateSummaryNameHasChanged();
updateOptionSensitivity();