Unverified Commit 5a838aa4 authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony Committed by GitHub
Browse files

Merge pull request #32394 from mantidproject/Fix_max_fit_range_for_Msd_andIqt_fit

Fix bug limiting fit range on IDA fitting tabs
parents cb99e265 ee4bf72e
......@@ -41,6 +41,7 @@ Bug Fixes
- A bug has been fixed in Indirect data analysis on the F(Q)Fit tab, Multiple Input tab that allowed duplicate spectra to be added.
- A bug has been fixed that stopped additional spectra being added to Indirect Data Analysis if spectra from that workspace had already been added.
- :ref:`IndirectILLEnertyTransfer <algm-IndirectILLEnertyTransfer>` will now perform the monitor normalisation correctly; that is, in wavelength instead of energy. It will also provide the monitor workspace as a diagnostic output, if requested.
- A bug has been fixed in Indirect Data Analysis that limited the integration range on the tabs to between -1 and 1.
:ref:`Release 6.2.0 <v6.2.0>`
......@@ -219,13 +219,13 @@ void IndirectDataAnalysisElwinTab::setup() {
// We always want one range selector... the second one can be controlled from
// within the elwinTwoRanges(bool state) function
auto integrationRangeSelector = m_uiForm.ppPlot->addRangeSelector("ElwinIntegrationRange");
integrationRangeSelector->setBounds(-1.0, 1.0);
integrationRangeSelector->setBounds(-DBL_MAX, DBL_MAX);
connect(integrationRangeSelector, SIGNAL(minValueChanged(double)), this, SLOT(minChanged(double)));
connect(integrationRangeSelector, SIGNAL(maxValueChanged(double)), this, SLOT(maxChanged(double)));
// create the second range
auto backgroundRangeSelector = m_uiForm.ppPlot->addRangeSelector("ElwinBackgroundRange");
backgroundRangeSelector->setColour(Qt::darkGreen); // dark green for background
backgroundRangeSelector->setBounds(-1.0, 1.0);
backgroundRangeSelector->setBounds(-DBL_MAX, DBL_MAX);
connect(integrationRangeSelector, SIGNAL(selectionChanged(double, double)), backgroundRangeSelector,
SLOT(setRange(double, double)));
connect(backgroundRangeSelector, SIGNAL(minValueChanged(double)), this, SLOT(minChanged(double)));
......
......@@ -190,7 +190,7 @@ void IndirectDataAnalysisIqtTab::setup() {
setPreviewSpectrumMaximum(0);
auto xRangeSelector = m_uiForm.ppPlot->addRangeSelector("IqtRange");
xRangeSelector->setBounds(-1.0, 1.0);
xRangeSelector->setBounds(-DBL_MAX, DBL_MAX);
// signals / slots & validators
connect(xRangeSelector, SIGNAL(selectionChanged(double, double)), this, SLOT(rangeChanged(double, double)));
......
......@@ -12,6 +12,7 @@
#include <QMessageBox>
#include <QTimer>
#include <limits>
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
#include "MantidQtIcons/Icon.h"
......@@ -277,7 +278,7 @@ void IndirectFitPlotView::setHWHMMinimum(double maximum) {
void IndirectFitPlotView::addFitRangeSelector() {
auto fitRangeSelector = m_topPlot->addRangeSelector("FitRange");
fitRangeSelector->setBounds(-1.0, 1.0);
fitRangeSelector->setBounds(-DBL_MAX, DBL_MAX);
connect(fitRangeSelector, SIGNAL(minValueChanged(double)), this, SIGNAL(startXChanged(double)));
connect(fitRangeSelector, SIGNAL(maxValueChanged(double)), this, SIGNAL(endXChanged(double)));
......@@ -304,7 +305,7 @@ void IndirectFitPlotView::setBackgroundBounds() {
void IndirectFitPlotView::addHWHMRangeSelector() {
auto hwhmRangeSelector = m_topPlot->addRangeSelector("HWHM");
hwhmRangeSelector->setBounds(-1.0, 1.0);
hwhmRangeSelector->setBounds(-DBL_MAX, DBL_MAX);
hwhmRangeSelector->setColour(Qt::red);
hwhmRangeSelector->setRange(0.0, 0.0);
hwhmRangeSelector->setVisible(false);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment