Skip to content

Commit

Permalink
Swap over range selectors in Bayes
Browse files Browse the repository at this point in the history 
Refs #11365
  • Loading branch information
@DanNixon
DanNixon committed Mar 17, 2015
1 parent e37ec4a commit da52be8
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 29 deletions.
18 changes: 11 additions & 7 deletions Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/JumpFit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ namespace MantidQt
m_uiForm.setupUi(parent);

// Create range selector
m_rangeSelectors["JumpFitQ"] = new MantidWidgets::RangeSelector(m_uiForm.ppPlot);
connect(m_rangeSelectors["JumpFitQ"], SIGNAL(selectionChangedLazy(double, double)), this, SLOT(qRangeChanged(double, double)));
auto qRangeSelector = m_uiForm.ppPlot->addRangeSelector("JumpFitQ");
connect(qRangeSelector, SIGNAL(selectionChangedLazy(double, double)), this, SLOT(qRangeChanged(double, double)));

// Add the properties browser to the ui form
m_uiForm.treeSpace->addWidget(m_propTree);
Expand Down Expand Up @@ -213,6 +213,8 @@ namespace MantidQt

findAllWidths(mws);

auto qRangeSelector = m_uiForm.ppPlot->getRangeSelector("JumpFitQ");

if(m_spectraList.size() > 0)
{
m_uiForm.cbWidth->setEnabled(true);
Expand All @@ -227,11 +229,11 @@ namespace MantidQt

// Use the values from the instrument parameter file if we can
if(getInstrumentResolution(filename, res))
setRangeSelector("JumpFitQ", m_properties["QMin"], m_properties["QMax"], res);
setRangeSelector(qRangeSelector, m_properties["QMin"], m_properties["QMax"], res);
else
setRangeSelector("JumpFitQ", m_properties["QMin"], m_properties["QMax"], range);
setRangeSelector(qRangeSelector, m_properties["QMin"], m_properties["QMax"], range);

setPlotPropertyRange("JumpFitQ", m_properties["QMin"], m_properties["QMax"], range);
setPlotPropertyRange(qRangeSelector, m_properties["QMin"], m_properties["QMax"], range);
}
else
{
Expand Down Expand Up @@ -341,13 +343,15 @@ namespace MantidQt
*/
void JumpFit::updateProperties(QtProperty* prop, double val)
{
auto qRangeSelector = m_uiForm.ppPlot->getRangeSelector("JumpFitQ");

if(prop == m_properties["QMin"])
{
updateLowerGuide(m_rangeSelectors["JumpFitQ"], m_properties["QMin"], m_properties["QMax"], val);
updateLowerGuide(qRangeSelector, m_properties["QMin"], m_properties["QMax"], val);
}
else if (prop == m_properties["QMax"])
{
updateUpperGuide(m_rangeSelectors["JumpFitQ"], m_properties["QMin"], m_properties["QMax"], val);
updateUpperGuide(qRangeSelector, m_properties["QMin"], m_properties["QMax"], val);
}
}
} // namespace CustomInterfaces
Expand Down
18 changes: 11 additions & 7 deletions Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Quasi.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ namespace MantidQt
m_uiForm.setupUi(parent);

// Create range selector
m_rangeSelectors["QuasiERange"] = new MantidWidgets::RangeSelector(m_uiForm.ppPlot);
connect(m_rangeSelectors["QuasiERange"], SIGNAL(minValueChanged(double)), this, SLOT(minValueChanged(double)));
connect(m_rangeSelectors["QuasiERange"], SIGNAL(maxValueChanged(double)), this, SLOT(maxValueChanged(double)));
auto eRangeSelector = m_uiForm.ppPlot->addRangeSelector("QuasiERange");
connect(eRangeSelector, SIGNAL(minValueChanged(double)), this, SLOT(minValueChanged(double)));
connect(eRangeSelector, SIGNAL(maxValueChanged(double)), this, SLOT(maxValueChanged(double)));

// Add the properties browser to the UI form
m_uiForm.treeSpace->addWidget(m_propTree);
Expand Down Expand Up @@ -276,8 +276,10 @@ namespace MantidQt
updateMiniPlot();

QPair<double, double> range = m_uiForm.ppPlot->getCurveRange("Sample");
setRangeSelector("QuasiERange", m_properties["EMin"], m_properties["EMax"], range);
setPlotPropertyRange("QuasiERange", m_properties["EMin"], m_properties["EMax"], range);
auto eRangeSelector = m_uiForm.ppPlot->getRangeSelector("QuasiERange");

setRangeSelector(eRangeSelector, m_properties["EMin"], m_properties["EMax"], range);
setPlotPropertyRange(eRangeSelector, m_properties["EMin"], m_properties["EMax"], range);
}

/**
Expand Down Expand Up @@ -308,13 +310,15 @@ namespace MantidQt
*/
void Quasi::updateProperties(QtProperty* prop, double val)
{
auto eRangeSelector = m_uiForm.ppPlot->getRangeSelector("QuasiERange");

if(prop == m_properties["EMin"])
{
updateLowerGuide(m_rangeSelectors["QuasiERange"], m_properties["EMin"], m_properties["EMax"], val);
updateLowerGuide(eRangeSelector, m_properties["EMin"], m_properties["EMax"], val);
}
else if (prop == m_properties["EMax"])
{
updateUpperGuide(m_rangeSelectors["QuasiERange"], m_properties["EMin"], m_properties["EMax"], val);
updateUpperGuide(eRangeSelector, m_properties["EMin"], m_properties["EMax"], val);
}
}

Expand Down
20 changes: 12 additions & 8 deletions Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ResNorm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ namespace MantidQt
m_uiForm.setupUi(parent);

