Skip to content

Commit

Permalink
Refs #5421 Updated interface with better file handling.
Browse files Browse the repository at this point in the history
  • Loading branch information
Samuel Jackson committed Sep 23, 2013
1 parent 3fd966f commit 77b583c
Show file tree
Hide file tree
Showing 9 changed files with 426 additions and 325 deletions.
2 changes: 2 additions & 0 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/IndirectBayesTab.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ namespace MantidQt
void updateUpperGuide(QtProperty* lower, QtProperty* upper, double value);
/// Function to get the range of the curve displayed on the mini plot
std::pair<double,double> getCurveRange();
/// Function to check if the file name provided is available
bool checkFileLoaded(const QString& filename, const QString& filepath);

/// Plot of the input
QwtPlot* m_plot;
Expand Down
103 changes: 56 additions & 47 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/JumpFit.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,53 +123,62 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_44">
<item>
<widget class="QCheckBox" name="chkVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="chkPlot">
<property name="text">
<string>Plot Result</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="chkSave">
<property name="text">
<string>Save Result</string>
</property>
<widget class="QGroupBox" name="gbOutput">
<property name="title">
<string>Output Options</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QCheckBox" name="chkVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="chkPlot">
<property name="text">
<string>Plot Result</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_18">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="chkSave">
<property name="text">
<string>Save Result</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
Expand Down
185 changes: 97 additions & 88 deletions Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Quasi.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
</sizepolicy>
</property>
<property name="autoLoad">
<bool>true</bool>
<bool>false</bool>
</property>
<property name="workspaceSuffixes" stdset="0">
<stringlist>
Expand All @@ -75,20 +75,20 @@
</stringlist>
</property>
<property name="showLoad">
<bool>true</bool>
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QComboBox" name="cbProgram">
<item>
<property name="text">
<string>QL</string>
<string>Lorenzians</string>
</property>
</item>
<item>
<property name="text">
<string>QSe</string>
<string>Stretched Exponential</string>
</property>
</item>
</widget>
Expand Down Expand Up @@ -196,9 +196,9 @@
</widget>
</item>
<item>
<widget class="QCheckBox" name="chkSequence">
<widget class="QCheckBox" name="chkSequentialFit">
<property name="text">
<string>Sequence</string>
<string>Sequential Fit</string>
</property>
</widget>
</item>
Expand All @@ -220,12 +220,12 @@
</property>
<property name="workspaceSuffixes" stdset="0">
<stringlist>
<string>_red</string>
<string>_ResNorm</string>
</stringlist>
</property>
<property name="fileBrowserSuffixes" stdset="0">
<stringlist>
<string>_red.nxs</string>
<string>_ResNorm.nxs</string>
</stringlist>
</property>
<property name="showLoad">
Expand Down Expand Up @@ -264,87 +264,96 @@
<item>
<layout class="QHBoxLayout" name="horizontalLayout_44">
<item>
<widget class="QCheckBox" name="chkVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lblPlotResult">
<property name="text">
<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">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="chkSave">
<property name="text">
<string>Save Result</string>
<widget class="QGroupBox" name="gbOutput">
<property name="title">
<string>Output Options</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QCheckBox" name="chkVerbose">
<property name="enabled">
<bool>true</bool>
</property>
<property name="text">
<string>Verbose</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_17">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QLabel" name="lblPlotResult">
<property name="text">
<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">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QCheckBox" name="chkSave">
<property name="text">
<string>Save Result</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
Expand Down

0 comments on commit 77b583c

Please sign in to comment.