#968 Added checkboxes used to show/hide plot axis

This commit is contained in:
Magne Sjaastad
2016-11-11 15:38:02 +01:00
parent 0828b3b64c
commit e98fc23787
5 changed files with 84 additions and 23 deletions

View File

@@ -178,17 +178,6 @@ void RimSummaryPlot::updateAxis(RimDefines::PlotAxis plotAxis)
{
if (!m_qwtPlot) return;
std::vector<RimSummaryCurve*> curves = curvesForAxis(plotAxis);
std::vector<RimSummaryCurveFilter*> curveFiltersForAxis;
for (RimSummaryCurveFilter* cs : m_curveFilters)
{
if (cs->associatedPlotAxis() == plotAxis)
{
curveFiltersForAxis.push_back(cs);
}
}
QwtPlot::Axis qwtAxis = QwtPlot::yLeft;
RimSummaryYAxisProperties* yAxisProperties = nullptr;
if (plotAxis == RimDefines::PLOT_AXIS_LEFT)
@@ -202,16 +191,34 @@ void RimSummaryPlot::updateAxis(RimDefines::PlotAxis plotAxis)
yAxisProperties = m_rightYAxisProperties();
}
if (curves.size() > 0)
if (!yAxisProperties->isActive())
{
m_qwtPlot->enableAxis(qwtAxis, true);
RimSummaryCurvesCalculator calc(yAxisProperties, curves, curveFiltersForAxis);
calc.applyPropertiesToPlot(m_qwtPlot);
m_qwtPlot->enableAxis(qwtAxis, false);
}
else
{
m_qwtPlot->enableAxis(qwtAxis, false);
std::vector<RimSummaryCurve*> curves = curvesForAxis(plotAxis);
std::vector<RimSummaryCurveFilter*> curveFiltersForAxis;
for (RimSummaryCurveFilter* cs : m_curveFilters)
{
if (cs->associatedPlotAxis() == plotAxis)
{
curveFiltersForAxis.push_back(cs);
}
}
if (curves.size() > 0)
{
m_qwtPlot->enableAxis(qwtAxis, true);
RimSummaryCurvesCalculator calc(yAxisProperties, curves, curveFiltersForAxis);
calc.applyPropertiesToPlot(m_qwtPlot);
}
else
{
m_qwtPlot->enableAxis(qwtAxis, false);
}
}
}
@@ -243,6 +250,15 @@ void RimSummaryPlot::updateTimeAxis()
{
if (!m_qwtPlot) return;
if (!m_timeAxisProperties->isActive())
{
m_qwtPlot->enableAxis(QwtPlot::xBottom, false);
return;
}
m_qwtPlot->enableAxis(QwtPlot::xBottom, true);
{
QString axisTitle;
if (m_timeAxisProperties->showTitle) axisTitle = m_timeAxisProperties->title();