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

#4016 Observed Data : Add feature to reload summary Observed Data

Browse Source
This commit is contained in:
Magne Sjaastad
2019-04-05 10:46:44 +02:00
parent 26f89f6e35
commit 7d242bffb5
2 changed files with 34 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
ApplicationCode/Commands/RicReloadSummaryCaseFeature.cpp
View File

@@ -23,6 +23,8 @@
#include "RiaSummaryTools.h" #include "RiaSummaryTools.h"
#include "RimMainPlotCollection.h" #include "RimMainPlotCollection.h"
#include "RimObservedData.h"
#include "RimObservedDataCollection.h"
#include "RimProject.h" #include "RimProject.h"
#include "RimSummaryCase.h" #include "RimSummaryCase.h"
#include "RimSummaryCaseCollection.h" #include "RimSummaryCaseCollection.h"
@@ -44,20 +46,7 @@ bool RicReloadSummaryCaseFeature::isCommandEnabled()
{ {
std::vector<RimSummaryCase*> caseSelection = selectedSummaryCases(); std::vector<RimSummaryCase*> caseSelection = selectedSummaryCases();
if (caseSelection.size() == 0) return !caseSelection.empty();
{
return false;
}
for (RimSummaryCase* summaryCase : caseSelection)
{
if (summaryCase->isObservedData())
{
return false;
}
}
return true;
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -106,6 +95,7 @@ std::vector<RimSummaryCase*> RicReloadSummaryCaseFeature::selectedSummaryCases()
std::vector<RimSummaryCase*> caseSelection; std::vector<RimSummaryCase*> caseSelection;
caf::SelectionManager::instance()->objectsByType(&caseSelection); caf::SelectionManager::instance()->objectsByType(&caseSelection);
{
std::vector<RimSummaryCaseCollection*> collectionSelection; std::vector<RimSummaryCaseCollection*> collectionSelection;
caf::SelectionManager::instance()->objectsByType(&collectionSelection); caf::SelectionManager::instance()->objectsByType(&collectionSelection);
@@ -114,6 +104,18 @@ std::vector<RimSummaryCase*> RicReloadSummaryCaseFeature::selectedSummaryCases()
std::vector<RimSummaryCase*> summaryCaseCollection = collection->allSummaryCases(); std::vector<RimSummaryCase*> summaryCaseCollection = collection->allSummaryCases();
caseSelection.insert(caseSelection.end(), summaryCaseCollection.begin(), summaryCaseCollection.end()); caseSelection.insert(caseSelection.end(), summaryCaseCollection.begin(), summaryCaseCollection.end());
} }
}
{
std::vector<RimObservedDataCollection*> collectionSelection;
caf::SelectionManager::instance()->objectsByType(&collectionSelection);
for (auto collection : collectionSelection)
{
std::vector<RimObservedData*> observedCases = collection->allObservedData();
caseSelection.insert(caseSelection.end(), observedCases.begin(), observedCases.end());
}
}
return caseSelection; return caseSelection;
} }