Skip to content

Commit

Permalink
refs #5167. Naming differences in qwt fix.
Browse files Browse the repository at this point in the history
  • Loading branch information
OwenArnold committed Aug 28, 2012
1 parent ca8f5cd commit 504579c
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Code/Mantid/MantidQt/SliceViewer/src/PeakOverlay.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,9 @@ namespace SliceViewer
const int yOrigin = m_plot->transform( QwtPlot::yLeft, m_origin.y() );
const QPointF originWindows(xOrigin, yOrigin);

const double yMin = m_plot->axisScaleDiv(QwtPlot::yLeft)->lowerBound();
const double yMax = m_plot->axisScaleDiv(QwtPlot::yLeft)->upperBound();
const QwtDoubleInterval interval = m_plot->axisScaleDiv(QwtPlot::yLeft)->interval();
const double yMin = interval.minValue();
const double yMax = interval.maxValue();
const double scale = height()/(yMax - yMin);

const double radius = scale * m_radiusAtDistance;
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidQt/SliceViewer/test/PeaksPresenterTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ class PeaksPresenterTest : public CxxTest::TestSuite
public:
MOCK_METHOD1(setPlaneDistance, void(const double&));
MOCK_CONST_METHOD0(getOrigin, const QPointF&());
MOCK_CONST_METHOD0(getRadius, const double());
MOCK_CONST_METHOD0(getRadius, double());
MOCK_METHOD0(updateView, void());
~MockPeakOverlayView(){}
};
Expand Down

0 comments on commit 504579c

Please sign in to comment.