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
};

44
ApplicationCode/UserInterface/AnalysisPlots/RiuGroupedBarChartBuilder.cpp
View File

@@ -65,8 +65,8 @@ public:
}
painter->fillRect( r,
this->palette()
.window() ); // This line here is the difference. Qwt adds a 1 to width and height.
this->palette().window() ); // This line here is the difference. Qwt adds a 1
// to width and height.
}
break;
default:
@@ -185,7 +185,9 @@ protected:
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
RiuGroupedBarChartBuilder::RiuGroupedBarChartBuilder() {}
RiuGroupedBarChartBuilder::RiuGroupedBarChartBuilder()
{
}
//--------------------------------------------------------------------------------------------------
///
@@ -198,14 +200,13 @@ void RiuGroupedBarChartBuilder::addBarEntry( const QString& majorTickText,
const QString& barText,
const double value )
{
m_sortedBarEntries.insert(
BarEntry( majorTickText, midTickText, minTickText, sortValue, legendText, barText, value ) );
m_sortedBarEntries.insert( BarEntry( majorTickText, midTickText, minTickText, sortValue, legendText, barText, value ) );
}
//--------------------------------------------------------------------------------------------------
///
//--------------------------------------------------------------------------------------------------
void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientation orientation )
void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientation barOrientation )
{
const double majGroupSpacing = 1.6;
const double midGroupSpacing = 0.5;
@@ -382,16 +383,19 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
legendToBarPointsPair.second,
legendToBarPointsPair.first,
RiaColorTables::summaryCurveDefaultPaletteColors().cycledQColor( idx ),
orientation );
barOrientation );
idx++;
}
// Set up the axis to contain group texts and tick marks
{
QwtPlot::Axis axis = QwtPlot::xBottom;
if ( orientation == Qt::Horizontal )
QwtPlot::Axis axis = QwtPlot::xBottom;
QwtPlot::Axis valueAxis = QwtPlot::yLeft;
if ( barOrientation == Qt::Horizontal )
{
axis = QwtPlot::yLeft;
axis = QwtPlot::yLeft;
valueAxis = QwtPlot::xBottom;
}
QwtScaleDiv groupAxisScaleDiv( 0, currentBarPosition );
@@ -400,7 +404,7 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
if ( midTickPositions.size() ) groupAxisScaleDiv.setTicks( QwtScaleDiv::MediumTick, midTickPositions );
if ( minTickPositions.size() ) groupAxisScaleDiv.setTicks( QwtScaleDiv::MinorTick, minTickPositions );
if ( orientation == Qt::Horizontal )
if ( barOrientation == Qt::Horizontal )
{
groupAxisScaleDiv.invert();
}
@@ -410,14 +414,22 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
plot->setAxisScaleDraw( axis, scaleDrawer );
plot->setAxisScaleDiv( axis, groupAxisScaleDiv );
// Set up the value axis
plot->setAxisAutoScale( valueAxis, true );
plot->setAxisScaleDraw( valueAxis, new QwtScaleDraw() );
}
// Add texts on the bars inside the plot
{
QwtScaleDraw::Alignment alignment = QwtScaleDraw::TopScale;
if ( orientation == Qt::Horizontal )
QwtScaleDraw::Alignment alignment = QwtScaleDraw::TopScale;
double labelRotation = -90.0;
Qt::Alignment labelAlignment = Qt::AlignVCenter | Qt::AlignRight;
if ( barOrientation == Qt::Horizontal )
{
alignment = QwtScaleDraw::RightScale;
alignment = QwtScaleDraw::RightScale;
labelRotation = 0.0;
}
QwtScaleDiv barTextScaleDiv( 0, currentBarPosition );
@@ -430,7 +442,7 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
}
barTextScaleDiv.setTicks( QwtScaleDiv::MinorTick, onBarTickPositions );
if ( orientation == Qt::Horizontal )
if ( barOrientation == Qt::Horizontal )
{
barTextScaleDiv.invert();
}
@@ -438,6 +450,8 @@ void RiuGroupedBarChartBuilder::addBarChartToPlot( QwtPlot* plot, Qt::Orientatio
RiuBarChartScaleDraw* barTextScaleDrawer = new RiuBarChartScaleDraw( positionedBarLabels );
barTextScaleDrawer->setAlignment( alignment );
barTextScaleDrawer->setLabelRotation( labelRotation );
barTextScaleDrawer->setLabelAlignment( labelAlignment );
QwtPlotScaleItem* barTextScale = new QwtPlotScaleItem( alignment, 0.0 );
barTextScale->setScaleDraw( barTextScaleDrawer );