diff --git a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp index 889afbc09f..2832b0e13a 100644 --- a/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp +++ b/ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp @@ -166,6 +166,113 @@ bool Rim2dIntersectionView::isTimeStepDependentDataVisible() const return false; } +//-------------------------------------------------------------------------------------------------- +/// +//-------------------------------------------------------------------------------------------------- +void Rim2dIntersectionView::update3dInfo() +{ + if (!m_viewer) return; + + QString overlayInfoText; + + RimEclipseView * eclView = nullptr; + m_intersection->firstAncestorOrThisOfType(eclView); + if (eclView && eclView->overlayInfoConfig()->showCaseInfo()) + { + overlayInfoText += "--" + ownerCase()->caseUserDescription() + "--"; + } + + RimGeoMechView * geoView = nullptr; + m_intersection->firstAncestorOrThisOfType(geoView); + if (geoView && geoView->overlayInfoConfig()->showCaseInfo()) + { + overlayInfoText += "--" + ownerCase()->caseUserDescription() + "--"; + } + + overlayInfoText += "
";
+ overlayInfoText += "Intersection: " + m_intersection->name() + "
";
+
+ if (m_intersection->simulationWell())
+ {
+ overlayInfoText += "Simulation Well: " + m_intersection->simulationWell()->name() + "
";;
+ }
+ else if (m_intersection->wellPath())
+ {
+ overlayInfoText += "Well Path: " + m_intersection->wellPath()->name() + "
";;
+ }
+
+ if (eclView)
+ {
+ if (eclView->overlayInfoConfig()->showAnimProgress())
+ {
+ m_viewer->showAnimationProgress(true);
+ }
+ else
+ {
+ m_viewer->showAnimationProgress(false);
+ }
+
+ if (eclView->overlayInfoConfig()->showResultInfo())
+ {
+ overlayInfoText += "Cell Result: " + eclView->cellResult()->resultVariableUiShortName() + "
";
+ }
+ }
+
+ if (geoView)
+ {
+ if (geoView->overlayInfoConfig()->showAnimProgress())
+ {
+ m_viewer->showAnimationProgress(true);
+ }
+ else
+ {
+ m_viewer->showAnimationProgress(false);
+ }
+
+ if (geoView->overlayInfoConfig()->showResultInfo())
+ {
+ QString resultPos;
+ QString fieldName = geoView->cellResultResultDefinition()->resultFieldUiName();
+ QString compName = geoView->cellResultResultDefinition()->resultComponentUiName();
+
+ switch (geoView->cellResultResultDefinition()->resultPositionType())
+ {
+ case RIG_NODAL:
+ resultPos = "Nodal";
+ break;
+
+ case RIG_ELEMENT_NODAL:
+ resultPos = "Element nodal";
+ break;
+
+ case RIG_INTEGRATION_POINT:
+ resultPos = "Integration point";
+ break;
+
+ case RIG_ELEMENT:
+ resultPos = "Element";
+ break;
+ default:
+ break;
+ }
+ if (compName == "")
+ {
+ overlayInfoText += QString("Cell result: %1, %2
").arg(resultPos).arg(fieldName);
+ }
+ else
+ {
+ overlayInfoText += QString("Cell result: %1, %2, %3
").arg(resultPos).arg(fieldName).arg(compName);
+ }
+ }
+ }
+
+
+ overlayInfoText += "
";
- overlayInfoText += "Intersection: " + m_intersection->name() + "
";
-
- if (m_intersection->simulationWell())
- {
- overlayInfoText += "Simulation Well: " + m_intersection->simulationWell()->name() + "
";;
- }
- else if (m_intersection->wellPath())
- {
- overlayInfoText += "Well Path: " + m_intersection->wellPath()->name() + "
";;
- }
cvf::OverlayItem* legend = nullptr;
if (eclView)
{
- if (eclView->overlayInfoConfig()->showAnimProgress())
- {
- m_viewer->showAnimationProgress(true);
- }
- else
- {
- m_viewer->showAnimationProgress(false);
- }
-
- if (eclView->overlayInfoConfig()->showResultInfo())
- {
- overlayInfoText += "Cell Result: " + eclView->cellResult()->resultVariableUiShortName() + "
";
- }
-
m_legendConfig()->setUiValuesFromLegendConfig(eclView->cellResult()->legendConfig());
m_ternaryLegendConfig()->setUiValuesFromLegendConfig(eclView->cellResult()->ternaryLegendConfig());
@@ -404,51 +476,6 @@ void Rim2dIntersectionView::updateLegends()
if (geoView)
{
- if (geoView->overlayInfoConfig()->showAnimProgress())
- {
- m_viewer->showAnimationProgress(true);
- }
- else
- {
- m_viewer->showAnimationProgress(false);
- }
-
- if (geoView->overlayInfoConfig()->showResultInfo())
- {
- QString resultPos;
- QString fieldName = geoView->cellResultResultDefinition()->resultFieldUiName();
- QString compName = geoView->cellResultResultDefinition()->resultComponentUiName();
-
- switch (geoView->cellResultResultDefinition()->resultPositionType())
- {
- case RIG_NODAL:
- resultPos = "Nodal";
- break;
-
- case RIG_ELEMENT_NODAL:
- resultPos = "Element nodal";
- break;
-
- case RIG_INTEGRATION_POINT:
- resultPos = "Integration point";
- break;
-
- case RIG_ELEMENT:
- resultPos = "Element";
- break;
- default:
- break;
- }
- if (compName == "")
- {
- overlayInfoText += QString("Cell result: %1, %2
").arg(resultPos).arg(fieldName);
- }
- else
- {
- overlayInfoText += QString("Cell result: %1, %2, %3
").arg(resultPos).arg(fieldName).arg(compName);
- }
- }
-
m_legendConfig()->setUiValuesFromLegendConfig(geoView->cellResult()->legendConfig());
geoView->updateLegendTextAndRanges(m_legendConfig(), m_currentTimeStep());
@@ -459,10 +486,6 @@ void Rim2dIntersectionView::updateLegends()
{
m_viewer->addColorLegendToBottomLeftCorner(legend);
}
-
- overlayInfoText += "