Skip to content

Commit

Permalink
Extend SANS UI to allow providing different fitting settings
Browse files Browse the repository at this point in the history 
Now, you can provide different options for CAN or SAMPLE when

fitting transmissions.

re #7733
  • Loading branch information
@gesnerpassos
gesnerpassos committed Aug 15, 2013
1 parent 4bb6ea5 commit bdd54c8
Show file tree
Hide file tree
Showing 3 changed files with 222 additions and 81 deletions.
2 changes: 2 additions & 0 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSRunWindow.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,6 +251,8 @@ private slots:
void checkList();
/// Adds a warning message to the tab title
void setLoggerTabTitleToWarn();
/// Handle selection of the transmission
void transSelectorChanged(int );


private:
Expand Down
120 changes: 87 additions & 33 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/SANSRunWindow.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>854</width>
<height>526</height>
<width>950</width>
<height>545</height>
</rect>
</property>
<property name="sizePolicy">
Expand Down Expand Up @@ -867,7 +867,7 @@
</property>
</spacer>
</item>
<item row="0" column="2">
<item row="0" column="1">
<widget class="QLabel" name="limits_min_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
Expand All @@ -887,7 +887,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="0" column="3">
<item row="0" column="2">
<widget class="QLabel" name="limits_max_lbl">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
Expand All @@ -914,7 +914,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="2">
<item row="1" column="1">
<widget class="QLineEdit" name="rad_min">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
Expand All @@ -930,7 +930,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="3">
<item row="1" column="2">
<widget class="QLineEdit" name="rad_max">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
Expand All @@ -956,7 +956,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="2" column="2" colspan="2">
<item row="2" column="1" colspan="2">
<widget class="QStackedWidget" name="wav_stack">
<property name="autoFillBackground">
<bool>false</bool>
Expand Down Expand Up @@ -1037,14 +1037,14 @@ intermediate ranges are there for comparison</string>
</widget>
</widget>
</item>
<item row="2" column="4">
<item row="2" column="3">
<widget class="QLabel" name="wav_step_lbl">
<property name="text">
<string>step</string>
</property>
</widget>
</item>
<item row="2" column="5">
<item row="2" column="4">
<widget class="QLineEdit" name="wav_dw">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
Expand All @@ -1063,7 +1063,7 @@ intermediate ranges are there for comparison</string>
</property>
</widget>
</item>
<item row="2" column="6">
<item row="2" column="5">
<widget class="QComboBox" name="wav_dw_opt">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
Expand Down Expand Up @@ -1102,7 +1102,7 @@ intermediate ranges are there for comparison</string>
</item>
</widget>
</item>
<item row="3" column="0" colspan="6">
<item row="3" column="0" colspan="5">
<widget class="QStackedWidget" name="q_stack">
<property name="autoFillBackground">
<bool>false</bool>
Expand Down Expand Up @@ -1219,7 +1219,7 @@ intermediate ranges are there for comparison</string>
</widget>
</widget>
</item>
<item row="3" column="6">
<item row="3" column="5">
<widget class="QComboBox" name="q_dq_opt">
<property name="sizePolicy">
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
Expand Down Expand Up @@ -1259,14 +1259,14 @@ intermediate ranges are there for comparison</string>
</item>
</widget>
</item>
<item row="5" column="0">
<item row="4" column="0">
<widget class="QLabel" name="qxy_lb">
<property name="text">
<string>Qxy (A^-1)</string>
</property>
</widget>
</item>
<item row="5" column="3">
<item row="4" column="1">
<widget class="QLineEdit" name="qy_max">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
Expand All @@ -1282,14 +1282,14 @@ intermediate ranges are there for comparison</string>
</property>
</widget>
</item>
<item row="5" column="4">
<item row="4" column="3">
<widget class="QLabel" name="qy_step_lbl">
<property name="text">
<string>step</string>
</property>
</widget>
</item>
<item row="5" column="5">
<item row="4" column="4">
<widget class="QLineEdit" name="qy_dqy">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Maximum">
Expand All @@ -1305,7 +1305,7 @@ intermediate ranges are there for comparison</string>
</property>
</widget>
</item>
<item row="5" column="6">
<item row="4" column="5">
<widget class="QComboBox" name="qy_dqy_opt">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred">
Expand All @@ -1320,7 +1320,41 @@ intermediate ranges are there for comparison</string>
</item>
</widget>
</item>
<item row="6" column="6">
<item row="5" column="0">
<widget class="QComboBox" name="trans_selector_opt">
<item>
<property name="text">
<string>Both</string>
</property>
</item>
<item>
<property name="text">
<string>Sample</string>
</property>
</item>
</widget>
</item>
<item row="5" column="1">
<widget class="QCheckBox" name="transFitOnOff">
<property name="text">
<string>Trans Fit</string>
</property>
</widget>
</item>
<item row="5" column="2">
<widget class="QCheckBox" name="transFit_ck">
<property name="text">
<string>Use</string>
</property>
</widget>
</item>
<item row="5" column="3">
<widget class="QLineEdit" name="trans_min"/>
</item>
<item row="5" column="4">
<widget class="QLineEdit" name="trans_max"/>
</item>
<item row="5" column="5">
<widget class="QComboBox" name="trans_opt">
<item>
<property name="text">
Expand All @@ -1334,29 +1368,49 @@ intermediate ranges are there for comparison</string>
</item>
</widget>
</item>
<item row="6" column="0" colspan="3">
<layout class="QHBoxLayout" name="horizontalLayout_8">
<item row="6" column="5">
<widget class="QComboBox" name="trans_opt_can">
<item>
<widget class="QCheckBox" name="transFitOnOff">
<property name="text">
<string>Trans Fit</string>
</property>
</widget>
<property name="text">
<string>Logarithmic</string>
</property>
</item>
<item>
<widget class="QCheckBox" name="transFit_ck">
<property name="text">
<string>Use</string>
</property>
</widget>
<property name="text">
<string>Linear</string>
</property>
</item>
</layout>
</widget>
</item>
<item row="6" column="4">
<widget class="QLineEdit" name="trans_max"/>
<widget class="QLineEdit" name="trans_max_can"/>
</item>
<item row="6" column="3">
<widget class="QLineEdit" name="trans_min"/>
<widget class="QLineEdit" name="trans_min_can"/>
</item>
<item row="6" column="2">
<widget class="QCheckBox" name="transFit_ck_can">
<property name="text">
<string>Use</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QCheckBox" name="transFitOnOff_can">
<property name="text">
<string>Trans Fit</string>
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="trans_can_label">
<property name="text">
<string>CAN</string>
</property>
</widget>
</item>
</layout>
</widget>
Expand Down

0 comments on commit bdd54c8

Please sign in to comment.