Skip to content

Commit

Permalink
Chnaged C2E SofQ tab and IDA interface to use workspace selectors.
Browse files Browse the repository at this point in the history 
Refs #5590
  • Loading branch information
Samuel Jackson committed Jul 26, 2013
1 parent 9eae751 commit 660f974
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 62 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,6 @@ namespace MantidQt
bool validateInput(); ///< validate input of "Energy Transfer" tab
QString validateCalib(); ///< validate input of "Calibration" tab
bool validateSofQw(); ///< validate input of "S(Q, w)" tab
bool validateSofQ(int);
QString validateSlice(); ///< validate input of "Slice" tab
void loadSettings();
void saveSettings();
Expand All @@ -93,6 +92,7 @@ namespace MantidQt
void setupSlice(); ///< setup the slice miniplot section

private slots:
void validateSofQ(int);
void pbRunEditing(); //< Called when a user starts to type / edit the runs to load.
void pbRunFinding(); //< Called when the FileFinder starts finding the files.
void pbRunFinished(); //< Called when the FileFinder has finished finding the files.
Expand Down
86 changes: 28 additions & 58 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectDataAnalysis.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>587</width>
<height>488</height>
<width>752</width>
<height>575</height>
</rect>
</property>
<property name="windowTitle">
Expand All @@ -33,7 +33,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_16">
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="elwin_inputFile" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="elwin_inputFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -49,7 +49,7 @@
<property name="multipleFiles" stdset="0">
<bool>true</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_red.nxs</string>
</stringlist>
Expand Down Expand Up @@ -193,7 +193,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_18">
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="msd_inputFile" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="msd_inputFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -209,7 +209,7 @@
<property name="multipleFiles" stdset="0">
<bool>true</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_eq2.nxs</string>
</stringlist>
Expand Down Expand Up @@ -305,7 +305,7 @@
<item>
<layout class="QGridLayout" name="fury_layoutFiles">
<item row="2" column="1">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="fury_resFile" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="fury_resFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -321,7 +321,7 @@
<property name="multipleFiles" stdset="0">
<bool>false</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_res.nxs</string>
</stringlist>
Expand Down Expand Up @@ -387,7 +387,7 @@
<number>0</number>
</property>
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="fury_iconFile" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="fury_iconFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -403,7 +403,7 @@
<property name="multipleFiles" stdset="0">
<bool>true</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_red.nxs</string>
<string>_sqw.nxs</string>
Expand All @@ -419,11 +419,7 @@
<number>0</number>
</property>
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="fury_wsSample">
<property name="Suffix" stdset="0">
<string>_red</string>
</property>
</widget>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="fury_wsSample"/>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -550,7 +546,7 @@
<widget class="QWidget" name="furyfit_page_inputFile">
<layout class="QHBoxLayout" name="horizontalLayout_19">
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="furyfit_inputFile" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="furyfit_inputFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand All @@ -566,7 +562,7 @@
<property name="multipleFiles" stdset="0">
<bool>false</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_iqt.nxs</string>
</stringlist>
Expand All @@ -578,11 +574,7 @@
<widget class="QWidget" name="furyfit_page_inputWorkspace">
<layout class="QHBoxLayout" name="horizontalLayout_12">
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="furyfit_wsIqt">
<property name="Suffix" stdset="0">
<string>_iqt</string>
</property>
</widget>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="furyfit_wsIqt"/>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -878,7 +870,7 @@
<widget class="QWidget" name="confit_page_inputFile">
<layout class="QHBoxLayout" name="confit_layout_page_inputFile">
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="confit_inputFile" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="confit_inputFile">
<property name="findRunFiles" stdset="0">
<bool>false</bool>
</property>
Expand All @@ -888,7 +880,7 @@
<property name="multipleFiles" stdset="0">
<bool>false</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_red.nxs</string>
<string>_sqw.nxs</string>
Expand All @@ -901,11 +893,7 @@
<widget class="QWidget" name="confit_page_inputWorkspace">
<layout class="QHBoxLayout" name="horizontalLayout_29">
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="confit_wsSample">
<property name="Suffix" stdset="0">
<string>_red</string>
</property>
</widget>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="confit_wsSample"/>
</item>
</layout>
</widget>
Expand All @@ -921,7 +909,7 @@
</layout>
</item>
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="confit_resInput" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="confit_resInput">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
Expand All @@ -937,7 +925,7 @@
<property name="multipleFiles" stdset="0">
<bool>false</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_res.nxs</string>
<string>.res</string>
Expand Down Expand Up @@ -1266,7 +1254,7 @@
<number>0</number>
</property>
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="absp_inputFile" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="absp_inputFile">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
Expand All @@ -1282,7 +1270,7 @@
<property name="multipleFiles" stdset="0">
<bool>false</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_red.nxs</string>
</stringlist>
Expand All @@ -1300,11 +1288,7 @@
<number>0</number>
</property>
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="absp_wsInput">
<property name="Suffix" stdset="0">
<string>_red</string>
</property>
</widget>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="absp_wsInput"/>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -1897,7 +1881,7 @@
<widget class="QWidget" name="abscor_samFile">
<layout class="QVBoxLayout" name="verticalLayout_17">
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="abscor_sample" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="abscor_sample">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
Expand All @@ -1910,7 +1894,7 @@
<property name="multipleFiles" stdset="0">
<bool>false</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_red.nxs</string>
</stringlist>
Expand All @@ -1922,11 +1906,7 @@
<widget class="QWidget" name="abscor_samWS">
<layout class="QHBoxLayout" name="horizontalLayout_31">
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="abscor_wsSample">
<property name="Suffix" stdset="0">
<string>_red</string>
</property>
</widget>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="abscor_wsSample"/>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -2095,7 +2075,7 @@
<number>0</number>
</property>
<item>
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="abscor_can" native="true">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="abscor_can">
<property name="enabled">
<bool>true</bool>
</property>
Expand All @@ -2114,7 +2094,7 @@
<property name="optional" stdset="0">
<bool>false</bool>
</property>
<property name="fileExtensions" stdset="0">
<property name="fileExtensions">
<stringlist>
<string>_red.nxs</string>
</stringlist>
Expand All @@ -2129,11 +2109,7 @@
<number>0</number>
</property>
<item>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="abscor_wsContainer">
<property name="Suffix" stdset="0">
<string>_red</string>
</property>
</widget>
<widget class="MantidQt::MantidWidgets::WorkspaceSelector" name="abscor_wsContainerInput"/>
</item>
</layout>
</widget>
Expand Down Expand Up @@ -2378,19 +2354,16 @@
<tabstop>fury_pbPlotInput</tabstop>
<tabstop>fury_cbResType</tabstop>
<tabstop>fury_cbInputType</tabstop>
<tabstop>fury_wsSample</tabstop>
<tabstop>fury_ckVerbose</tabstop>
<tabstop>fury_ckPlot</tabstop>
<tabstop>fury_ckSave</tabstop>
<tabstop>furyfit_cbInputType</tabstop>
<tabstop>furyfit_wsIqt</tabstop>
<tabstop>furyfit_pbPlotInput</tabstop>
<tabstop>furyfit_cbFitType</tabstop>
<tabstop>furyfit_ckConstrainIntensities</tabstop>
<tabstop>furyfit_ckPlotGuess</tabstop>
<tabstop>furyfit_leSpecNo</tabstop>
<tabstop>confit_cbInputType</tabstop>
<tabstop>confit_wsSample</tabstop>
<tabstop>confit_pbPlotInput</tabstop>
<tabstop>confit_cbFitType</tabstop>
<tabstop>confit_cbBackground</tabstop>
Expand All @@ -2399,7 +2372,6 @@
<tabstop>confit_leSpecMax</tabstop>
<tabstop>confit_cbPlotOutput</tabstop>
<tabstop>absp_cbInputType</tabstop>
<tabstop>absp_wsInput</tabstop>
<tabstop>absp_ckUseCan</tabstop>
<tabstop>absp_cbShape</tabstop>
<tabstop>absp_lets</tabstop>
Expand All @@ -2418,12 +2390,10 @@
<tabstop>absp_lecansiga</tabstop>
<tabstop>absp_cbPlotOutput</tabstop>
<tabstop>abscor_cbSampleInputType</tabstop>
<tabstop>abscor_wsSample</tabstop>
<tabstop>abscor_cbGeometry</tabstop>
<tabstop>abscor_ckUseCorrections</tabstop>
<tabstop>abscor_ckUseCan</tabstop>
<tabstop>abscor_cbContainerInputType</tabstop>
<tabstop>abscor_wsContainer</tabstop>
<tabstop>abscor_cbPlotOutput</tabstop>
<tabstop>pbHelp</tabstop>
<tabstop>pbRun</tabstop>
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/MantidQt/CustomInterfaces/src/Indirect.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ void Indirect::initLayout()
// "SofQW" tab
connect(m_uiForm.sqw_ckRebinE, SIGNAL(toggled(bool)), this, SLOT(sOfQwRebinE(bool)));
connect(m_uiForm.sqw_cbInput, SIGNAL(currentIndexChanged(int)), m_uiForm.sqw_swInput, SLOT(setCurrentIndex(int)));
connect(m_uiForm.sqw_cbWorkspace, SIGNAL(currentIndexChanged(int)), this, SLOT(validateSofQw(int)));
connect(m_uiForm.sqw_cbWorkspace, SIGNAL(currentIndexChanged(int)), this, SLOT(validateSofQ(int)));

connect(m_uiForm.sqw_pbPlotInput, SIGNAL(clicked()), this, SLOT(sOfQwPlotInput()));

Expand Down Expand Up @@ -758,9 +758,9 @@ QString Indirect::validateCalib()
return uiv.generateErrorMessage();
}

bool Indirect::validateSofQ(int)
void Indirect::validateSofQ(int)
{
return validateSofQw();
validateSofQw();
}

bool Indirect::validateSofQw()
Expand Down

0 comments on commit 660f974

Please sign in to comment.