mirror of
https://github.com/OPM/ResInsight.git
synced 2026-09-03 20:53:13 -05:00
Show fault result mapping in 3D info. Fixed display model update.
This commit is contained in:
@@ -435,7 +435,7 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC
|
|||||||
transferNNCData(mainEclGrid, m_ecl_init_file, eclipseCase->mainGrid());
|
transferNNCData(mainEclGrid, m_ecl_init_file, eclipseCase->mainGrid());
|
||||||
progInfo.incrementProgress();
|
progInfo.incrementProgress();
|
||||||
|
|
||||||
progInfo.setProgressDescription("Processing NNC's");
|
progInfo.setProgressDescription("Processing NNC data");
|
||||||
progInfo.setNextProgressIncrement(20);
|
progInfo.setNextProgressIncrement(20);
|
||||||
eclipseCase->mainGrid()->nncData()->processConnections( *(eclipseCase->mainGrid()));
|
eclipseCase->mainGrid()->nncData()->processConnections( *(eclipseCase->mainGrid()));
|
||||||
progInfo.incrementProgress();
|
progInfo.incrementProgress();
|
||||||
|
|||||||
@@ -60,5 +60,5 @@ private:
|
|||||||
cvf::ref<cvf::Transform> m_scaleTransform;
|
cvf::ref<cvf::Transform> m_scaleTransform;
|
||||||
const RimFaultCollection* m_faultCollection;
|
const RimFaultCollection* m_faultCollection;
|
||||||
cvf::Collection<RivFaultPartMgr> m_faultParts;
|
cvf::Collection<RivFaultPartMgr> m_faultParts;
|
||||||
bool m_isFilterGenerated;
|
bool m_isFilterGenerated; // This fault geometry is created based on either range filter or property filter
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -112,6 +112,7 @@ void Rim3dOverlayInfoConfig::update3DInfo()
|
|||||||
QString zScale;
|
QString zScale;
|
||||||
QString propName;
|
QString propName;
|
||||||
QString cellEdgeName;
|
QString cellEdgeName;
|
||||||
|
QString faultCellResultMapping;
|
||||||
|
|
||||||
|
|
||||||
if (m_reservoirView->eclipseCase() && m_reservoirView->eclipseCase()->reservoirData() && m_reservoirView->eclipseCase()->reservoirData()->mainGrid())
|
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("<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>"
|
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);
|
"<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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1814,9 +1814,7 @@ void RimReservoirView::setShowFaultsOnly(bool showFaults)
|
|||||||
if (meshMode() != NO_MESH) meshMode = m_previousGridModeMeshLinesWasFaults ? FAULTS_MESH: FULL_MESH;
|
if (meshMode() != NO_MESH) meshMode = m_previousGridModeMeshLinesWasFaults ? FAULTS_MESH: FULL_MESH;
|
||||||
}
|
}
|
||||||
|
|
||||||
this->createDisplayModel();
|
this->scheduleCreateDisplayModelAndRedraw();
|
||||||
updateDisplayModelVisibility();
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
//--------------------------------------------------------------------------------------------------
|
//--------------------------------------------------------------------------------------------------
|
||||||
|
|||||||
Reference in New Issue
Block a user