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

52
ApplicationCode/Application/RiaApplication.cpp
View File

@@ -363,24 +363,24 @@ bool RiaApplication::loadProject(const QString& projectFileName, ProjectLoadActi
// Now load the ReservoirViews for the cases
// Add all "native" cases in the project
std::vector<RimEclipseCase*> casesToLoad;
std::vector<RimCase*> casesToLoad;
m_project->allCases(casesToLoad);
caf::ProgressInfo caseProgress(casesToLoad.size() , "Reading Cases");
for (size_t cIdx = 0; cIdx < casesToLoad.size(); ++cIdx)
{
RimEclipseCase* ri = casesToLoad[cIdx];
CVF_ASSERT(ri);
RimCase* cas = casesToLoad[cIdx];
CVF_ASSERT(cas);
caseProgress.setProgressDescription(ri->caseUserDescription());
caf::ProgressInfo viewProgress(ri->reservoirViews().size() , "Creating Views");
caseProgress.setProgressDescription(cas->caseUserDescription());
std::vector<RimView*> views = cas->views();
caf::ProgressInfo viewProgress(views.size() , "Creating Views");
size_t j;
for (j = 0; j < ri->reservoirViews().size(); j++)
for (j = 0; j < views.size(); j++)
{
RimReservoirView* riv = ri->reservoirViews[j];
RimView* riv = views[j];
CVF_ASSERT(riv);
viewProgress.setProgressDescription(riv->name());
@@ -1526,17 +1526,19 @@ void RiaApplication::saveSnapshotForAllViews(const QString& snapshotFolderName)
const QString absSnapshotPath = snapshotPath.absolutePath();
std::vector<RimEclipseCase*> projectCases;
std::vector<RimCase*> projectCases;
m_project->allCases(projectCases);
for (size_t i = 0; i < projectCases.size(); i++)
{
RimEclipseCase* ri = projectCases[i];
if (!ri) continue;
RimCase* cas = projectCases[i];
if (!cas) continue;
for (size_t j = 0; j < ri->reservoirViews().size(); j++)
std::vector<RimView*> views = cas->views();
for (size_t j = 0; j < views.size(); j++)
{
RimReservoirView* riv = ri->reservoirViews()[j];
RimView* riv = views[j];
if (riv && riv->viewer())
{
@@ -1548,7 +1550,7 @@ void RiaApplication::saveSnapshotForAllViews(const QString& snapshotFolderName)
// Process all events to avoid a black image when grabbing frame buffer
QCoreApplication::processEvents();
QString fileName = ri->caseUserDescription() + "-" + riv->name();
QString fileName = cas->caseUserDescription() + "-" + riv->name();
fileName.replace(" ", "_");
QString absoluteFileName = caf::Utils::constructFullFileName(absSnapshotPath, fileName, ".png");
@@ -2104,17 +2106,20 @@ void RiaApplication::regressionTestConfigureProject()
if (m_project.isNull()) return;
std::vector<RimEclipseCase*> projectCases;
std::vector<RimCase*> projectCases;
m_project->allCases(projectCases);
for (size_t i = 0; i < projectCases.size(); i++)
{
RimEclipseCase* ri = projectCases[i];
if (!ri) continue;
RimCase* cas = projectCases[i];
if (!cas) continue;
for (size_t j = 0; j < ri->reservoirViews().size(); j++)
std::vector<RimView*> views = cas->views();
for (size_t j = 0; j < views.size(); j++)
{
RimReservoirView* riv = ri->reservoirViews()[j];
RimView* riv = views[j];
if (riv && riv->viewer())
{
@@ -2122,8 +2127,13 @@ void RiaApplication::regressionTestConfigureProject()
riv->viewer()->setFixedSize(1000, 745);
}
riv->faultCollection->setShowFaultsOutsideFilters(false);
riv->faultResultSettings->showCustomFaultResult.setValueFromUi(false);
RimReservoirView* resvView = dynamic_cast<RimReservoirView*>(riv);
if (resvView)
{
resvView->faultCollection->setShowFaultsOutsideFilters(false);
resvView->faultResultSettings->showCustomFaultResult.setValueFromUi(false);
}
}
}
}