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

Browse Source
This commit is contained in:
Magne Sjaastad
2017-01-13 09:51:37 +01:00
parent 0cbdcd587d
commit ccb88c6520
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -565,7 +565,7 @@ void RiaApplication::loadAndUpdatePlotData()
} }
size_t plotCount = 0; size_t plotCount = 0;
plotCount += wlpColl ? wlpColl->wellLogPlots().size() : 0; plotCount += wlpColl ? wlpColl->wellLogPlots().size() : 0;
plotCount += spColl ? spColl->m_summaryPlots().size() : 0; plotCount += spColl ? spColl->summaryPlots().size() : 0;
caf::ProgressInfo plotProgress(plotCount, "Loading Plot Data"); caf::ProgressInfo plotProgress(plotCount, "Loading Plot Data");
if (wlpColl) if (wlpColl)
@@ -579,9 +579,9 @@ void RiaApplication::loadAndUpdatePlotData()
if (spColl) if (spColl)
{ {
for (size_t wlpIdx = 0; wlpIdx < spColl->m_summaryPlots().size(); ++wlpIdx) for (size_t wlpIdx = 0; wlpIdx < spColl->summaryPlots().size(); ++wlpIdx)
{ {
spColl->m_summaryPlots[wlpIdx]->loadDataAndUpdate(); spColl->summaryPlots[wlpIdx]->loadDataAndUpdate();
plotProgress.incrementProgress(); plotProgress.incrementProgress();
} }
} }

4
ApplicationCode/Commands/SummaryPlotCommands/RicNewSummaryPlotFeature.cpp
View File

@@ -96,9 +96,9 @@ void RicNewSummaryPlotFeature::setupActionLook(QAction* actionToSetup)
void RicNewSummaryPlotFeature::createNewSummaryPlot(RimSummaryPlotCollection* summaryPlotColl, RimSummaryCase* summaryCase) void RicNewSummaryPlotFeature::createNewSummaryPlot(RimSummaryPlotCollection* summaryPlotColl, RimSummaryCase* summaryCase)
{ {
RimSummaryPlot* plot = new RimSummaryPlot(); RimSummaryPlot* plot = new RimSummaryPlot();
summaryPlotColl->m_summaryPlots().push_back(plot); summaryPlotColl->summaryPlots().push_back(plot);
plot->setDescription(QString("Summary Plot %1").arg(summaryPlotColl->m_summaryPlots.size())); plot->setDescription(QString("Summary Plot %1").arg(summaryPlotColl->summaryPlots.size()));
RimSummaryCurveFilter* newCurveFilter = new RimSummaryCurveFilter(); RimSummaryCurveFilter* newCurveFilter = new RimSummaryCurveFilter();

2
ApplicationCode/Commands/SummaryPlotCommands/RicPasteSummaryPlotFeature.cpp
View File

@@ -74,7 +74,7 @@ void RicPasteSummaryPlotFeature::onActionTriggered(bool isChecked)
RimSummaryPlot* newSummaryPlot = dynamic_cast<RimSummaryPlot*>(sourceObjects[i]->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance())); RimSummaryPlot* newSummaryPlot = dynamic_cast<RimSummaryPlot*>(sourceObjects[i]->xmlCapability()->copyByXmlSerialization(caf::PdmDefaultObjectFactory::instance()));
CVF_ASSERT(newSummaryPlot); CVF_ASSERT(newSummaryPlot);
plotColl->m_summaryPlots.push_back(newSummaryPlot); plotColl->summaryPlots.push_back(newSummaryPlot);
// Resolve references after object has been inserted into the data model // Resolve references after object has been inserted into the data model
newSummaryPlot->resolveReferencesRecursively(); newSummaryPlot->resolveReferencesRecursively();

2
ApplicationCode/ProjectDataModel/RimMainPlotCollection.cpp
View File

@@ -168,7 +168,7 @@ RimFlowPlotCollection* RimMainPlotCollection::flowPlotCollection()
void RimMainPlotCollection::deleteAllContainedObjects() void RimMainPlotCollection::deleteAllContainedObjects()
{ {
m_wellLogPlotCollection()->wellLogPlots.deleteAllChildObjects(); m_wellLogPlotCollection()->wellLogPlots.deleteAllChildObjects();
m_summaryPlotCollection()->m_summaryPlots.deleteAllChildObjects(); m_summaryPlotCollection()->summaryPlots.deleteAllChildObjects();
m_flowPlotCollection()->flowPlots.deleteAllChildObjects(); m_flowPlotCollection()->flowPlots.deleteAllChildObjects();
} }

8
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.cpp
View File

@@ -40,8 +40,8 @@ RimSummaryPlotCollection::RimSummaryPlotCollection()
{ {
CAF_PDM_InitObject("Summary Plots", ":/SummaryPlots16x16.png", "", ""); CAF_PDM_InitObject("Summary Plots", ":/SummaryPlots16x16.png", "", "");
CAF_PDM_InitFieldNoDefault(&m_summaryPlots, "SummaryPlots", "Summary Plots", "", "", ""); CAF_PDM_InitFieldNoDefault(&summaryPlots, "SummaryPlots", "Summary Plots", "", "", "");
m_summaryPlots.uiCapability()->setUiHidden(true); summaryPlots.uiCapability()->setUiHidden(true);
} }
@@ -50,7 +50,7 @@ RimSummaryPlotCollection::RimSummaryPlotCollection()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
RimSummaryPlotCollection::~RimSummaryPlotCollection() RimSummaryPlotCollection::~RimSummaryPlotCollection()
{ {
m_summaryPlots.deleteAllChildObjects(); summaryPlots.deleteAllChildObjects();
for (auto it = m_summaryFileReaders.begin(); it != m_summaryFileReaders.end(); it++) for (auto it = m_summaryFileReaders.begin(); it != m_summaryFileReaders.end(); it++)
{ {
@@ -124,7 +124,7 @@ RifReaderEclipseSummary* RimSummaryPlotCollection::createSummaryFileReader(const
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimSummaryPlotCollection::updateSummaryNameHasChanged() void RimSummaryPlotCollection::updateSummaryNameHasChanged()
{ {
for (RimSummaryPlot* plot : m_summaryPlots) for (RimSummaryPlot* plot : summaryPlots)
{ {
plot->updateCaseNameHasChanged(); plot->updateCaseNameHasChanged();
} }

2
ApplicationCode/ProjectDataModel/Summary/RimSummaryPlotCollection.h
View File

@@ -43,7 +43,7 @@ public:
RifReaderEclipseSummary* getOrCreateSummaryFileReader(const RimEclipseResultCase* eclipseCase); RifReaderEclipseSummary* getOrCreateSummaryFileReader(const RimEclipseResultCase* eclipseCase);
caf::PdmChildArrayField<RimSummaryPlot*> m_summaryPlots; caf::PdmChildArrayField<RimSummaryPlot*> summaryPlots;
void updateSummaryNameHasChanged(); void updateSummaryNameHasChanged();
private: private: