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

Fault result: Moved fault result up one level in tree view

Browse Source
This commit is contained in:
Magne Sjaastad
2014-08-01 12:55:43 +02:00
parent 86b74e383e
commit 79fbe65686
8 changed files with 92 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@@ -103,7 +103,7 @@ RimReservoirView::RimReservoirView()
CAF_PDM_InitFieldNoDefault(&cellEdgeResult, "GridCellEdgeResult", "Cell Edge Result", ":/EdgeResult_1.png", "", "");
cellEdgeResult = new RimCellEdgeResultSlot();
CAF_PDM_InitFieldNoDefault(&faultResultSettings, "FaultResultSettings", "Fault Result Settings", ":/draw_style_faults_24x24.png", "", "");
CAF_PDM_InitFieldNoDefault(&faultResultSettings, "FaultResultSettings", "Fault Result Settings", "", "", "");
faultResultSettings = new RimFaultResultSettings();
CAF_PDM_InitFieldNoDefault(&overlayInfoConfig, "OverlayInfoConfig", "Info Box", "", "", "");
@@ -933,14 +933,15 @@ void RimReservoirView::loadDataAndUpdate()
CVF_ASSERT(this->cellResult() != NULL);
this->cellResult()->loadResult();
if (m_reservoir->reservoirData()->activeCellInfo(RifReaderInterface::FRACTURE_RESULTS)->globalActiveCellCount() == 0)
{
this->cellResult->setPorosityModelUiFieldHidden(true);
}
CVF_ASSERT(this->cellEdgeResult() != NULL);
this->cellEdgeResult()->loadResult();
if (this->faultResultSettings()->customFaultResult())
{
this->faultResultSettings()->customFaultResult()->loadResult();
}
this->faultResultSettings()->updateFieldVisibility();
updateViewerWidget();
this->propertyFilterCollection()->loadAndInitializePropertyFilters();