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

RimCase reintroduced as baseclass for all cases

Browse Source 
Refactored to handle cases generically in  a lot of places.
Mostly complete regarding all these issues, but not tested yet:
Assigning caseId
Update relative path to the case data
RimProject::createDisplayModelAndRedrawAllViews
RimProject::computeUtmAreaOfInterest
Load case data on project open
save snapshots for all views
RegressionTest viewer size
Finding case based on caseId
Giving case information to octave
This commit is contained in:
Jacob Støren
2015-05-15 18:51:49 +02:00
parent b111a26f21
commit 969a181897
26 changed files with 453 additions and 247 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ApplicationCode/UserInterface/RiuMainWindow.cpp
View File

@@ -1329,18 +1329,20 @@ void RiuMainWindow::slotSubWindowActivated(QMdiSubWindow* subWindow)
if (!proj) return;
// Iterate all cases in each oil field
std::vector<RimEclipseCase*> allCases;
std::vector<RimCase*> allCases;
proj->allCases(allCases);
for (size_t caseIdx = 0; caseIdx < allCases.size(); ++caseIdx)
{
RimEclipseCase* reservoirCase = allCases[caseIdx];
RimCase* reservoirCase = allCases[caseIdx];
if (reservoirCase == NULL) continue;
std::vector<RimView*> views = reservoirCase->views();
size_t viewIdx;
for (viewIdx = 0; viewIdx < reservoirCase->reservoirViews().size(); viewIdx++)
for (viewIdx = 0; viewIdx < views.size(); viewIdx++)
{
RimReservoirView* riv = reservoirCase->reservoirViews()[viewIdx];
RimView* riv = views[viewIdx];
if (riv &&
riv->viewer() &&
@@ -1858,7 +1860,7 @@ void RiuMainWindow::updateScaleValue()
//--------------------------------------------------------------------------------------------------
/// TODO: This function will be moved to a class responsible for handling the application selection concept
//--------------------------------------------------------------------------------------------------
void RiuMainWindow::selectedCases(std::vector<RimEclipseCase*>& cases)
void RiuMainWindow::selectedCases(std::vector<RimCase*>& cases)
{
if (m_treeView && m_treeView->selectionModel())
{
@@ -1867,7 +1869,7 @@ void RiuMainWindow::selectedCases(std::vector<RimEclipseCase*>& cases)
caf::PdmObjectGroup group;
m_treeModelPdm->populateObjectGroupFromModelIndexList(selectedModelIndexes, &group);
std::vector<caf::PdmPointer<RimEclipseCase> > typedObjects;
std::vector<caf::PdmPointer<RimCase> > typedObjects;
group.objectsByType(&typedObjects);
for (size_t i = 0; i < typedObjects.size(); i++)

3
ApplicationCode/UserInterface/RiuMainWindow.h
View File

@@ -43,6 +43,7 @@ class RiuProcessMonitor;
class RimUiTreeModelPdm;
class RimUiTreeView;
class RimEclipseCase;
class RimCase;
namespace caf
{
@@ -93,7 +94,7 @@ public:
void setCurrentObjectInTreeView(caf::PdmObject* object);
void selectedCases(std::vector<RimEclipseCase*>& cases);
void selectedCases(std::vector<RimCase*>& cases);
void setDefaultWindowSize();