diff --git a/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp b/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp index 1ec99df7e513b3adb286a97d574d3d953f75fc09..f0cee30737a961318a0e2406d5777738eb128313 100644 --- a/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp +++ b/Code/Mantid/MantidPlot/src/ApplicationWindow.cpp @@ -3059,8 +3059,10 @@ void ApplicationWindow::setPreferences(Graph* g) g->setScale(QwtPlot::xBottom, d_axes_scales[2]); g->setScale(QwtPlot::xTop, d_axes_scales[3]); - g->updateSecondaryAxis(QwtPlot::xTop); - g->updateSecondaryAxis(QwtPlot::yRight); + // QtiPlot makes these calls here (as of 26/6/12), but they spoil color fill plots for us. + // Losing them seems to have no detrimental effect. Perhaps we need to update our updateSecondaryAxis code to match QtiPlot's. + //g->updateSecondaryAxis(QwtPlot::xTop); + //g->updateSecondaryAxis(QwtPlot::yRight); QList<int> ticksList; ticksList<<majTicksStyle<<majTicksStyle<<majTicksStyle<<majTicksStyle; diff --git a/Code/Mantid/MantidPlot/src/Graph.cpp b/Code/Mantid/MantidPlot/src/Graph.cpp index 85371f2aeb89045765ac3f1de85352fcd35f832e..ad313b79b8d00287507641440f30249978a61dda 100644 --- a/Code/Mantid/MantidPlot/src/Graph.cpp +++ b/Code/Mantid/MantidPlot/src/Graph.cpp @@ -5119,6 +5119,8 @@ Spectrogram* Graph::plotSpectrogram(Spectrogram *d_spectrogram, CurveType type) if(!rightAxis) return 0; rightAxis->setColorBarEnabled(type != Contour); d_plot->enableAxis(QwtPlot::yRight, type != Contour); + // Ensure that labels are shown on color scale axis + enableAxisLabels(QwtPlot::yRight); //d_spectrogram->setDefaultColorMap(); if(type == GrayScale) rightAxis->setColorBarEnabled(false); //rightAxis->setColorMap(d_spectrogram->data().range(),d_spectrogram->colorMap());