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

#2045 Summary : Update object editors when case is created or closed

Browse Source
This commit is contained in:
Magne Sjaastad
2017-10-26 08:21:19 +02:00
parent dab23164df
commit f83df13394
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Application/Tools/RiaImportEclipseCaseTools.cpp
View File

@@ -201,7 +201,7 @@ bool RiaImportEclipseCaseTools::openEclipseCaseShowTimeStepFilterImpl(const QStr
}
sumCaseColl->updateConnectedEditors();
sumCaseColl->updateAllRequiredEditors();
}
}
}

3
ApplicationCode/Commands/RicCloseSummaryCaseFeature.cpp
View File

@@ -65,7 +65,8 @@ void RicCloseSummaryCaseFeature::deleteSummaryCases(const std::vector<RimSummary
summaryCaseMainCollection->removeCase(summaryCase);
delete summaryCase;
summaryCaseMainCollection->updateConnectedEditors();
summaryCaseMainCollection->updateAllRequiredEditors();
}
}

17
ApplicationCode/Commands/RicImportSummaryCaseFeature.cpp
View File

@@ -71,12 +71,6 @@ void RicImportSummaryCaseFeature::onActionTriggered(bool isChecked)
RicImportSummaryCaseFeature::createAndAddSummaryCaseFromFile(f);
}
RiuMainPlotWindow* mainPlotWindow = app->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow && sumCaseColl->summaryCaseCount() > 0)
{
mainPlotWindow->selectAsCurrentItem(sumCaseColl->summaryCase(sumCaseColl->summaryCaseCount()-1));
}
std::vector<RimCase*> cases;
app->project()->allCases(cases);
@@ -105,8 +99,15 @@ bool RicImportSummaryCaseFeature::createAndAddSummaryCaseFromFile(const QString&
RimSummaryCaseMainCollection* sumCaseColl = proj->activeOilField() ? proj->activeOilField()->summaryCaseMainCollection() : nullptr;
if (!sumCaseColl) return false;
sumCaseColl->createAndAddSummaryCaseFromFileName(fileName);
sumCaseColl->updateConnectedEditors();
RimSummaryCase* sumCase = sumCaseColl->createAndAddSummaryCaseFromFileName(fileName);
sumCaseColl->updateAllRequiredEditors();
RiuMainPlotWindow* mainPlotWindow = app->getOrCreateAndShowMainPlotWindow();
if (mainPlotWindow)
{
mainPlotWindow->selectAsCurrentItem(sumCase);
}
app->addToRecentFiles(fileName);
return true;

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

@@ -109,7 +109,7 @@ void RicPasteSummaryCaseFeature::onActionTriggered(bool isChecked)
}
RicPasteFeatureImpl::clearClipboard();
summaryCaseMainCollection->updateConnectedEditors();
summaryCaseMainCollection->updateAllRequiredEditors();
}
}

3
ApplicationCode/ProjectDataModel/Summary/RimSummaryCaseMainCollection.cpp
View File

@@ -91,7 +91,6 @@ void RimSummaryCaseMainCollection::createSummaryCasesFromRelevantEclipseResultCa
{
// Create new GridSummaryCase
createAndAddSummaryCaseFromEclipseResultCase(eclResCase);
}
}
}
@@ -217,7 +216,7 @@ size_t RimSummaryCaseMainCollection::summaryCaseCount() const
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::allSummaryCases()
std::vector<RimSummaryCase*> RimSummaryCaseMainCollection::allSummaryCases() const
{
std::vector<RimSummaryCase*> cases;
this->descendantsIncludingThisOfType(cases);

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

@@ -39,7 +39,7 @@ public:
RimSummaryCase* summaryCase(size_t idx);
size_t summaryCaseCount() const;
std::vector<RimSummaryCase*> allSummaryCases();
std::vector<RimSummaryCase*> allSummaryCases() const;
std::vector<RimSummaryCase*> topLevelSummaryCases() const;
std::vector<RimSummaryCaseCollection*> summaryCaseCollections() const;