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

#5539 Restore value axis when switching orientation

Browse Source 
Use vertical bar text.
This commit is contained in:
Jacob Støren
2020-02-24 10:18:43 +01:00
parent 78310080e5
commit 3b0aacb666
3 changed files with 36 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.cpp
View File

@@ -56,9 +56,9 @@ void caf::AppEnum<RimAnalysisPlot::SortGroupType>::setUp()
template <>
void caf::AppEnum<RimAnalysisPlot::BarOrientation>::setUp()
{
addItem( RimAnalysisPlot::BAR_HORIZONTAL, "BAR_HORIZONTAL", "Horizontal" );
addItem( RimAnalysisPlot::BARS_HORIZONTAL, "BARS_HORIZONTAL", "Horizontal" );
addItem( RimAnalysisPlot::BARS_VERTICAL, "BARS_VERTICAL", "Vertical" );
setDefault( RimAnalysisPlot::BAR_HORIZONTAL );
setDefault( RimAnalysisPlot::BARS_VERTICAL );
}
} // namespace caf
@@ -438,9 +438,9 @@ void RimAnalysisPlot::onLoadDataAndUpdate()
RiuGroupedBarChartBuilder chartBuilder;
// buildTestPlot( chartBuilder );
buildChart( chartBuilder );
addDataToChartBuilder( chartBuilder );
chartBuilder.addBarChartToPlot( m_plotWidget, m_barOrientation == BAR_HORIZONTAL ? Qt::Horizontal : Qt::Vertical );
chartBuilder.addBarChartToPlot( m_plotWidget, m_barOrientation == BARS_HORIZONTAL ? Qt::Horizontal : Qt::Vertical );
if ( m_showPlotLegends && m_plotWidget->legend() == nullptr )
{
@@ -462,7 +462,7 @@ void RimAnalysisPlot::onLoadDataAndUpdate()
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RimAnalysisPlot::buildChart( RiuGroupedBarChartBuilder& chartBuilder )
void RimAnalysisPlot::addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBuilder )
{
for ( const RimAnalysisPlotDataEntry* dataEntry : m_data )
{

4
ApplicationCode/ProjectDataModel/AnalysisPlots/RimAnalysisPlot.h
View File

@@ -105,7 +105,7 @@ private:
void defineUiOrdering( QString uiConfigName, caf::PdmUiOrdering& uiOrdering ) override;
void onLoadDataAndUpdate() override;
void buildChart( RiuGroupedBarChartBuilder& chartBuilder );
void addDataToChartBuilder( RiuGroupedBarChartBuilder& chartBuilder );
void buildTestPlot( RiuGroupedBarChartBuilder& chartBuilder );
void updatePlotTitle();
@@ -119,7 +119,7 @@ private:
public:
enum BarOrientation
{
BAR_HORIZONTAL,
BARS_HORIZONTAL,
BARS_VERTICAL
};