// Create range selector
m_rangeSelectors["ResNormERange"] = new MantidWidgets::RangeSelector(m_uiForm.ppPlot);
connect(m_rangeSelectors["ResNormERange"], SIGNAL(minValueChanged(double)), this, SLOT(minValueChanged(double)));
connect(m_rangeSelectors["ResNormERange"], SIGNAL(maxValueChanged(double)), this, SLOT(maxValueChanged(double)));
auto eRangeSelector = m_uiForm.ppPlot->addRangeSelector("ResNormERange");
connect(eRangeSelector, SIGNAL(minValueChanged(double)), this, SLOT(minValueChanged(double)));
connect(eRangeSelector, SIGNAL(maxValueChanged(double)), this, SLOT(maxValueChanged(double)));

// Add the properties browser to the ui form
m_uiForm.treeSpace->addWidget(m_propTree);
Expand Down Expand Up @@ -132,21 +132,23 @@ namespace MantidQt
MatrixWorkspace_sptr vanWs = AnalysisDataService::Instance().retrieveWS<MatrixWorkspace>(filename.toStdString());
m_uiForm.spPreviewSpectrum->setMaximum(static_cast<int>(vanWs->getNumberHistograms()) - 1);

auto eRangeSelector = m_uiForm.ppPlot->getRangeSelector("ResNormERange");

//Use the values from the instrument parameter file if we can
if(getInstrumentResolution(filename, res))
{
//ResNorm resolution should be +/- 10 * the IPF resolution
res.first = res.first * 10;
res.second = res.second * 10;

setRangeSelector("ResNormERange", m_properties["EMin"], m_properties["EMax"], res);
setRangeSelector(eRangeSelector, m_properties["EMin"], m_properties["EMax"], res);
}
else
{
setRangeSelector("ResNormERange", m_properties["EMin"], m_properties["EMax"], range);
setRangeSelector(eRangeSelector, m_properties["EMin"], m_properties["EMax"], range);
}

setPlotPropertyRange("ResNormERange", m_properties["EMin"], m_properties["EMax"], range);
setPlotPropertyRange(eRangeSelector, m_properties["EMin"], m_properties["EMax"], range);
}

/**
Expand Down Expand Up @@ -177,13 +179,15 @@ namespace MantidQt
*/
void ResNorm::updateProperties(QtProperty* prop, double val)
{
auto eRangeSelector = m_uiForm.ppPlot->getRangeSelector("ResNormERange");

if(prop == m_properties["EMin"])
{
updateLowerGuide(m_rangeSelectors["ResNormERange"], m_properties["EMin"], m_properties["EMax"], val);
updateLowerGuide(eRangeSelector, m_properties["EMin"], m_properties["EMax"], val);
}
else if (prop == m_properties["EMax"])
{
updateUpperGuide(m_rangeSelectors["ResNormERange"], m_properties["EMin"], m_properties["EMax"], val);
updateUpperGuide(eRangeSelector, m_properties["EMin"], m_properties["EMax"], val);
}
}

Expand Down
17 changes: 10 additions & 7 deletions Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/Stretch.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ namespace MantidQt


// Create range selector
m_rangeSelectors["StretchERange"] = new MantidWidgets::RangeSelector(m_uiForm.ppPlot);
connect(m_rangeSelectors["StretchERange"], SIGNAL(minValueChanged(double)), this, SLOT(minValueChanged(double)));
connect(m_rangeSelectors["StretchERange"], SIGNAL(maxValueChanged(double)), this, SLOT(maxValueChanged(double)));
auto eRangeSelector = m_uiForm.ppPlot->addRangeSelector("StretchERange");
connect(eRangeSelector, SIGNAL(minValueChanged(double)), this, SLOT(minValueChanged(double)));
connect(eRangeSelector, SIGNAL(maxValueChanged(double)), this, SLOT(maxValueChanged(double)));

// Add the properties browser to the ui form
m_uiForm.treeSpace->addWidget(m_propTree);
Expand Down Expand Up @@ -153,8 +153,9 @@ namespace MantidQt
{
m_uiForm.ppPlot->addSpectrum("Sample", filename, 0);
QPair<double, double> range = m_uiForm.ppPlot->getCurveRange("Sample");
setRangeSelector("StretchERange", m_properties["EMin"], m_properties["EMax"], range);
setPlotPropertyRange("StretchERange", m_properties["EMin"], m_properties["EMax"], range);
auto eRangeSelector = m_uiForm.ppPlot->getRangeSelector("StretchERange");
setRangeSelector(eRangeSelector, m_properties["EMin"], m_properties["EMax"], range);
setPlotPropertyRange(eRangeSelector, m_properties["EMin"], m_properties["EMax"], range);
}

/**
Expand Down Expand Up @@ -185,13 +186,15 @@ namespace MantidQt
*/
void Stretch::updateProperties(QtProperty* prop, double val)
{
auto eRangeSelector = m_uiForm.ppPlot->getRangeSelector("StretchERange");

if(prop == m_properties["EMin"])
{
updateLowerGuide(m_rangeSelectors["StretchERange"], m_properties["EMin"], m_properties["EMax"], val);
updateLowerGuide(eRangeSelector, m_properties["EMin"], m_properties["EMax"], val);
}
else if (prop == m_properties["EMax"])
{
updateUpperGuide(m_rangeSelectors["StretchERange"], m_properties["EMin"], m_properties["EMax"], val);
updateUpperGuide(eRangeSelector, m_properties["EMin"], m_properties["EMax"], val);
}
}

Expand Down

0 comments on commit da52be8

Please sign in to comment.