OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-09 23:16:00 -06:00
Code Issues Packages Projects Releases Wiki Activity

Show fault result mapping in 3D info. Fixed display model update.

Browse Source
This commit is contained in:
Magne Sjaastad 2014-01-06 14:02:08 +01:00
parent cea0e37d30
commit 4391a4ff65
4 changed files with 33 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
View File

@ -435,7 +435,7 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC
transferNNCData(mainEclGrid, m_ecl_init_file, eclipseCase->mainGrid());
progInfo.incrementProgress();
progInfo.setProgressDescription("Processing NNC's");
progInfo.setProgressDescription("Processing NNC data");
progInfo.setNextProgressIncrement(20);
eclipseCase->mainGrid()->nncData()->processConnections( *(eclipseCase->mainGrid()));
progInfo.incrementProgress();

2
ApplicationCode/ModelVisualization/RivReservoirFaultsPartMgr.h
View File

@ -60,5 +60,5 @@ private:
cvf::ref<cvf::Transform> m_scaleTransform;
const RimFaultCollection* m_faultCollection;
cvf::Collection<RivFaultPartMgr> m_faultParts;
bool m_isFilterGenerated;
bool m_isFilterGenerated; // This fault geometry is created based on either range filter or property filter
};

30
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@ -112,6 +112,7 @@ void Rim3dOverlayInfoConfig::update3DInfo()
QString zScale;
QString propName;
QString cellEdgeName;
QString faultCellResultMapping;
if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData() && m_reservoirView->eclipseCase()->reservoirData()->mainGrid())
@ -155,6 +156,35 @@ void Rim3dOverlayInfoConfig::update3DInfo()
//infoText += QString("<blockquote><pre>Min: %1 P10: %2 Mean: %3 \n P90: %4 Max: %5 </pre></blockquote>").arg(min).arg(p10).arg(mean).arg(p90).arg(max);
infoText += QString("<table border=0 cellspacing=5 ><tr><td>Min</td><td>P10</td> <td>Mean</td> <td>P90</td> <td>Max</td> </tr>"
"<tr><td>%1</td><td> %2</td><td> %3</td><td> %4</td><td> %5 </td></tr></table>").arg(min).arg(p10).arg(mean).arg(p90).arg(max);
if (propName.compare(RimDefines::combinedTransmissibilityResultName(), Qt::CaseInsensitive) == 0
&& m_reservoirView->faultCollection()->showResultsOnFaults())
{
QString faultMapping;
bool isShowingGrid = m_reservoirView->faultCollection()->isGridVisualizationMode();
if (!isShowingGrid)
{
if (m_reservoirView->faultCollection()->faultResult() == RimFaultCollection::FAULT_BACK_FACE_CULLING)
{
faultMapping = "Show values from cells behind fault";
}
else if (m_reservoirView->faultCollection()->faultResult() == RimFaultCollection::FAULT_FRONT_FACE_CULLING)
{
faultMapping = "Show values from cells in front of fault";
}
else
{
faultMapping = "Show values from cells in front and behind fault";
}
}
else
{
faultMapping = "Show values from cells behind fault";
}
// infoText += QString("<b>Fault results : </b> %1<br>").arg(propName);
infoText += QString("<b>Fault results: </b> %1<br>").arg(faultMapping);
}
}

4
ApplicationCode/ProjectDataModel/RimReservoirView.cpp
View File

@ -1814,9 +1814,7 @@ void RimReservoirView::setShowFaultsOnly(bool showFaults)
if (meshMode() != NO_MESH) meshMode = m_previousGridModeMeshLinesWasFaults ? FAULTS_MESH: FULL_MESH;
}
this->createDisplayModel();
updateDisplayModelVisibility();
this->scheduleCreateDisplayModelAndRedraw();
}
//--------------------------------------------------------------------------------------------------