Skip to content
Snippets Groups Projects
Commit 6acc0450 authored by Dan Nixon's avatar Dan Nixon
Browse files

Work in progress replaceing other IDR tabs 

Refs #10960
parent af7155ae
No related merge requests found
Expand all Hide whitespace changes
Inline Side-by-side
Showing
with 165 additions and 1899 deletions
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.h
+ 2
− 3
View file @ 6acc0450
......@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_INDIRECTCALIBRATION_H_
#include "IndirectDataReductionTab.h"
#include "ui_IndirectCalibration.h"
#include "MantidKernel/System.h"
#include "MantidQtCustomInterfaces/UserInputValidator.h"
......@@ -56,8 +56,6 @@ namespace CustomInterfaces
void calUpdateRS(QtProperty*, double);
void calSetDefaultResolution(Mantid::API::MatrixWorkspace_const_sptr ws);
void resCheck(bool state); ///< handles checking/unchecking of "Create RES File" checkbox
void intensityScaleMultiplierCheck(bool state); /// Toggle the intensity scale multiplier box
void calibValidateIntensity(const QString & text); /// Check that the scale multiplier is valid
void setDefaultInstDetails();
void pbRunEditing(); //< Called when a user starts to type / edit the runs to load.
void pbRunFinding(); //< Called when the FileFinder starts finding the files.
......@@ -66,6 +64,7 @@ namespace CustomInterfaces
private:
void createRESfile(const QString& file);
Ui::IndirectCalibration m_uiForm;
QString m_lastCalPlotFilename;
};
......
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectCalibration.ui
+ 1
− 1
View file @ 6acc0450
......@@ -238,7 +238,7 @@
<customwidget>
<class>MantidQt::MantidWidgets::MWRunFiles</class>
<extends>QWidget</extends>
<header>mantidqt::mantidwidgets::mwrunfiles.h</header>
<header>MantidQtMantidWidgets/MWRunFiles.h</header>
</customwidget>
</customwidgets>
<resources/>
......
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.h
+ 3
− 1
View file @ 6acc0450
......@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_INDIRECTCONVERTTOENERGY_H_
#include "IndirectDataReductionTab.h"
#include "ui_IndirectConvertToEnergy.h"
#include "MantidKernel/System.h"
#include "MantidQtCustomInterfaces/Background.h"
......@@ -65,6 +65,8 @@ namespace CustomInterfaces
void plotRawComplete(bool error); //< Called when the Plot Raw algorithmm chain completes
private:
Ui::IndirectConvertToEnergy m_uiForm;
Background *m_backgroundDialog; ///< background removal dialog
bool m_bgRemoval; ///< whether user has set values for BG removal
......
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectConvertToEnergy.ui
+ 14
− 14
View file @ 6acc0450
......@@ -481,12 +481,12 @@
<number>0</number>
</property>
<item>
<widget class="QCheckBox" name="ckRebin">
<widget class="QCheckBox" name="ckDoNotRebin">
<property name="toolTip">
<string>Do not perform rebinning step on this data.</string>
</property>
<property name="text">
<string>Rebin</string>
<string>Do Not Rebin</string>
</property>
<property name="checked">
<bool>true</bool>
......@@ -815,7 +815,7 @@
</widget>
</item>
<item>
<widget class="QComboBox" name="cbPlotOutput">
<widget class="QComboBox" name="cbPlotType">
<item>
<property name="text">
<string>None</string>
......@@ -881,16 +881,16 @@ Later steps in the process (saving, renaming) will not be done.</string>
<customwidget>
<class>MantidQt::MantidWidgets::MWRunFiles</class>
<extends>QWidget</extends>
<header>mantidqt::mantidwidgets::mwrunfiles.h</header>
<header>MantidQtMantidWidgets/MWRunFiles.h</header>
</customwidget>
</customwidgets>
<resources/>
<connections>
<connection>
<sender>ckRebin</sender>
<sender>ckDoNotRebin</sender>
<signal>toggled(bool)</signal>
<receiver>cbRebinType</receiver>
<slot>setEnabled(bool)</slot>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>69</x>
......@@ -903,10 +903,10 @@ Later steps in the process (saving, renaming) will not be done.</string>
</hints>
</connection>
<connection>
<sender>ckRebin</sender>
<sender>ckDoNotRebin</sender>
<signal>toggled(bool)</signal>
<receiver>leRebinString</receiver>
<slot>setEnabled(bool)</slot>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>46</x>
......@@ -967,10 +967,10 @@ Later steps in the process (saving, renaming) will not be done.</string>
</hints>
</connection>
<connection>
<sender>ckRebin</sender>
<sender>ckDoNotRebin</sender>
<signal>toggled(bool)</signal>
<receiver>spRebinLow</receiver>
<slot>setEnabled(bool)</slot>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>46</x>
......@@ -983,10 +983,10 @@ Later steps in the process (saving, renaming) will not be done.</string>
</hints>
</connection>
<connection>
<sender>ckRebin</sender>
<sender>ckDoNotRebin</sender>
<signal>toggled(bool)</signal>
<receiver>spRebinWidth</receiver>
<slot>setEnabled(bool)</slot>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>46</x>
......@@ -999,10 +999,10 @@ Later steps in the process (saving, renaming) will not be done.</string>
</hints>
</connection>
<connection>
<sender>ckRebin</sender>
<sender>ckDoNotRebin</sender>
<signal>toggled(bool)</signal>
<receiver>lbRebinHigh</receiver>
<slot>setEnabled(bool)</slot>
<slot>setDisabled(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>46</x>
......
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDataReduction.h
+ 0
− 1
View file @ 6acc0450
......@@ -111,7 +111,6 @@ namespace MantidQt
void saveSettings();
/// Set and show an instrument-specific widget
void setInstSpecificWidget(const std::string & parameterName, QCheckBox * checkBox, QCheckBox::ToggleState defaultState);
virtual void closeEvent(QCloseEvent* close);
/// The .ui form generated by Qt Designer
......
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.h
+ 2
− 1
View file @ 6acc0450
......@@ -2,7 +2,7 @@
#define MANTIDQTCUSTOMINTERFACES_INDIRECTDIAGNOSTICS_H_
#include "IndirectDataReductionTab.h"
#include "ui_IndirectDiagnostics.h"
#include "MantidAPI/MatrixWorkspace.h"
#include "MantidKernel/System.h"
......@@ -79,6 +79,7 @@ namespace CustomInterfaces
void pbRunFinished(); //< Called when the FileFinder has finished finding the files.
private:
Ui::IndirectDiagnostics m_uiForm;
QString m_lastDiagFilename;
};
......
Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/IndirectDiagnostics.ui
+ 3
− 3
View file @ 6acc0450
......@@ -23,7 +23,7 @@
<item>
<layout class="QHBoxLayout" name="loInputFiles">
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="rfInputFiles" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="dsInputFiles" native="true">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -189,12 +189,12 @@
<customwidget>
<class>MantidQt::MantidWidgets::MWRunFiles</class>
<extends>QWidget</extends>
<header>mantidqt::mantidwidgets::mwrunfiles.h</header>
<header>MantidQtMantidWidgets/MWRunFiles.h</header>
</customwidget>
<customwidget>
<class>MantidQt::MantidWidgets::DataSelector</class>
<extends>QWidget</extends>
<header>mantidqt::mantidwidgets::dataselector.h</header>
<header>MantidQtMantidWidgets/DataSelector.h</header>
</customwidget>
</customwidgets>
<resources/>
......
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectCalibration.cpp
+ 53
− 103
View file @ 6acc0450
......@@ -24,12 +24,14 @@ namespace CustomInterfaces
IndirectCalibration::IndirectCalibration(Ui::IndirectDataReduction& uiForm, QWidget * parent) :
IndirectDataReductionTab(uiForm, parent), m_lastCalPlotFilename("")
{
m_uiForm.setupUi(parent);
DoubleEditorFactory *doubleEditorFactory = new DoubleEditorFactory();
// CAL PROPERTY TREE
m_propTrees["CalPropTree"] = new QtTreePropertyBrowser();
m_propTrees["CalPropTree"]->setFactoryForManager(m_dblManager, doubleEditorFactory);
m_uiForm.cal_treeCal->addWidget(m_propTrees["CalPropTree"]);
m_uiForm.propertiesCalibration->addWidget(m_propTrees["CalPropTree"]);
// Cal Property Tree: Peak/Background
m_properties["CalPeakMin"] = m_dblManager->addProperty("Peak Min");
......@@ -47,7 +49,7 @@ namespace CustomInterfaces
m_plots["CalPlot"]->setAxisFont(QwtPlot::xBottom, parent->font());
m_plots["CalPlot"]->setAxisFont(QwtPlot::yLeft, parent->font());
m_plots["CalPlot"]->setCanvasBackground(Qt::white);
m_uiForm.cal_plotCal->addWidget(m_plots["CalPlot"]);
m_uiForm.plotCalibration->addWidget(m_plots["CalPlot"]);
// Cal plot range selectors
m_rangeSelectors["CalPeak"] = new MantidWidgets::RangeSelector(m_plots["CalPlot"]);
......@@ -57,7 +59,7 @@ namespace CustomInterfaces
// RES PROPERTY TREE
m_propTrees["ResPropTree"] = new QtTreePropertyBrowser();
m_propTrees["ResPropTree"]->setFactoryForManager(m_dblManager, doubleEditorFactory);
m_uiForm.cal_treeRes->addWidget(m_propTrees["ResPropTree"]);
m_uiForm.loResolutionOptions->addWidget(m_propTrees["ResPropTree"]);
// Res Property Tree: Spectra Selection
m_properties["ResSpecMin"] = m_dblManager->addProperty("Spectra Min");
......@@ -104,7 +106,7 @@ namespace CustomInterfaces
m_plots["ResPlot"]->setAxisFont(QwtPlot::xBottom, parent->font());
m_plots["ResPlot"]->setAxisFont(QwtPlot::yLeft, parent->font());
m_plots["ResPlot"]->setCanvasBackground(Qt::white);
m_uiForm.cal_plotRes->addWidget(m_plots["ResPlot"]);
m_uiForm.plotResolution->addWidget(m_plots["ResPlot"]);
// Res plot range selectors
// Create ResBackground first so ResPeak is drawn above it
......@@ -114,11 +116,6 @@ namespace CustomInterfaces
m_rangeSelectors["ResPeak"] = new MantidWidgets::RangeSelector(m_plots["ResPlot"],
MantidQt::MantidWidgets::RangeSelector::XMINMAX, true, true);
// MISC UI
m_uiForm.cal_leIntensityScaleMultiplier->setValidator(m_valDbl);
m_uiForm.cal_leResScale->setValidator(m_valDbl);
m_uiForm.cal_valIntensityScaleMultiplier->setText(" ");
// SIGNAL/SLOT CONNECTIONS
// Update instrument information when a new instrument config is selected
connect(this, SIGNAL(newInstrumentConfiguration()), this, SLOT(setDefaultInstDetails()));
......@@ -137,27 +134,21 @@ namespace CustomInterfaces
// Update range selctor positions when a value in the double manager changes
connect(m_dblManager, SIGNAL(valueChanged(QtProperty*, double)), this, SLOT(calUpdateRS(QtProperty*, double)));
// Plot miniplots after a file has loaded
connect(m_uiForm.cal_leRunNo, SIGNAL(filesFound()), this, SLOT(calPlotRaw()));
connect(m_uiForm.leRunNo, SIGNAL(filesFound()), this, SLOT(calPlotRaw()));
// Plot miniplots when the user clicks Plot Raw
connect(m_uiForm.cal_pbPlot, SIGNAL(clicked()), this, SLOT(calPlotRaw()));
connect(m_uiForm.pbPlotRaw, SIGNAL(clicked()), this, SLOT(calPlotRaw()));
// Toggle RES file options when user toggles Create RES File checkbox
connect(m_uiForm.cal_ckRES, SIGNAL(toggled(bool)), this, SLOT(resCheck(bool)));
// Enable/disable RES scaling option when user toggles Scale RES checkbox
connect(m_uiForm.cal_ckResScale, SIGNAL(toggled(bool)), m_uiForm.cal_leResScale, SLOT(setEnabled(bool)));
// Enable/dosable scale factor option when user toggles Intensity Scale Factor checkbox
connect(m_uiForm.cal_ckIntensityScaleMultiplier, SIGNAL(toggled(bool)), this, SLOT(intensityScaleMultiplierCheck(bool)));
// Validate the value entered in scale factor option whenever it changes
connect(m_uiForm.cal_leIntensityScaleMultiplier, SIGNAL(textChanged(const QString &)), this, SLOT(calibValidateIntensity(const QString &)));
connect(m_uiForm.ckCreateResolution, SIGNAL(toggled(bool)), this, SLOT(resCheck(bool)));
// Shows message on run buton when user is inputting a run number
connect(m_uiForm.cal_leRunNo, SIGNAL(fileTextChanged(const QString &)), this, SLOT(pbRunEditing()));
connect(m_uiForm.leRunNo, SIGNAL(fileTextChanged(const QString &)), this, SLOT(pbRunEditing()));
// Shows message on run button when Mantid is finding the file for a given run number
connect(m_uiForm.cal_leRunNo, SIGNAL(findingFiles()), this, SLOT(pbRunFinding()));
connect(m_uiForm.leRunNo, SIGNAL(findingFiles()), this, SLOT(pbRunFinding()));
// Reverts run button back to normal when file finding has finished
connect(m_uiForm.cal_leRunNo, SIGNAL(fileFindingFinished()), this, SLOT(pbRunFinished()));
connect(m_uiForm.leRunNo, SIGNAL(fileFindingFinished()), this, SLOT(pbRunFinished()));
// Nudge resCheck to ensure res range selectors are only shown when Create RES file is checked
resCheck(m_uiForm.cal_ckRES->isChecked());
resCheck(m_uiForm.ckCreateResolution->isChecked());
}
//----------------------------------------------------------------------------------------------
......@@ -176,8 +167,8 @@ namespace CustomInterfaces
connect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this, SLOT(algorithmsComplete(bool)));
// Get properties
QString firstFile = m_uiForm.cal_leRunNo->getFirstFilename();
QString filenames = m_uiForm.cal_leRunNo->getFilenames().join(",");
QString firstFile = m_uiForm.leRunNo->getFirstFilename();
QString filenames = m_uiForm.leRunNo->getFilenames().join(",");
auto instDetails = getInstrumentDetails();
QString instDetectorRange = instDetails["spectra-min"] + "," + instDetails["spectra-max"];
......@@ -186,8 +177,8 @@ namespace CustomInterfaces
QString backgroundRange = m_properties["CalBackMin"]->valueText() + "," + m_properties["CalBackMax"]->valueText();
QFileInfo firstFileInfo(firstFile);
QString outputWorkspaceNameStem = firstFileInfo.baseName() + "_" + m_uiForm.iicInstrumentConfiguration->getAnalyserName()
+ m_uiForm.iicInstrumentConfiguration->getReflectionName();
QString outputWorkspaceNameStem = "IRS"; //firstFileInfo.baseName() + "_" + m_uiForm.iicInstrumentConfiguration->getAnalyserName()
// + m_uiForm.iicInstrumentConfiguration->getReflectionName(); TODO
QString calibrationWsName = outputWorkspaceNameStem + "_calib";
......@@ -200,14 +191,12 @@ namespace CustomInterfaces
calibrationAlg->setProperty("DetectorRange", instDetectorRange.toStdString());
calibrationAlg->setProperty("PeakRange", peakRange.toStdString());
calibrationAlg->setProperty("BackgroundRange", backgroundRange.toStdString());
calibrationAlg->setProperty("Plot", m_uiForm.cal_ckPlotResult->isChecked());
calibrationAlg->setProperty("Plot", m_uiForm.ckPlot->isChecked());
if(m_uiForm.cal_ckIntensityScaleMultiplier->isChecked())
if(m_uiForm.ckScale->isChecked())
{
QString scale = m_uiForm.cal_leIntensityScaleMultiplier->text();
if(scale.isEmpty())
scale = "1.0";
calibrationAlg->setProperty("ScaleFactor", scale.toStdString());
double scale = m_uiForm.spScale->value();
calibrationAlg->setProperty("ScaleFactor", scale);
}
m_batchAlgoRunner->addAlgorithm(calibrationAlg);
......@@ -220,7 +209,7 @@ namespace CustomInterfaces
inputFromCalProps["InputWorkspace"] = calibrationWsName.toStdString();
// Add save algorithm to queue if ticked
if( m_uiForm.cal_ckSave->isChecked() )
if( m_uiForm.ckSave->isChecked() )
{
IAlgorithm_sptr saveAlg = AlgorithmManager::Instance().create("SaveNexus", -1);
saveAlg->initialize();
......@@ -230,13 +219,13 @@ namespace CustomInterfaces
}
// Configure the resolution algorithm
if(m_uiForm.cal_ckRES->isChecked())
if(m_uiForm.ckCreateResolution->isChecked())
{
QString resolutionWsName = outputWorkspaceNameStem + "_res";
QString scaleFactor("1.0");
if(m_uiForm.cal_ckResScale->isChecked() && !m_uiForm.cal_leResScale->text().isEmpty())
scaleFactor = m_uiForm.cal_leResScale->text();
if(m_uiForm.ckResolutionScale->isChecked() && !m_uiForm.spResolutionScale->text().isEmpty())
scaleFactor = m_uiForm.spResolutionScale->text();
QString resDetectorRange = QString::number(m_dblManager->value(m_properties["ResSpecMin"])) + ","
+ QString::number(m_dblManager->value(m_properties["ResSpecMax"]));
......@@ -251,19 +240,20 @@ namespace CustomInterfaces
Mantid::API::IAlgorithm_sptr resAlg = Mantid::API::AlgorithmManager::Instance().create("IndirectResolution", -1);
resAlg->initialize();
//TODO
resAlg->setProperty("InputFiles", filenames.toStdString());
resAlg->setProperty("OutputWorkspace", resolutionWsName.toStdString());
resAlg->setProperty("Instrument", m_uiForm.iicInstrumentConfiguration->getInstrumentName().toStdString());
resAlg->setProperty("Analyser", m_uiForm.iicInstrumentConfiguration->getAnalyserName().toStdString());
resAlg->setProperty("Reflection", m_uiForm.iicInstrumentConfiguration->getReflectionName().toStdString());
resAlg->setProperty("Instrument", "IRIS"); //m_uiForm.iicInstrumentConfiguration->getInstrumentName().toStdString());
resAlg->setProperty("Analyser", "graphite"); //m_uiForm.iicInstrumentConfiguration->getAnalyserName().toStdString());
resAlg->setProperty("Reflection", "002"); //m_uiForm.iicInstrumentConfiguration->getReflectionName().toStdString());
resAlg->setProperty("RebinParam", rebinString.toStdString());
resAlg->setProperty("DetectorRange", resDetectorRange.toStdString());
resAlg->setProperty("BackgroundRange", background.toStdString());
resAlg->setProperty("ScaleFactor", m_uiForm.cal_leIntensityScaleMultiplier->text().toDouble());
resAlg->setProperty("Smooth", m_uiForm.cal_ckSmooth->isChecked());
resAlg->setProperty("Verbose", m_uiForm.cal_ckVerbose->isChecked());
resAlg->setProperty("Plot", m_uiForm.cal_ckPlotResult->isChecked());
resAlg->setProperty("Save", m_uiForm.cal_ckSave->isChecked());
resAlg->setProperty("ScaleFactor", m_uiForm.spScale->value());
resAlg->setProperty("Smooth", m_uiForm.ckSmoothResolution->isChecked());
resAlg->setProperty("Verbose", m_uiForm.ckVerbose->isChecked());
resAlg->setProperty("Plot", m_uiForm.ckPlot->isChecked());
resAlg->setProperty("Save", m_uiForm.ckSave->isChecked());
m_batchAlgoRunner->addAlgorithm(resAlg);
......@@ -279,12 +269,12 @@ namespace CustomInterfaces
if(error)
return;
QString firstFile = m_uiForm.cal_leRunNo->getFirstFilename();
QString firstFile = m_uiForm.leRunNo->getFirstFilename();
QFileInfo firstFileInfo(firstFile);
QString calFileName = firstFileInfo.baseName() + "_" + m_uiForm.iicInstrumentConfiguration->getAnalyserName() + m_uiForm.iicInstrumentConfiguration->getReflectionName() + "_calib.nxs";
/* QString calFileName = firstFileInfo.baseName() + "_" + m_uiForm.iicInstrumentConfiguration->getAnalyserName() + m_uiForm.iicInstrumentConfiguration->getReflectionName() + "_calib.nxs"; */
m_uiForm.ind_calibFile->setFileTextWithSearch(calFileName);
m_uiForm.ckUseCalib->setChecked(true);
/* m_uiForm.ind_calibFile->setFileTextWithSearch(calFileName); */
/* m_uiForm.ckUseCalib->setChecked(true); */
disconnect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this, SLOT(algorithmsComplete(bool)));
}
......@@ -293,7 +283,7 @@ namespace CustomInterfaces
{
MantidQt::CustomInterfaces::UserInputValidator uiv;
uiv.checkMWRunFilesIsValid("Run", m_uiForm.cal_leRunNo);
uiv.checkMWRunFilesIsValid("Run", m_uiForm.leRunNo);
auto peakRange = std::make_pair(m_dblManager->value(m_properties["CalPeakMin"]), m_dblManager->value(m_properties["CalPeakMax"]));
auto backRange = std::make_pair(m_dblManager->value(m_properties["CalBackMin"]), m_dblManager->value(m_properties["CalBackMax"]));
......@@ -302,7 +292,7 @@ namespace CustomInterfaces
uiv.checkValidRange("Back Range", backRange);
uiv.checkRangesDontOverlap(peakRange, backRange);
if ( m_uiForm.cal_ckRES->isChecked() )
if ( m_uiForm.ckCreateResolution->isChecked() )
{
auto backgroundRange = std::make_pair(m_dblManager->value(m_properties["ResStart"]), m_dblManager->value(m_properties["ResEnd"]));
uiv.checkValidRange("Background", backgroundRange);
......@@ -314,17 +304,6 @@ namespace CustomInterfaces
uiv.checkBins(eLow, eWidth, eHigh);
}
if( m_uiForm.cal_ckIntensityScaleMultiplier->isChecked()
&& m_uiForm.cal_leIntensityScaleMultiplier->text().isEmpty() )
{
uiv.addErrorMessage("You must enter a scale for the calibration file");
}
if( m_uiForm.cal_ckResScale->isChecked() && m_uiForm.cal_leResScale->text().isEmpty() )
{
uiv.addErrorMessage("You must enter a scale for the resolution file");
}
QString error = uiv.generateErrorMessage();
if(error != "")
......@@ -362,7 +341,7 @@ namespace CustomInterfaces
{
setDefaultInstDetails();
QString filename = m_uiForm.cal_leRunNo->getFirstFilename();
QString filename = m_uiForm.leRunNo->getFirstFilename();
// Don't do anything if the file we would plot has not changed
if(filename == m_lastCalPlotFilename)
......@@ -412,24 +391,25 @@ namespace CustomInterfaces
*/
void IndirectCalibration::calPlotEnergy()
{
if ( ! m_uiForm.cal_leRunNo->isValid() )
if ( ! m_uiForm.leRunNo->isValid() )
{
emit showMessageBox("Run number not valid.");
return;
}
QString files = m_uiForm.cal_leRunNo->getFilenames().join(",");
QString files = m_uiForm.leRunNo->getFilenames().join(",");
QFileInfo fi(m_uiForm.cal_leRunNo->getFirstFilename());
QFileInfo fi(m_uiForm.leRunNo->getFirstFilename());
QString detRange = QString::number(m_dblManager->value(m_properties["ResSpecMin"])) + ","
+ QString::number(m_dblManager->value(m_properties["ResSpecMax"]));
//TODO
IAlgorithm_sptr reductionAlg = AlgorithmManager::Instance().create("InelasticIndirectReduction");
reductionAlg->initialize();
reductionAlg->setProperty("Instrument", m_uiForm.iicInstrumentConfiguration->getInstrumentName().toStdString());
reductionAlg->setProperty("Analyser", m_uiForm.iicInstrumentConfiguration->getAnalyserName().toStdString());
reductionAlg->setProperty("Reflection", m_uiForm.iicInstrumentConfiguration->getReflectionName().toStdString());
reductionAlg->setProperty("Instrument", "IRIS"); //m_uiForm.iicInstrumentConfiguration->getInstrumentName().toStdString());
reductionAlg->setProperty("Analyser", "graphite"); //m_uiForm.iicInstrumentConfiguration->getAnalyserName().toStdString());
reductionAlg->setProperty("Reflection", "002"); //m_uiForm.iicInstrumentConfiguration->getReflectionName().toStdString());
reductionAlg->setProperty("InputFiles", files.toStdString());
reductionAlg->setProperty("OutputWorkspace", "__IndirectCalibration_reduction");
reductionAlg->setProperty("DetectorRange", detRange.toStdString());
......@@ -587,38 +567,8 @@ namespace CustomInterfaces
m_rangeSelectors["ResBackground"]->setVisible(state);
// Toggle scale and smooth options
m_uiForm.cal_ckResScale->setEnabled(state);
m_uiForm.cal_ckResScale->setChecked(false);
m_uiForm.cal_ckSmooth->setEnabled(state);
}
/**
* Enables or disables the scale multiplier input box when
* the check box state changes
*
* @param state :: True to enable input, false to disable
*/
void IndirectCalibration::intensityScaleMultiplierCheck(bool state)
{
m_uiForm.cal_leIntensityScaleMultiplier->setEnabled(state);
}
/**
* Hides/shows the required indicator of the scale multiplier
* input box
*
* @param text :: Text currently in box
*/
void IndirectCalibration::calibValidateIntensity(const QString & text)
{
if(!text.isEmpty())
{
m_uiForm.cal_valIntensityScaleMultiplier->setText(" ");
}
else
{
m_uiForm.cal_valIntensityScaleMultiplier->setText("*");
}
m_uiForm.ckResolutionScale->setEnabled(state);
m_uiForm.ckSmoothResolution->setEnabled(state);
}
/**
......@@ -635,7 +585,7 @@ namespace CustomInterfaces
void IndirectCalibration::pbRunFinding()
{
emit updateRunButton(false, "Finding files...", "Searchig for data files for the run numbers entered...");
m_uiForm.cal_leRunNo->setEnabled(false);
m_uiForm.leRunNo->setEnabled(false);
}
/**
......@@ -643,7 +593,7 @@ namespace CustomInterfaces
*/
void IndirectCalibration::pbRunFinished()
{
if(!m_uiForm.cal_leRunNo->isValid())
if(!m_uiForm.leRunNo->isValid())
{
emit updateRunButton(false, "Invalid Run(s)", "Cannot find data files for some of the run numbers enetered.");
}
......@@ -652,7 +602,7 @@ namespace CustomInterfaces
emit updateRunButton();
}
m_uiForm.cal_leRunNo->setEnabled(true);
m_uiForm.leRunNo->setEnabled(true);
}
} // namespace CustomInterfaces
......
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectConvertToEnergy.cpp
+ 49
− 249
View file @ 6acc0450
......@@ -17,17 +17,10 @@ namespace CustomInterfaces
IndirectConvertToEnergy::IndirectConvertToEnergy(Ui::IndirectDataReduction& uiForm, QWidget * parent) :
IndirectDataReductionTab(uiForm, parent), m_backgroundDialog(NULL), m_bgRemoval(false)
{
m_uiForm.setupUi(parent);
// Add validators to UI form
m_uiForm.leScaleMultiplier->setValidator(m_valPosDbl);
m_uiForm.leNoGroups->setValidator(m_valInt);
m_uiForm.leDetailedBalance->setValidator(m_valPosDbl);
m_uiForm.leSpectraMin->setValidator(m_valInt);
m_uiForm.leSpectraMax->setValidator(m_valInt);
m_uiForm.entryRebinLow->setValidator(m_valDbl);
m_uiForm.entryRebinWidth->setValidator(m_valDbl);
m_uiForm.entryRebinHigh->setValidator(m_valDbl);
// SIGNAL/SLOT CONNECTIONS
// Update instrument information when a new instrument config is selected
......@@ -35,40 +28,22 @@ namespace CustomInterfaces
// Shows required mapping option UI widgets when a new mapping option is selected from drop down
connect(m_uiForm.cbMappingOptions, SIGNAL(currentIndexChanged(const QString&)), this, SLOT(mappingOptionSelected(const QString&)));
// Shows background removal dialog when user clicks Background Removal
connect(m_uiForm.pbBack_2, SIGNAL(clicked()), this, SLOT(backgroundClicked()));
connect(m_uiForm.pbBackgroundRemoval, SIGNAL(clicked()), this, SLOT(backgroundClicked()));
// Plots raw input data when user clicks Plot Time
connect(m_uiForm.pbPlotRaw, SIGNAL(clicked()), this, SLOT(plotRaw()));
// Enables/disables rebin options when user toggles Do Not Rebin checkbox
connect(m_uiForm.rebin_ckDNR, SIGNAL(toggled(bool)), this, SLOT(rebinEntryToggle(bool)));
// Enables/disables detail balance option when user toggle Detailed Balance checkbox
connect(m_uiForm.ckDetailedBalance, SIGNAL(toggled(bool)), this, SLOT(detailedBalanceCheck(bool)));
// Enables/disables scale multiply option when user toggles Scale checkbox
connect(m_uiForm.ckScaleMultiplier, SIGNAL(toggled(bool)), this, SLOT(scaleMultiplierCheck(bool)));
connect(m_uiForm.pbPlotTime, SIGNAL(clicked()), this, SLOT(plotRaw()));
connect(m_uiForm.ind_calibFile, SIGNAL(fileTextChanged(const QString &)), this, SLOT(calibFileChanged(const QString &)));
// Enables/disables calibration file options when user toggles Use Calib File checkbox
connect(m_uiForm.ckUseCalib, SIGNAL(toggled(bool)), this, SLOT(useCalib(bool)));
// Displays correct UI widgets for selected rebin type when changed via Rebin Steps drop down
connect(m_uiForm.comboRebinType, SIGNAL(currentIndexChanged(int)), m_uiForm.swIndRebin, SLOT(setCurrentIndex(int)));
// Shows message on run buton when user is inputting a run number
connect(m_uiForm.ind_runFiles, SIGNAL(fileTextChanged(const QString &)), this, SLOT(pbRunEditing()));
// Shows message on run button when Mantid is finding the file for a given run number
connect(m_uiForm.ind_runFiles, SIGNAL(findingFiles()), this, SLOT(pbRunFinding()));
// Reverts run button back to normal when file finding has finished
connect(m_uiForm.ind_runFiles, SIGNAL(fileFindingFinished()), this, SLOT(pbRunFinished()));
// Perform validation when editing an option
connect(m_uiForm.leDetailedBalance, SIGNAL(textChanged(const QString &)), this, SLOT(validateTab()));
connect(m_uiForm.leScaleMultiplier, SIGNAL(textChanged(const QString &)), this, SLOT(validateTab()));
connect(m_uiForm.leSpectraMin, SIGNAL(textChanged(const QString &)), this, SLOT(validateTab()));
connect(m_uiForm.leSpectraMax, SIGNAL(textChanged(const QString &)), this, SLOT(validateTab()));
connect(m_uiForm.entryRebinLow, SIGNAL(textChanged(const QString &)), this, SLOT(validateTab()));
connect(m_uiForm.entryRebinWidth, SIGNAL(textChanged(const QString &)), this, SLOT(validateTab()));
connect(m_uiForm.entryRebinHigh, SIGNAL(textChanged(const QString &)), this, SLOT(validateTab()));
connect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this, SLOT(algorithmComplete(bool)));
// Update UI widgets to show default values
mappingOptionSelected(m_uiForm.cbMappingOptions->currentText());
rebinEntryToggle(m_uiForm.rebin_ckDNR->isChecked());
rebinEntryToggle(m_uiForm.ckDoNotRebin->isChecked());
backgroundRemoval();
// Validate to remove invalid markers
......@@ -124,8 +99,8 @@ namespace CustomInterfaces
}
std::vector<long> detectorRange;
detectorRange.push_back(m_uiForm.leSpectraMin->text().toInt());
detectorRange.push_back(m_uiForm.leSpectraMax->text().toInt());
detectorRange.push_back(m_uiForm.spSpectraMin->value());
detectorRange.push_back(m_uiForm.spSpectraMax->value());
reductionAlg->setProperty("DetectorRange", detectorRange);
if(m_bgRemoval)
......@@ -137,22 +112,22 @@ namespace CustomInterfaces
reductionAlg->setProperty("BackgroundRange", backgroundRange);
}
if(!m_uiForm.rebin_ckDNR->isChecked())
if(!m_uiForm.ckDoNotRebin->isChecked())
{
QString rebin;
if(m_uiForm.comboRebinType->currentIndex() == 0)
rebin = m_uiForm.entryRebinLow->text() + "," + m_uiForm.entryRebinWidth->text() + "," + m_uiForm.entryRebinHigh->text();
if(m_uiForm.cbRebinType->currentIndex() == 0)
rebin = m_uiForm.spRebinLow->text() + "," + m_uiForm.spRebinWidth->text() + "," + m_uiForm.spRebinHigh->text();
else
rebin = m_uiForm.entryRebinString->text();
rebin = m_uiForm.leRebinString->text();
reductionAlg->setProperty("RebinString", rebin.toStdString());
}
if(m_uiForm.ckDetailedBalance->isChecked())
reductionAlg->setProperty("DetailedBalance", m_uiForm.leDetailedBalance->text().toDouble());
reductionAlg->setProperty("DetailedBalance", m_uiForm.spDetailedBalance->value());
if(m_uiForm.ckScaleMultiplier->isChecked())
reductionAlg->setProperty("ScaleFactor", m_uiForm.leScaleMultiplier->text().toDouble());
reductionAlg->setProperty("ScaleFactor", m_uiForm.spScaleMultiplier->value());
if(m_uiForm.cbMappingOptions->currentText() != "Default")
{
......@@ -167,7 +142,7 @@ namespace CustomInterfaces
reductionAlg->setProperty("OutputWorkspace", "IndirectEnergyTransfer_Workspaces");
// Plot Output options
switch(m_uiForm.ind_cbPlotOutput->currentIndex())
switch(m_uiForm.cbPlotType->currentIndex())
{
case 0: // "None"
break;
......@@ -214,24 +189,20 @@ namespace CustomInterfaces
{
bool valid = true;
// run files input
if ( ! m_uiForm.ind_runFiles->isValid() )
{
// Run files input
if(!m_uiForm.ind_runFiles->isValid())
valid = false;
}
// calib file input
if ( m_uiForm.ckUseCalib->isChecked() && !m_uiForm.ind_calibFile->isValid() )
{
// Calibration file input
if(m_uiForm.ckUseCalib->isChecked() && !m_uiForm.ind_calibFile->isValid())
valid = false;
}
// mapping selection
if (
( m_uiForm.cbMappingOptions->currentText() == "Groups" && m_uiForm.leNoGroups->text() == "" )
||
( m_uiForm.cbMappingOptions->currentText() == "File" && ! m_uiForm.ind_mapFile->isValid() )
)
// Mapping selection
if(
(m_uiForm.cbMappingOptions->currentText() == "Groups" && m_uiForm.leNoGroups->text() == "")
||
(m_uiForm.cbMappingOptions->currentText() == "File" && ! m_uiForm.ind_mapFile->isValid())
)
{
valid = false;
m_uiForm.valNoGroups->setText("*");
......@@ -241,112 +212,6 @@ namespace CustomInterfaces
m_uiForm.valNoGroups->setText("");
}
int dummyPos = 0;
QString text = m_uiForm.leDetailedBalance->text();
QValidator::State fieldState = m_uiForm.leDetailedBalance->validator()->validate(text, dummyPos);
// detailed balance
if ( m_uiForm.ckDetailedBalance->isChecked() && fieldState != QValidator::Acceptable )
{
valid = false;
m_uiForm.valDetailedBalance->setText("*");
}
else
{
m_uiForm.valDetailedBalance->setText("");
}
int dummyPos2 = 0;
// scale multiplier
QString scaleMultiplierText = m_uiForm.leScaleMultiplier->text();
QValidator::State fieldState2 = m_uiForm.leScaleMultiplier->validator()->validate(scaleMultiplierText, dummyPos2);
if ( m_uiForm.ckScaleMultiplier->isChecked() && fieldState2 != QValidator::Acceptable )
{
valid = false;
m_uiForm.valScaleMultiplier->setText("*");
}
else
{
m_uiForm.valScaleMultiplier->setText("");
}
// SpectraMin/SpectraMax
const QString specMin = m_uiForm.leSpectraMin->text();
const QString specMax = m_uiForm.leSpectraMax->text();
if (specMin.isEmpty() || specMax.isEmpty() ||
(specMin.toDouble() < 1 || specMax.toDouble() < 1) ||
(specMin.toDouble() > specMax.toDouble()))
{
valid = false;
m_uiForm.valSpectraMin->setText("*");
m_uiForm.valSpectraMax->setText("*");
}
else
{
m_uiForm.valSpectraMin->setText("");
m_uiForm.valSpectraMax->setText("");
}
if ( ! m_uiForm.rebin_ckDNR->isChecked() )
{
if ( m_uiForm.comboRebinType->currentIndex() == 0 )
{
if ( m_uiForm.entryRebinLow->text() == "" )
{
valid = false;
m_uiForm.valELow->setText("*");
}
else
{
m_uiForm.valELow->setText("");
}
if ( m_uiForm.entryRebinWidth->text() == "" )
{
valid = false;
m_uiForm.valEWidth->setText("*");
}
else
{
m_uiForm.valEWidth->setText("");
}
if ( m_uiForm.entryRebinHigh->text() == "" )
{
valid = false;
m_uiForm.valEHigh->setText("*");
}
else
{
m_uiForm.valEHigh->setText("");
}
if ( m_uiForm.entryRebinLow->text().toDouble() > m_uiForm.entryRebinHigh->text().toDouble() )
{
valid = false;
m_uiForm.valELow->setText("*");
m_uiForm.valEHigh->setText("*");
}
}
else
{
if ( m_uiForm.entryRebinString->text() == "" )
{
valid = false;
}
}
}
else
{
m_uiForm.valELow->setText("");
m_uiForm.valEWidth->setText("");
m_uiForm.valEHigh->setText("");
}
return valid;
}
......@@ -356,10 +221,6 @@ namespace CustomInterfaces
*/
void IndirectConvertToEnergy::setInstrumentDefault()
{
m_uiForm.leSpectraMin->clear();
m_uiForm.leSpectraMax->clear();
m_uiForm.leEfixed->clear();
std::map<QString, QString> instDetails = getInstrumentDetails();
if(instDetails["spectra-min"].isEmpty() || instDetails["spectra-max"].isEmpty())
......@@ -368,8 +229,8 @@ namespace CustomInterfaces
return;
}
m_uiForm.leSpectraMin->setText(instDetails["spectra-min"]);
m_uiForm.leSpectraMax->setText(instDetails["spectra-max"]);
m_uiForm.spSpectraMin->setValue(instDetails["spectra-min"].toInt());
m_uiForm.spSpectraMax->setValue(instDetails["spectra-max"].toInt());
if(!instDetails["efixed-val"].isEmpty())
m_uiForm.leEfixed->setText(instDetails["efixed-val"]);
......@@ -379,28 +240,28 @@ namespace CustomInterfaces
// Default rebinning parameters can be set in instrument parameter file
if(!instDetails["rebin-default"].isEmpty())
{
m_uiForm.entryRebinString->setText(instDetails["rebin-default"]);
m_uiForm.rebin_ckDNR->setChecked(false);
m_uiForm.leRebinString->setText(instDetails["rebin-default"]);
m_uiForm.ckDoNotRebin->setChecked(false);
QStringList rbp = instDetails["rebin-default"].split(",", QString::SkipEmptyParts);
if ( rbp.size() == 3 )
{
m_uiForm.entryRebinLow->setText(rbp[0]);
m_uiForm.entryRebinWidth->setText(rbp[1]);
m_uiForm.entryRebinHigh->setText(rbp[2]);
m_uiForm.comboRebinType->setCurrentIndex(0);
m_uiForm.spRebinLow->setValue(rbp[0].toDouble());
m_uiForm.spRebinWidth->setValue(rbp[1].toDouble());
m_uiForm.spRebinHigh->setValue(rbp[2].toDouble());
m_uiForm.cbRebinType->setCurrentIndex(0);
}
else
{
m_uiForm.comboRebinType->setCurrentIndex(1);
m_uiForm.cbRebinType->setCurrentIndex(1);
}
}
else
{
m_uiForm.rebin_ckDNR->setChecked(true);
m_uiForm.entryRebinLow->setText("");
m_uiForm.entryRebinWidth->setText("");
m_uiForm.entryRebinHigh->setText("");
m_uiForm.entryRebinString->setText("");
m_uiForm.ckDoNotRebin->setChecked(true);
m_uiForm.spRebinLow->setValue(0.0);
m_uiForm.spRebinWidth->setValue(0.0);
m_uiForm.spRebinHigh->setValue(0.0);
m_uiForm.leRebinString->setText("");
}
if(!instDetails["cm-1-convert-choice"].isEmpty())
......@@ -412,7 +273,7 @@ namespace CustomInterfaces
if(!instDetails["save-ascii-choice"].isEmpty())
{
bool defaultOptions = instDetails["save-ascii-choice"] == "true";
m_uiForm.save_ckAscii->setChecked(defaultOptions);
m_uiForm.ckSaveASCII->setChecked(defaultOptions);
}
}
......@@ -462,70 +323,9 @@ namespace CustomInterfaces
m_bgRemoval = m_backgroundDialog->removeBackground();
if(m_bgRemoval)
m_uiForm.pbBack_2->setText("Background Removal (On)");
m_uiForm.pbBackgroundRemoval->setText("Background Removal (On)");
else
m_uiForm.pbBack_2->setText("Background Removal (Off)");
}
/**
* This function will disable the necessary elements of the interface when the user selects "Do Not Rebin"
* and enable them again when this is de-selected.
*
* @param state :: whether the "Do Not Rebin" checkbox is checked
*/
void IndirectConvertToEnergy::rebinEntryToggle(bool state)
{
//Determine value for single rebin field
QString val;
if(state)
val = " ";
else
val = "*";
//Rebin mode selection
m_uiForm.comboRebinType->setEnabled(!state);
m_uiForm.labelRebinSteps->setEnabled(!state);
//Single rebin text entry
m_uiForm.labelRebinLow->setEnabled( !state );
m_uiForm.labelRebinWidth->setEnabled( !state );
m_uiForm.labelRebinHigh->setEnabled( !state );
m_uiForm.entryRebinLow->setEnabled( !state );
m_uiForm.entryRebinWidth->setEnabled( !state );
m_uiForm.entryRebinHigh->setEnabled( !state );
//Rebin required markers
m_uiForm.valELow->setEnabled(!state);
m_uiForm.valELow->setText(val);
m_uiForm.valEWidth->setEnabled(!state);
m_uiForm.valEWidth->setText(val);
m_uiForm.valEHigh->setEnabled(!state);
m_uiForm.valEHigh->setText(val);
//Rebin string entry
m_uiForm.entryRebinString->setEnabled(!state);
m_uiForm.labelRebinString->setEnabled(!state);
}
/**
* Disables/enables the relevant parts of the UI when user checks/unchecks the Detailed Balance
* ckDetailedBalance checkbox.
* @param state :: state of the checkbox
*/
void IndirectConvertToEnergy::detailedBalanceCheck(bool state)
{
m_uiForm.leDetailedBalance->setEnabled(state);
m_uiForm.lbDBKelvin->setEnabled(state);
}
/**
* Disables/enables the relevant parts of the UI when user checks/unchecks the 'Multiplication Factor (Scale):'
* ckScaleMultiplier checkbox.
* @param state :: state of the checkbox
*/
void IndirectConvertToEnergy::scaleMultiplierCheck(bool state)
{
m_uiForm.leScaleMultiplier->setEnabled(state);
m_uiForm.pbBackgroundRemoval->setText("Background Removal (Off)");
}
/**
......@@ -535,7 +335,7 @@ namespace CustomInterfaces
*/
QString IndirectConvertToEnergy::createMapFile(const QString& groupType)
{
QString specRange = m_uiForm.leSpectraMin->text() + "," + m_uiForm.leSpectraMax->text();
QString specRange = m_uiForm.spSpectraMin->text() + "," + m_uiForm.spSpectraMax->text();
if(groupType == "File")
{
......@@ -579,17 +379,17 @@ namespace CustomInterfaces
{
std::vector<std::string> fileFormats;
if ( m_uiForm.save_ckNexus->isChecked() )
if ( m_uiForm.ckSaveNexus->isChecked() )
fileFormats.push_back("nxs");
if ( m_uiForm.save_ckSPE->isChecked() )
if ( m_uiForm.ckSaveSPE->isChecked() )
fileFormats.push_back("spe");
if ( m_uiForm.save_ckNxSPE->isChecked() )
if ( m_uiForm.ckSaveNXSPE->isChecked() )
fileFormats.push_back("nxspe");
if ( m_uiForm.save_ckAscii->isChecked() )
if ( m_uiForm.ckSaveASCII->isChecked() )
fileFormats.push_back("ascii");
if ( m_uiForm.save_ckAclimax->isChecked() )
if ( m_uiForm.ckSaveAclimax->isChecked() )
fileFormats.push_back("aclimax");
if ( m_uiForm.save_ckDaveGrp->isChecked() )
if ( m_uiForm.ckSaveDaveGrp->isChecked() )
fileFormats.push_back("davegrp");
return fileFormats;
......@@ -609,7 +409,7 @@ namespace CustomInterfaces
}
bool ok;
QString spectraRange = QInputDialog::getText(0, "Insert Spectra Ranges", "Range: ", QLineEdit::Normal, m_uiForm.leSpectraMin->text() +"-"+ m_uiForm.leSpectraMax->text(), &ok);
QString spectraRange = QInputDialog::getText(0, "Insert Spectra Ranges", "Range: ", QLineEdit::Normal, m_uiForm.spSpectraMin->text() +"-"+ m_uiForm.spSpectraMax->text(), &ok);
if(!ok || spectraRange.isEmpty())
return;
......
Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/IndirectDiagnostics.cpp
+ 35
− 33
View file @ 6acc0450
......@@ -23,9 +23,11 @@ namespace CustomInterfaces
IndirectDiagnostics::IndirectDiagnostics(Ui::IndirectDataReduction& uiForm, QWidget * parent) :
IndirectDataReductionTab(uiForm, parent), m_lastDiagFilename("")
{
m_uiForm.setupUi(parent);
// Property Tree
m_propTrees["SlicePropTree"] = new QtTreePropertyBrowser();
m_uiForm.slice_properties->addWidget(m_propTrees["SlicePropTree"]);
m_uiForm.properties->addWidget(m_propTrees["SlicePropTree"]);
// Editor Factories
DoubleEditorFactory *doubleEditorFactory = new DoubleEditorFactory();
......@@ -71,7 +73,7 @@ namespace CustomInterfaces
m_plots["SlicePlot"]->setAxisFont(QwtPlot::xBottom, parent->font());
m_plots["SlicePlot"]->setAxisFont(QwtPlot::yLeft, parent->font());
m_plots["SlicePlot"]->setCanvasBackground(Qt::white);
m_uiForm.slice_plot->addWidget(m_plots["SlicePlot"]);
m_uiForm.plotRaw->addWidget(m_plots["SlicePlot"]);
// Setup second range
m_rangeSelectors["SliceBackground"]->setColour(Qt::darkGreen); // Dark green for background
......@@ -85,7 +87,7 @@ namespace CustomInterfaces
m_plots["SlicePreviewPlot"]->setAxisFont(QwtPlot::xBottom, parent->font());
m_plots["SlicePreviewPlot"]->setAxisFont(QwtPlot::yLeft, parent->font());
m_plots["SlicePreviewPlot"]->setCanvasBackground(Qt::white);
m_uiForm.slice_plotPreview->addWidget(m_plots["SlicePreviewPlot"]);
m_uiForm.plotPreview->addWidget(m_plots["SlicePreviewPlot"]);
m_plots["SlicePreviewPlot"]->replot();
// SIGNAL/SLOT CONNECTIONS
......@@ -102,23 +104,23 @@ namespace CustomInterfaces
// Enable/disable second range options when checkbox is toggled
connect(m_blnManager, SIGNAL(valueChanged(QtProperty*, bool)), this, SLOT(sliceTwoRanges(QtProperty*, bool)));
// Enables/disables calibration file selection when user toggles Use Calibratin File checkbox
connect(m_uiForm.slice_ckUseCalib, SIGNAL(toggled(bool)), this, SLOT(sliceCalib(bool)));
connect(m_uiForm.ckUseCalibration, SIGNAL(toggled(bool)), this, SLOT(sliceCalib(bool)));
// Plot slice miniplot when file has finished loading
connect(m_uiForm.slice_inputFile, SIGNAL(filesFound()), this, SLOT(slicePlotRaw()));
connect(m_uiForm.dsInputFiles, SIGNAL(filesFound()), this, SLOT(slicePlotRaw()));
// Shows message on run buton when user is inputting a run number
connect(m_uiForm.slice_inputFile, SIGNAL(fileTextChanged(const QString &)), this, SLOT(pbRunEditing()));
connect(m_uiForm.dsInputFiles, SIGNAL(fileTextChanged(const QString &)), this, SLOT(pbRunEditing()));
// Shows message on run button when Mantid is finding the file for a given run number
connect(m_uiForm.slice_inputFile, SIGNAL(findingFiles()), this, SLOT(pbRunFinding()));
connect(m_uiForm.dsInputFiles, SIGNAL(findingFiles()), this, SLOT(pbRunFinding()));
// Reverts run button back to normal when file finding has finished
connect(m_uiForm.slice_inputFile, SIGNAL(fileFindingFinished()), this, SLOT(pbRunFinished()));
connect(m_uiForm.dsInputFiles, SIGNAL(fileFindingFinished()), this, SLOT(pbRunFinished()));
// Update preview plot when slice algorithm completes
connect(m_batchAlgoRunner, SIGNAL(batchComplete(bool)), this, SLOT(sliceAlgDone(bool)));
// Set default UI state
sliceTwoRanges(0, false);
m_uiForm.slice_ckUseCalib->setChecked(false);
m_uiForm.ckUseCalibration->setChecked(false);
sliceCalib(false);
}
......@@ -135,9 +137,9 @@ namespace CustomInterfaces
void IndirectDiagnostics::run()
{
QString suffix = "_" + m_uiForm.iicInstrumentConfiguration->getAnalyserName()
+ m_uiForm.iicInstrumentConfiguration->getReflectionName() + "_slice";
QString filenames = m_uiForm.slice_inputFile->getFilenames().join(",");
QString suffix = "_slice"; //"_" + m_uiForm.iicInstrumentConfiguration->getAnalyserName() TODO
//+ m_uiForm.iicInstrumentConfiguration->getReflectionName() + "_slice";
QString filenames = m_uiForm.dsInputFiles->getFilenames().join(",");
std::vector<long> spectraRange;
spectraRange.push_back(static_cast<long>(m_dblManager->value(m_properties["SpecMin"])));
......@@ -153,15 +155,15 @@ namespace CustomInterfaces
sliceAlg->setProperty("InputFiles", filenames.toStdString());
sliceAlg->setProperty("SpectraRange", spectraRange);
sliceAlg->setProperty("PeakRange", peakRange);
sliceAlg->setProperty("Verbose", m_uiForm.slice_ckVerbose->isChecked());
sliceAlg->setProperty("Plot", m_uiForm.slice_ckPlot->isChecked());
sliceAlg->setProperty("Save", m_uiForm.slice_ckSave->isChecked());
sliceAlg->setProperty("Verbose", m_uiForm.ckVerbose->isChecked());
sliceAlg->setProperty("Plot", m_uiForm.ckPlot->isChecked());
sliceAlg->setProperty("Save", m_uiForm.ckSave->isChecked());
sliceAlg->setProperty("OutputNameSuffix", suffix.toStdString());
sliceAlg->setProperty("OutputWorkspace", "IndirectDiagnostics_Workspaces");
if(m_uiForm.slice_ckUseCalib->isChecked())
if(m_uiForm.ckUseCalibration->isChecked())
{
QString calibWsName = m_uiForm.slice_dsCalibFile->getCurrentDataName();
QString calibWsName = m_uiForm.dsCalibration->getCurrentDataName();
sliceAlg->setProperty("CalibrationWorkspace", calibWsName.toStdString());
}
......@@ -181,9 +183,9 @@ namespace CustomInterfaces
UserInputValidator uiv;
// Check raw input
uiv.checkMWRunFilesIsValid("Input", m_uiForm.slice_inputFile);
if(m_uiForm.slice_ckUseCalib->isChecked())
uiv.checkMWRunFilesIsValid("Calibration", m_uiForm.slice_inputFile);
uiv.checkMWRunFilesIsValid("Input", m_uiForm.dsInputFiles);
if(m_uiForm.ckUseCalibration->isChecked())
uiv.checkMWRunFilesIsValid("Calibration", m_uiForm.dsInputFiles);
// Check peak range
auto rangeOne = std::make_pair(m_dblManager->value(m_properties["PeakStart"]), m_dblManager->value(m_properties["PeakEnd"]));
......@@ -239,7 +241,7 @@ namespace CustomInterfaces
*/
void IndirectDiagnostics::slicePlotRaw()
{
QString filename = m_uiForm.slice_inputFile->getFirstFilename();
QString filename = m_uiForm.dsInputFiles->getFirstFilename();
// Only update if we have a different file
if(filename == m_lastDiagFilename)
......@@ -252,7 +254,7 @@ namespace CustomInterfaces
setDefaultInstDetails();
if ( m_uiForm.slice_inputFile->isValid() )
if ( m_uiForm.dsInputFiles->isValid() )
{
QFileInfo fi(filename);
QString wsname = fi.baseName();
......@@ -308,7 +310,7 @@ namespace CustomInterfaces
*/
void IndirectDiagnostics::sliceCalib(bool state)
{
m_uiForm.slice_dsCalibFile->setEnabled(state);
m_uiForm.dsCalibration->setEnabled(state);
}
void IndirectDiagnostics::rangeSelectorDropped(double min, double max)
......@@ -346,9 +348,9 @@ namespace CustomInterfaces
*/
void IndirectDiagnostics::updatePreviewPlot()
{
QString suffix = "_" + m_uiForm.iicInstrumentConfiguration->getAnalyserName()
+ m_uiForm.iicInstrumentConfiguration->getReflectionName() + "_slice";
QString filenames = m_uiForm.slice_inputFile->getFilenames().join(",");
QString suffix = "_slice"; //"_" + m_uiForm.iicInstrumentConfiguration->getAnalyserName()
//+ m_uiForm.iicInstrumentConfiguration->getReflectionName() + "_slice"; TODO
QString filenames = m_uiForm.dsInputFiles->getFilenames().join(",");
std::vector<long> spectraRange;
spectraRange.push_back(static_cast<long>(m_dblManager->value(m_properties["SpecMin"])));
......@@ -364,15 +366,15 @@ namespace CustomInterfaces
sliceAlg->setProperty("InputFiles", filenames.toStdString());
sliceAlg->setProperty("SpectraRange", spectraRange);
sliceAlg->setProperty("PeakRange", peakRange);
sliceAlg->setProperty("Verbose", m_uiForm.slice_ckVerbose->isChecked());
sliceAlg->setProperty("Verbose", m_uiForm.ckVerbose->isChecked());
sliceAlg->setProperty("Plot", false);
sliceAlg->setProperty("Save", false);
sliceAlg->setProperty("OutputNameSuffix", suffix.toStdString());
sliceAlg->setProperty("OutputWorkspace", "IndirectDiagnostics_Workspaces");
if(m_uiForm.slice_ckUseCalib->isChecked())
if(m_uiForm.ckUseCalibration->isChecked())
{
QString calibWsName = m_uiForm.slice_dsCalibFile->getCurrentDataName();
QString calibWsName = m_uiForm.dsCalibration->getCurrentDataName();
sliceAlg->setProperty("CalibrationWorkspace", calibWsName.toStdString());
}
......@@ -399,7 +401,7 @@ namespace CustomInterfaces
if(error)
return;
QStringList filenames = m_uiForm.slice_inputFile->getFilenames();
QStringList filenames = m_uiForm.dsInputFiles->getFilenames();
if(filenames.size() < 1)
return;
......@@ -446,7 +448,7 @@ namespace CustomInterfaces
void IndirectDiagnostics::pbRunFinding()
{
emit updateRunButton(false, "Finding files...", "Searchig for data files for the run numbers entered...");
m_uiForm.slice_inputFile->setEnabled(false);
m_uiForm.dsInputFiles->setEnabled(false);
}
/**
......@@ -454,7 +456,7 @@ namespace CustomInterfaces
*/
void IndirectDiagnostics::pbRunFinished()
{
if(!m_uiForm.slice_inputFile->isValid())
if(!m_uiForm.dsInputFiles->isValid())
{
emit updateRunButton(false, "Invalid Run(s)", "Cannot find data files for some of the run numbers enetered.");
}
......@@ -463,7 +465,7 @@ namespace CustomInterfaces
emit updateRunButton();
}
m_uiForm.slice_inputFile->setEnabled(true);
m_uiForm.dsInputFiles->setEnabled(true);
}
} // namespace CustomInterfaces
......
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