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

Minor issues when preparing user course

Browse Source 
* Grid Cross Plot: Always show grouping icons with color
* Grid Cross Plot: Make sure the info box text content is updated
* Bump version to RC_05
This commit is contained in:
Magne Sjaastad
2022-09-14 16:10:52 +02:00
committed by GitHub
parent 52cee02ffe
commit 2973127363
4 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.cpp
View File

@@ -299,8 +299,8 @@ void RimGridCrossPlot::updateInfoBox()
new RiuDraggableOverlayFrame( m_plotWidget->getParentForOverlay(), m_plotWidget->overlayMargins() ); new RiuDraggableOverlayFrame( m_plotWidget->getParentForOverlay(), m_plotWidget->overlayMargins() );
m_infoBox->setAnchorCorner( RiuDraggableOverlayFrame::AnchorCorner::TopRight ); m_infoBox->setAnchorCorner( RiuDraggableOverlayFrame::AnchorCorner::TopRight );
RiuTextOverlayContentFrame* textFrame = new RiuTextOverlayContentFrame( m_infoBox ); RiuTextOverlayContentFrame* textFrame = new RiuTextOverlayContentFrame( m_infoBox );
textFrame->setText( generateInfoBoxText() );
m_infoBox->setContentFrame( textFrame ); m_infoBox->setContentFrame( textFrame );
m_infoBoxTextFrame = textFrame;
} }
m_plotWidget->addOverlayFrame( m_infoBox ); m_plotWidget->addOverlayFrame( m_infoBox );
} }
@@ -314,6 +314,11 @@ void RimGridCrossPlot::updateInfoBox()
} }
} }
} }
if ( m_infoBoxTextFrame )
{
m_infoBoxTextFrame->setText( generateInfoBoxText() );
}
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -624,6 +629,7 @@ void RimGridCrossPlot::updateCurveNamesAndPlotTitle()
m_plotWidget->setPlotTitleEnabled( m_showPlotTitle && !isSubPlot() ); m_plotWidget->setPlotTitleEnabled( m_showPlotTitle && !isSubPlot() );
} }
updateMdiWindowTitle(); updateMdiWindowTitle();
updateInfoBox();
} }
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
@@ -739,6 +745,7 @@ void RimGridCrossPlot::setYAxisInverted( bool inverted )
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RimGridCrossPlot::doUpdateLayout() void RimGridCrossPlot::doUpdateLayout()
{ {
updateInfoBox();
updateLegend(); updateLegend();
updatePlot(); updatePlot();
} }

2
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlot.h
View File

@@ -35,6 +35,7 @@ class RimGridCrossPlotDataSet;
class RiuDraggableOverlayFrame; class RiuDraggableOverlayFrame;
class RiuGridCrossQwtPlot; class RiuGridCrossQwtPlot;
class RimPlotCurve; class RimPlotCurve;
class RiuTextOverlayContentFrame;
class RimGridCrossPlotNameConfig : public RimNameConfig class RimGridCrossPlotNameConfig : public RimNameConfig
{ {
@@ -161,4 +162,5 @@ private:
QPointer<RiuGridCrossQwtPlot> m_plotWidget; QPointer<RiuGridCrossQwtPlot> m_plotWidget;
QPointer<RiuDraggableOverlayFrame> m_infoBox; QPointer<RiuDraggableOverlayFrame> m_infoBox;
QPointer<RiuTextOverlayContentFrame> m_infoBoxTextFrame;
}; };

1
ApplicationLibCode/ProjectDataModel/GridCrossPlots/RimGridCrossPlotDataSet.cpp
View File

@@ -1093,7 +1093,6 @@ void RimGridCrossPlotDataSet::updateLegendIcons()
for ( auto curve : m_crossPlotCurves ) for ( auto curve : m_crossPlotCurves )
{ {
curve->determineLegendIcon(); curve->determineLegendIcon();
curve->setBlackAndWhiteLegendIcons( groupingEnabled() );
} }
} }

2
ResInsightVersion.cmake
View File

@@ -5,7 +5,7 @@ set(RESINSIGHT_PATCH_VERSION 1)
# Opional text with no restrictions # Opional text with no restrictions
#set(RESINSIGHT_VERSION_TEXT "-dev") #set(RESINSIGHT_VERSION_TEXT "-dev")
set(RESINSIGHT_VERSION_TEXT "-RC_04") set(RESINSIGHT_VERSION_TEXT "-RC_05")
# Optional text # Optional text
# Must be unique and increasing within one combination of major/minor/patch version # Must be unique and increasing within one combination of major/minor/patch version