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

Merge branch '2018.01.01-patch' into dev

Browse Source
This commit is contained in:
Bjørn Erik Jensen 2018-01-26 15:56:37 +01:00
commit fbe9d2d73d
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/Commands/RicGridStatisticsDialog.cpp
View File

@ -142,7 +142,7 @@ void RicGridStatisticsDialog::setInfoText(RimGridView* view)
QString text; QString text;
text = overlayInfo->timeStepText(); text = overlayInfo->timeStepText();
text += overlayInfo->caseInfoText(); text += overlayInfo->caseInfoText();
text += overlayInfo->resultInfoText(overlayInfo->histogramData(), true); text += overlayInfo->resultInfoText(overlayInfo->histogramData());
m_textEdit->setText(text); m_textEdit->setText(text);
adjustTextEditHeightToContent(); adjustTextEditHeightToContent();
} }

6
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.cpp
View File

@ -204,12 +204,12 @@ QString Rim3dOverlayInfoConfig::caseInfoText()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
/// ///
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData, bool showVolumeWeightedMean) QString Rim3dOverlayInfoConfig::resultInfoText(const HistogramData& histData)
{ {
auto eclipseView = dynamic_cast<RimEclipseView*>(m_viewDef.p()); auto eclipseView = dynamic_cast<RimEclipseView*>(m_viewDef.p());
auto geoMechView = dynamic_cast<RimGeoMechView*>(m_viewDef.p()); auto geoMechView = dynamic_cast<RimGeoMechView*>(m_viewDef.p());
if (eclipseView) return resultInfoText(histData, eclipseView, showVolumeWeightedMean); if (eclipseView) return resultInfoText(histData, eclipseView, showVolumeWeightedMean());
if (geoMechView) return resultInfoText(histData, geoMechView); if (geoMechView) return resultInfoText(histData, geoMechView);
return ""; return "";
} }
@ -764,7 +764,7 @@ void Rim3dOverlayInfoConfig::updateEclipse3DInfo(RimEclipseView * eclipseView)
if (showResultInfo()) if (showResultInfo())
{ {
infoText += resultInfoText(histData, showVolumeWeightedMean()); infoText += resultInfoText(histData);
} }
if (!infoText.isEmpty()) if (!infoText.isEmpty())

2
ApplicationCode/ProjectDataModel/Rim3dOverlayInfoConfig.h
View File

@ -74,7 +74,7 @@ public:
HistogramData histogramData(); HistogramData histogramData();
QString timeStepText(); QString timeStepText();
QString caseInfoText(); QString caseInfoText();
QString resultInfoText(const HistogramData& histData, bool showVolumeWeightedMean); QString resultInfoText(const HistogramData& histData);
void showStatisticsInfoDialog(bool raise = true); void showStatisticsInfoDialog(bool raise = true);
QImage statisticsDialogScreenShotImage(); QImage statisticsDialogScreenShotImage();