From d4f2299df6a1ab5c03fe6dd2fbb031584d2d6821 Mon Sep 17 00:00:00 2001 From: Harry Jeffery Date: Wed, 21 Jan 2015 15:37:54 +0000 Subject: [PATCH] Refs #10828 Don't use qmath in slit calculator --- Code/Mantid/MantidQt/MantidWidgets/src/SlitCalculator.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Code/Mantid/MantidQt/MantidWidgets/src/SlitCalculator.cpp b/Code/Mantid/MantidQt/MantidWidgets/src/SlitCalculator.cpp index 8dcf3f6c9bc5..e9ea47454da1 100644 --- a/Code/Mantid/MantidQt/MantidWidgets/src/SlitCalculator.cpp +++ b/Code/Mantid/MantidQt/MantidWidgets/src/SlitCalculator.cpp @@ -1,5 +1,5 @@ #include "MantidQtMantidWidgets/SlitCalculator.h" -#include +#include namespace MantidQt { @@ -19,7 +19,6 @@ namespace MantidQt void SlitCalculator::on_recalculate_triggered() { //Gather input - const double PI = 2*qAsin(1); const double s1s2 = ui.spinSlit1Slit2->value(); const double s2sa = ui.spinSlit2Sample->value(); const double res = ui.spinResolution->value(); @@ -27,8 +26,8 @@ namespace MantidQt const double angle = ui.spinAngle->value(); //Calculate values - const double s1 = 2 * (s1s2 + s2sa) * qTan(res * angle * PI / 180) - footprint * qSin(angle * PI / 180); - const double s2 = s1s2 * (footprint * qSin(angle * PI / 180) + s1) / (s1s2 + s2sa) - s1; + const double s1 = 2 * (s1s2 + s2sa) * tan(res * angle * M_PI / 180) - footprint * sin(angle * M_PI / 180); + const double s2 = s1s2 * (footprint * sin(angle * M_PI / 180) + s1) / (s1s2 + s2sa) - s1; //Update output ui.slit1Text->setText(QString::number(s1,'f',3));