Skip to content

Commit

Permalink
Refs #5421 Linked Quasi GUI code with python script.
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Jackson committed Sep 17, 2013
1 parent 444dbbd commit 9d8570e
Show file tree
Hide file tree
Showing 10 changed files with 188 additions and 40 deletions.
6 changes: 3 additions & 3 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_44">
<item>
<widget class="QCheckBox" name="ckVerbose">
<widget class="QCheckBox" name="chkVerbose">
<property name="enabled">
<bool>true</bool>
</property>
Expand All @@ -137,7 +137,7 @@
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<widget class="QCheckBox" name="chkPlot">
<property name="text">
<string>Plot Result</string>
</property>
Expand All @@ -157,7 +157,7 @@
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckSave">
<widget class="QCheckBox" name="chkSave">
<property name="text">
<string>Save Result</string>
</property>
Expand Down
3 changes: 3 additions & 0 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ namespace MantidQt
virtual void minValueChanged(double min);
/// Slot for when the min range on the range selector changes
virtual void maxValueChanged(double max);
/// Slot to update the guides when the range properties change
void updateProperties(QtProperty* prop, double val);
/// Slot to handle when a new sample file is available
void handleSampleInputReady(const QString& filename);

private:
virtual QString help() { return "Quasi"; };
Expand Down
73 changes: 66 additions & 7 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</widget>
</item>
<item row="0" column="1">
<widget class="MantidQt::MantidWidgets::DataSelector" name="dsInput">
<widget class="MantidQt::MantidWidgets::DataSelector" name="dsSample">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -80,7 +80,7 @@
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cb">
<widget class="QComboBox" name="cbProgram">
<item>
<property name="text">
<string>QL</string>
Expand All @@ -93,6 +93,13 @@
</item>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="lblProgram">
<property name="text">
<string>Program</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
Expand Down Expand Up @@ -125,6 +132,9 @@
</item>
<item row="1" column="1">
<widget class="MantidQt::MantidWidgets::MWRunFiles" name="mwFixWidthDat">
<property name="enabled">
<bool>false</bool>
</property>
<property name="label" stdset="0">
<string/>
</property>
Expand All @@ -145,14 +155,19 @@
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Sloping</string>
</property>
</item>
<item>
<property name="text">
<string>Flat</string>
</property>
</item>
<item>
<property name="text">
<string>Sloping</string>
<string>Zero</string>
</property>
</item>
</widget>
Expand Down Expand Up @@ -180,10 +195,20 @@
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkSequence">
<property name="text">
<string>Sequence</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="1">
<widget class="MantidQt::MantidWidgets::DataSelector" name="dsResNorm">
<property name="enabled">
<bool>false</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<horstretch>0</horstretch>
Expand Down Expand Up @@ -239,7 +264,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_44">
<item>
<widget class="QCheckBox" name="ckVerbose">
<widget class="QCheckBox" name="chkVerbose">
<property name="enabled">
<bool>true</bool>
</property>
Expand All @@ -262,12 +287,46 @@
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<widget class="QLabel" name="lblPlotResult">
<property name="text">
<string>Plot Result</string>
<string>Plot Result: </string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="cbPlot">
<item>
<property name="text">
<string>None</string>
</property>
</item>
<item>
<property name="text">
<string>ProbBeta</string>
</property>
</item>
<item>
<property name="text">
<string>Intensity</string>
</property>
</item>
<item>
<property name="text">
<string>FwHm</string>
</property>
</item>
<item>
<property name="text">
<string>Fit</string>
</property>
</item>
<item>
<property name="text">
<string>All</string>
</property>
</item>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_18">
<property name="orientation">
Expand All @@ -282,7 +341,7 @@
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckSave">
<widget class="QCheckBox" name="chkSave">
<property name="text">
<string>Save Result</string>
</property>
Expand Down
6 changes: 3 additions & 3 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/ResNorm.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_44">
<item>
<widget class="QCheckBox" name="ckVerbose">
<widget class="QCheckBox" name="chkVerbose">
<property name="enabled">
<bool>true</bool>
</property>
Expand All @@ -123,7 +123,7 @@
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<widget class="QCheckBox" name="chkPlot">
<property name="text">
<string>Plot Result</string>
</property>
Expand All @@ -143,7 +143,7 @@
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckSave">
<widget class="QCheckBox" name="chkSave">
<property name="text">
<string>Save Result</string>
</property>
Expand Down
12 changes: 3 additions & 9 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Stretch.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -160,12 +160,6 @@
</layout>
</item>
</layout>
<zorder>cbBackground</zorder>
<zorder>lblBackground</zorder>
<zorder>chkElasticPeak</zorder>
<zorder>cbMode</zorder>
<zorder>lblMode</zorder>
<zorder>layoutWidget</zorder>
</widget>
</item>
<item>
Expand All @@ -181,7 +175,7 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_44">
<item>
<widget class="QCheckBox" name="ckVerbose">
<widget class="QCheckBox" name="chkVerbose">
<property name="enabled">
<bool>true</bool>
</property>
Expand All @@ -204,7 +198,7 @@
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckPlot">
<widget class="QCheckBox" name="chkPlot">
<property name="text">
<string>Plot Result</string>
</property>
Expand All @@ -224,7 +218,7 @@
</spacer>
</item>
<item>
<widget class="QCheckBox" name="ckSave">
<widget class="QCheckBox" name="chkSave">
<property name="text">
<string>Save Result</string>
</property>
Expand Down
2 changes: 1 addition & 1 deletion Code/Mantid/MantidQt/CustomInterfaces/src/JumpFit.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ namespace MantidQt
{
if(prop == m_properties["QMax"])
{
updateLowerGuide(m_properties["QMin"], m_properties["QMax"], val)
updateLowerGuide(m_properties["QMin"], m_properties["QMax"], val);
}
else if (prop == m_properties["QMax"])
{
Expand Down

0 comments on commit 9d8570e

Please sign in to comment.