From b335fb017810382801544379d8b5cf18a3cec67d Mon Sep 17 00:00:00 2001
From: Elliot Oram <Elliot.Oram@stfc.ac.uk>
Date: Mon, 7 Sep 2015 08:30:33 +0100
Subject: [PATCH] Remove unwanted elements from the geometry UI section
Refs #13110
---
.../Indirect/ContainerSubtraction.ui | 84 +------------------
.../src/Indirect/ContainerSubtraction.cpp | 1 -
2 files changed, 2 insertions(+), 83 deletions(-)
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.ui b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.ui
index 63d1487e8cc..614d8149b56 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.ui
+++ b/Code/Mantid/MantidQt/CustomInterfaces/inc/MantidQtCustomInterfaces/Indirect/ContainerSubtraction.ui
@@ -111,20 +111,6 @@
<string>Options</string>
</property>
<layout class="QGridLayout" name="gridLayout">
- <item row="1" column="0">
- <widget class="QCheckBox" name="ckUseCan">
- <property name="text">
- <string>Use Can:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QCheckBox" name="ckUseCorrections">
- <property name="text">
- <string>Use Corrections:</string>
- </property>
- </widget>
- </item>
<item row="0" column="1">
<widget class="QComboBox" name="cbGeometry">
<item>
@@ -144,66 +130,6 @@
</item>
</widget>
</item>
- <item row="4" column="1">
- <widget class="MantidQt::MantidWidgets::DataSelector" name="dsCorrections" native="true">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="autoLoad" stdset="0">
- <bool>true</bool>
- </property>
- <property name="workspaceSuffixes" stdset="0">
- <stringlist>
- <string>_flt_abs</string>
- </stringlist>
- </property>
- <property name="fileBrowserSuffixes" stdset="0">
- <stringlist>
- <string>_flt_abs.nxs</string>
- </stringlist>
- </property>
- <property name="showLoad" stdset="0">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="MantidQt::MantidWidgets::DataSelector" name="dsContainer" native="true">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="sizePolicy">
- <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="autoLoad" stdset="0">
- <bool>true</bool>
- </property>
- <property name="workspaceSuffixes" stdset="0">
- <stringlist>
- <string>_red</string>
- <string>_sqw</string>
- </stringlist>
- </property>
- <property name="fileBrowserSuffixes" stdset="0">
- <stringlist>
- <string>_red.nxs</string>
- <string>_sqw.nxs</string>
- </stringlist>
- </property>
- <property name="showLoad" stdset="0">
- <bool>false</bool>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QLabel" name="lbGeometry">
<property name="text">
@@ -211,11 +137,8 @@
</property>
</widget>
</item>
- <item row="3" column="0">
+ <item row="1" column="0">
<widget class="QCheckBox" name="ckScaleCan">
- <property name="enabled">
- <bool>false</bool>
- </property>
<property name="text">
<string>Scale Can by factor:</string>
</property>
@@ -224,13 +147,10 @@
</property>
</widget>
</item>
- <item row="3" column="1">
+ <item row="1" column="1">
<layout class="QHBoxLayout" name="loScaleFactor">
<item>
<widget class="QDoubleSpinBox" name="spCanScale">
- <property name="enabled">
- <bool>false</bool>
- </property>
<property name="decimals">
<number>5</number>
</property>
diff --git a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
index 57c5b6501c7..0b7991b576d 100644
--- a/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
+++ b/Code/Mantid/MantidQt/CustomInterfaces/src/Indirect/ContainerSubtraction.cpp
@@ -18,7 +18,6 @@ void ContainerSubtraction::run() {}
bool ContainerSubtraction::validate() { return false; }
void ContainerSubtraction::loadSettings(const QSettings &settings) {
- m_uiForm.dsCorrections->readSettings(settings.group());
m_uiForm.dsContainer->readSettings(settings.group());
m_uiForm.dsSample->readSettings(settings.group());
}
--
GitLab