diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui
index 854e4f4a4dbfccc1f4e5d8f8e0b4f4414993f8a3..ed7aedec640b48b2c35e75934cd044ba750039cf 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionQtTabFitting.ui
@@ -70,42 +70,52 @@
</item>
</layout>
</item>
- <item row="1" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item row="4" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout">
<item>
- <widget class="QLabel" name="label_fitting_peaks">
- <property name="text">
- <string>Peaks:</string>
+ <spacer name="horizontalSpacer_15">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
</property>
- </widget>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>38</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
</item>
<item>
- <widget class="QLineEdit" name="lineEdit_fitting_peaks">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>1</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <widget class="QLabel" name="label_comboBox_fitting_bank">
<property name="text">
- <string/>
- </property>
- <property name="readOnly">
- <bool>false</bool>
- </property>
- <property name="placeholderText">
- <string>Leave Blank To Use Default Expected Peaks</string>
+ <string>Plot Bank:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="pushButton_fitting_browse_peaks">
- <property name="enabled">
- <bool>true</bool>
+ <widget class="QComboBox" name="comboBox_bank">
+ <property name="minimumSize">
+ <size>
+ <width>111</width>
+ <height>0</height>
+ </size>
</property>
- <property name="text">
- <string>Browse</string>
+ <property name="maximumSize">
+ <size>
+ <width>240</width>
+ <height>16777215</height>
+ </size>
</property>
+ <item>
+ <property name="text">
+ <string>Bank North - 1</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Bank South - 2</string>
+ </property>
+ </item>
</widget>
</item>
</layout>
@@ -140,6 +150,46 @@
</item>
</layout>
</item>
+ <item row="1" column="0">
+ <layout class="QHBoxLayout" name="horizontalLayout_8">
+ <item>
+ <widget class="QLabel" name="label_fitting_peaks">
+ <property name="text">
+ <string>Peaks:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineEdit_fitting_peaks">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>1</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ <property name="readOnly">
+ <bool>false</bool>
+ </property>
+ <property name="placeholderText">
+ <string>Leave Blank To Use Default Expected Peaks</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_fitting_browse_peaks">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>Browse</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
<item row="3" column="0">
<spacer name="verticalSpacer_5">
<property name="orientation">
@@ -156,56 +206,6 @@
</property>
</spacer>
</item>
- <item row="4" column="0">
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <spacer name="horizontalSpacer_15">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>38</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QLabel" name="label_comboBox_fitting_bank">
- <property name="text">
- <string>Plot Bank:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="comboBox_bank">
- <property name="minimumSize">
- <size>
- <width>111</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>240</width>
- <height>16777215</height>
- </size>
- </property>
- <item>
- <property name="text">
- <string>Bank North - 1</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Bank South - 2</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </item>
</layout>
</widget>
</item>
@@ -249,14 +249,14 @@
<string>Preview</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="1">
+ <item row="0" column="3">
<widget class="QLabel" name="label_qlist_bank">
<property name="text">
<string>Bank:</string>
</property>
</widget>
</item>
- <item row="1" column="0">
+ <item row="1" column="0" colspan="3">
<widget class="QwtPlot" name="dataPlot">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -278,7 +278,7 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="1" column="3">
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<widget class="QListWidget" name="listWidget_fitting_bank_preview">
@@ -334,6 +334,57 @@
</spacer>
</item>
<item row="2" column="1">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>187</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="2">
+ <layout class="QHBoxLayout" name="horizontalLayout_peak_button">
+ <item>
+ <spacer name="horizontalSpacer_17">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>38</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_add_peak">
+ <property name="text">
+ <string>Add Peak</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="pushButton_save_peak_list">
+ <property name="text">
+ <string>Save Peaks List</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_comboBox_fitting_bank_3">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="3">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
diff --git a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
index 9722673e226eafd02a1d6fb65e2db4ad5e46eb0a..a4e434a04668b619146ef81bcad71bd3fbce37cb 100644
--- a/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
+++ b/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/EnggDiffraction/EnggDiffractionViewQtGUI.h
@@ -250,7 +250,7 @@ private slots:
void setListWidgetBank(int idx);
/// @shahroz
- void warningWithXY();
+ // void warningWithXY();
// show the standard Mantid help window with this interface's help
void openHelpWin();
diff --git a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
index 558a0dfb4387dc565f5b7ffe261b5f42a9dc0eb3..cd739f8cae4f8ce90e825c700848779d750a8bd5 100644
--- a/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
+++ b/MantidQt/CustomInterfaces/src/EnggDiffraction/EnggDiffractionViewQtGUI.cpp
@@ -1288,14 +1288,6 @@ void EnggDiffractionViewQtGUI::setListWidgetBank(int idx) {
selectBank->setCurrentRow(idx);
}
-void MantidQt::CustomInterfaces::EnggDiffractionViewQtGUI::warningWithXY() {
- auto x = getFittingPlotX();
- auto y = getFittingPlotY();
-
- userWarning("X and Y value: ", "the X value is:" + std::to_string(x) +
- ". the Y value is: " + std::to_string(y));
-}
-
void EnggDiffractionViewQtGUI::instrumentChanged(int /*idx*/) {
QComboBox *inst = m_ui.comboBox_instrument;
if (!inst)