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

#2413 2D intersection view: Use correct cell result in infoText

Browse Source
This commit is contained in:
Rebecca Cox 2018-02-14 10:54:28 +01:00
parent cb38d435cd
commit eedf182620
3 changed files with 32 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ApplicationCode/ProjectDataModel/Rim2dIntersectionView.cpp
View File

@ -340,9 +340,6 @@ void Rim2dIntersectionView::updateLegends()
if (!hasResults()) return;
RimCase* rimCase = nullptr;
m_intersection->firstAncestorOrThisOfType(rimCase);
QString overlayInfoText;
overlayInfoText += "<b>--" + ownerCase()->caseUserDescription() + "--</b>";
@ -387,7 +384,38 @@ void Rim2dIntersectionView::updateLegends()
m_intersection->firstAncestorOrThisOfType(geoView);
if (geoView)
{
overlayInfoText += "<b>Cell Result:</b> " + geoView->cellResult()->legendConfig()->title() + "<br>";
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("<b>Cell result:</b> %1, %2<br>").arg(resultPos).arg(fieldName);
}
else
{
overlayInfoText += QString("<b>Cell result:</b> %1, %2, %3<br>").arg(resultPos).arg(fieldName).arg(compName);
}
m_legendConfig()->setUiValuesFromLegendConfig(geoView->cellResult()->legendConfig());

15
ApplicationCode/ProjectDataModel/RimLegendConfig.cpp
View File

@ -674,21 +674,6 @@ void RimLegendConfig::setTitle(const QString& title)
m_categoryLegend->setTitle(cvfTitle);
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
QString RimLegendConfig::title() const
{
if (m_currentScalarMapper == m_categoryMapper)
{
return cvfqt::Utils::toQString(m_categoryLegend->title());
}
else
{
return cvfqt::Utils::toQString(m_scalarMapperLegend->title());
}
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------

1
ApplicationCode/ProjectDataModel/RimLegendConfig.h
View File

@ -115,7 +115,6 @@ public:
QString categoryNameFromCategoryValue(double categoryResultValue) const;
void setTitle(const QString& title);
QString title() const;
void setUiValuesFromLegendConfig(const RimLegendConfig* otherLegendConfig);