From f7411e241a8255851a6de1b32adf6c2d248d51ff Mon Sep 17 00:00:00 2001
From: Michael Reuter <reuterma@ornl.gov>
Date: Thu, 12 Jul 2012 10:22:23 -0400
Subject: [PATCH] Refs #5454. More UI changes.
Made the energy transfer binning option via a checkox and propogated that
change to the rest of the UI code.
---
.../inelastic/dgs_sample_data_setup_script.py | 15 ++---
.../widgets/inelastic/dgs_sample_setup.py | 2 +
.../ui/inelastic/dgs_sample_setup.ui | 6 ++
.../ui/inelastic/ui_dgs_sample_setup.py | 67 ++++++++++---------
4 files changed, 51 insertions(+), 39 deletions(-)
diff --git a/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py b/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
index 48bba598a8a..a54cd380e6e 100644
--- a/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
+++ b/Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py
@@ -14,6 +14,7 @@ class SampleSetupScript(BaseScriptElement):
sample_file = ""
incident_energy = ""
fixed_ei = False
+ rebin_et = False
et_range_low = ""
et_range_width = ""
et_range_high = ""
@@ -28,14 +29,10 @@ class SampleSetupScript(BaseScriptElement):
script = "SampleFile=\"%s\",\n" % self.sample_file
script += "IncidentEnergy=\"%s\",\n" % self.incident_energy
script += "FixedIncidentEnergy=%s,\n" % self.fixed_ei
- if self.et_range_low == SampleSetupScript.et_range_low:
- self.et_range_low = -10
- self.et_range_high = self.et_range_low + 1;
- self.et_range_width = 1
-
- script += "EnergyTransferRange=\"%s,%s,%s\",\n" % (self.et_range_low,
- self.et_range_width,
- self.et_range_high)
+ if self.rebin_et:
+ script += "EnergyTransferRange=\"%s,%s,%s\",\n" % (self.et_range_low,
+ self.et_range_width,
+ self.et_range_high)
script += "HardMaskFile=\"%s\",\n" % self.hardmask_file
script += "GroupingFile=\"%s\",\n" % self.grouping_file
return script
@@ -82,7 +79,6 @@ class SampleSetupScript(BaseScriptElement):
self.et_range_width = BaseScriptElement.getStringElement(instrument_dom,
"et_range/width",
default=SampleSetupScript.et_range_width)
-
self.et_range_high = BaseScriptElement.getStringElement(instrument_dom,
"et_range/high",
default=SampleSetupScript.et_range_high)
@@ -100,6 +96,7 @@ class SampleSetupScript(BaseScriptElement):
self.sample_file = SampleSetupScript.sample_file
self.incident_energy = SampleSetupScript.incident_energy
self.fixed_ei = SampleSetupScript.fixed_ei
+ self.rebin_et = SampleSetupScript.rebin_et
self.et_range_low = SampleSetupScript.et_range_low
self.et_range_width = SampleSetupScript.et_range_width
self.et_range_high = SampleSetupScript.et_range_high
diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
index 514341ac825..d8d4188fbed 100644
--- a/Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
+++ b/Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py
@@ -94,6 +94,7 @@ class SampleSetupWidget(BaseWidget):
self._check_and_set_lineedit_content(self._content.ei_edit,
state.incident_energy)
self._content.fixed_ei_chkbox.setChecked(state.fixed_ei)
+ self._content.et_range_box.setChecked(state.rebin_et)
self._check_and_set_lineedit_content(self._content.etr_low_edit,
state.et_range_low)
self._check_and_set_lineedit_content(self._content.etr_width_edit,
@@ -111,6 +112,7 @@ class SampleSetupWidget(BaseWidget):
s.sample_file = self._content.sample_edit.text()
s.incident_energy = self._content.ei_edit.text()
s.fixed_ei = self._content.fixed_ei_chkbox.isChecked()
+ s.rebin_et = self._content.et_range_box.isChecked()
s.et_range_low = self._content.etr_low_edit.text()
s.et_range_width = self._content.etr_width_edit.text()
s.et_range_high = self._content.etr_high_edit.text()
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/dgs_sample_setup.ui b/Code/Mantid/scripts/Interface/ui/inelastic/dgs_sample_setup.ui
index fa362b5d117..78d0419fb35 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/dgs_sample_setup.ui
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/dgs_sample_setup.ui
@@ -140,6 +140,12 @@
<property name="title">
<string>Energy Transfer Range (meV)</string>
</property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLabel" name="etr_low_label">
diff --git a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py
index e4e7bdec54c..6dba594d5c3 100644
--- a/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py
+++ b/Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py
@@ -2,41 +2,46 @@
# Form implementation generated from reading ui file 'ui/inelastic/dgs_sample_setup.ui'
#
-# Created: Mon Jun 18 16:12:24 2012
-# by: PyQt4 UI code generator 4.7.4
+# Created: Thu Jul 12 09:16:17 2012
+# by: PyQt4 UI code generator 4.9.1
#
# WARNING! All changes made in this file will be lost!
from PyQt4 import QtCore, QtGui
+try:
+ _fromUtf8 = QtCore.QString.fromUtf8
+except AttributeError:
+ _fromUtf8 = lambda s: s
+
class Ui_Frame(object):
def setupUi(self, Frame):
- Frame.setObjectName("Frame")
+ Frame.setObjectName(_fromUtf8("Frame"))
Frame.resize(1195, 483)
Frame.setFrameShape(QtGui.QFrame.StyledPanel)
Frame.setFrameShadow(QtGui.QFrame.Raised)
self.verticalLayout = QtGui.QVBoxLayout(Frame)
- self.verticalLayout.setObjectName("verticalLayout")
+ self.verticalLayout.setObjectName(_fromUtf8("verticalLayout"))
self.horizontalLayout = QtGui.QHBoxLayout()
- self.horizontalLayout.setObjectName("horizontalLayout")
+ self.horizontalLayout.setObjectName(_fromUtf8("horizontalLayout"))
self.sample_label = QtGui.QLabel(Frame)
self.sample_label.setMinimumSize(QtCore.QSize(110, 0))
- self.sample_label.setObjectName("sample_label")
+ self.sample_label.setObjectName(_fromUtf8("sample_label"))
self.horizontalLayout.addWidget(self.sample_label)
self.sample_edit = QtGui.QLineEdit(Frame)
- self.sample_edit.setObjectName("sample_edit")
+ self.sample_edit.setObjectName(_fromUtf8("sample_edit"))
self.horizontalLayout.addWidget(self.sample_edit)
self.sample_browse = QtGui.QPushButton(Frame)
- self.sample_browse.setObjectName("sample_browse")
+ self.sample_browse.setObjectName(_fromUtf8("sample_browse"))
self.horizontalLayout.addWidget(self.sample_browse)
spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
self.horizontalLayout.addItem(spacerItem)
self.verticalLayout.addLayout(self.horizontalLayout)
self.horizontalLayout_2 = QtGui.QHBoxLayout()
- self.horizontalLayout_2.setObjectName("horizontalLayout_2")
+ self.horizontalLayout_2.setObjectName(_fromUtf8("horizontalLayout_2"))
self.ei_label = QtGui.QLabel(Frame)
self.ei_label.setMinimumSize(QtCore.QSize(110, 0))
- self.ei_label.setObjectName("ei_label")
+ self.ei_label.setObjectName(_fromUtf8("ei_label"))
self.horizontalLayout_2.addWidget(self.ei_label)
self.ei_edit = QtGui.QLineEdit(Frame)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -44,29 +49,31 @@ class Ui_Frame(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.ei_edit.sizePolicy().hasHeightForWidth())
self.ei_edit.setSizePolicy(sizePolicy)
- self.ei_edit.setObjectName("ei_edit")
+ self.ei_edit.setObjectName(_fromUtf8("ei_edit"))
self.horizontalLayout_2.addWidget(self.ei_edit)
self.ei_units_label = QtGui.QLabel(Frame)
- self.ei_units_label.setObjectName("ei_units_label")
+ self.ei_units_label.setObjectName(_fromUtf8("ei_units_label"))
self.horizontalLayout_2.addWidget(self.ei_units_label)
spacerItem1 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem1)
self.fixed_ei_chkbox = QtGui.QCheckBox(Frame)
- self.fixed_ei_chkbox.setObjectName("fixed_ei_chkbox")
+ self.fixed_ei_chkbox.setObjectName(_fromUtf8("fixed_ei_chkbox"))
self.horizontalLayout_2.addWidget(self.fixed_ei_chkbox)
spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(spacerItem2)
self.verticalLayout.addLayout(self.horizontalLayout_2)
self.horizontalLayout_6 = QtGui.QHBoxLayout()
- self.horizontalLayout_6.setObjectName("horizontalLayout_6")
+ self.horizontalLayout_6.setObjectName(_fromUtf8("horizontalLayout_6"))
self.et_range_box = QtGui.QGroupBox(Frame)
- self.et_range_box.setObjectName("et_range_box")
+ self.et_range_box.setCheckable(True)
+ self.et_range_box.setChecked(False)
+ self.et_range_box.setObjectName(_fromUtf8("et_range_box"))
self.horizontalLayout_3 = QtGui.QHBoxLayout(self.et_range_box)
- self.horizontalLayout_3.setObjectName("horizontalLayout_3")
+ self.horizontalLayout_3.setObjectName(_fromUtf8("horizontalLayout_3"))
self.etr_low_label = QtGui.QLabel(self.et_range_box)
self.etr_low_label.setMinimumSize(QtCore.QSize(93, 0))
self.etr_low_label.setAlignment(QtCore.Qt.AlignRight|QtCore.Qt.AlignTrailing|QtCore.Qt.AlignVCenter)
- self.etr_low_label.setObjectName("etr_low_label")
+ self.etr_low_label.setObjectName(_fromUtf8("etr_low_label"))
self.horizontalLayout_3.addWidget(self.etr_low_label)
self.etr_low_edit = QtGui.QLineEdit(self.et_range_box)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -74,10 +81,10 @@ class Ui_Frame(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.etr_low_edit.sizePolicy().hasHeightForWidth())
self.etr_low_edit.setSizePolicy(sizePolicy)
- self.etr_low_edit.setObjectName("etr_low_edit")
+ self.etr_low_edit.setObjectName(_fromUtf8("etr_low_edit"))
self.horizontalLayout_3.addWidget(self.etr_low_edit)
self.etr_width_label = QtGui.QLabel(self.et_range_box)
- self.etr_width_label.setObjectName("etr_width_label")
+ self.etr_width_label.setObjectName(_fromUtf8("etr_width_label"))
self.horizontalLayout_3.addWidget(self.etr_width_label)
self.etr_width_edit = QtGui.QLineEdit(self.et_range_box)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -85,10 +92,10 @@ class Ui_Frame(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.etr_width_edit.sizePolicy().hasHeightForWidth())
self.etr_width_edit.setSizePolicy(sizePolicy)
- self.etr_width_edit.setObjectName("etr_width_edit")
+ self.etr_width_edit.setObjectName(_fromUtf8("etr_width_edit"))
self.horizontalLayout_3.addWidget(self.etr_width_edit)
self.etr_high_label = QtGui.QLabel(self.et_range_box)
- self.etr_high_label.setObjectName("etr_high_label")
+ self.etr_high_label.setObjectName(_fromUtf8("etr_high_label"))
self.horizontalLayout_3.addWidget(self.etr_high_label)
self.etr_high_edit = QtGui.QLineEdit(self.et_range_box)
sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
@@ -96,38 +103,38 @@ class Ui_Frame(object):
sizePolicy.setVerticalStretch(0)
sizePolicy.setHeightForWidth(self.etr_high_edit.sizePolicy().hasHeightForWidth())
self.etr_high_edit.setSizePolicy(sizePolicy)
- self.etr_high_edit.setObjectName("etr_high_edit")
+ self.etr_high_edit.setObjectName(_fromUtf8("etr_high_edit"))
self.horizontalLayout_3.addWidget(self.etr_high_edit)
self.horizontalLayout_6.addWidget(self.et_range_box)
spacerItem3 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_6.addItem(spacerItem3)
self.verticalLayout.addLayout(self.horizontalLayout_6)
self.horizontalLayout_4 = QtGui.QHBoxLayout()
- self.horizontalLayout_4.setObjectName("horizontalLayout_4")
+ self.horizontalLayout_4.setObjectName(_fromUtf8("horizontalLayout_4"))
self.hardmask_label = QtGui.QLabel(Frame)
self.hardmask_label.setMinimumSize(QtCore.QSize(110, 0))
- self.hardmask_label.setObjectName("hardmask_label")
+ self.hardmask_label.setObjectName(_fromUtf8("hardmask_label"))
self.horizontalLayout_4.addWidget(self.hardmask_label)
self.hardmask_edit = QtGui.QLineEdit(Frame)
- self.hardmask_edit.setObjectName("hardmask_edit")
+ self.hardmask_edit.setObjectName(_fromUtf8("hardmask_edit"))
self.horizontalLayout_4.addWidget(self.hardmask_edit)
self.hardmask_browse = QtGui.QPushButton(Frame)
- self.hardmask_browse.setObjectName("hardmask_browse")
+ self.hardmask_browse.setObjectName(_fromUtf8("hardmask_browse"))
self.horizontalLayout_4.addWidget(self.hardmask_browse)
spacerItem4 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_4.addItem(spacerItem4)
self.verticalLayout.addLayout(self.horizontalLayout_4)
self.horizontalLayout_5 = QtGui.QHBoxLayout()
- self.horizontalLayout_5.setObjectName("horizontalLayout_5")
+ self.horizontalLayout_5.setObjectName(_fromUtf8("horizontalLayout_5"))
self.grouping_label = QtGui.QLabel(Frame)
self.grouping_label.setMinimumSize(QtCore.QSize(110, 0))
- self.grouping_label.setObjectName("grouping_label")
+ self.grouping_label.setObjectName(_fromUtf8("grouping_label"))
self.horizontalLayout_5.addWidget(self.grouping_label)
self.grouping_edit = QtGui.QLineEdit(Frame)
- self.grouping_edit.setObjectName("grouping_edit")
+ self.grouping_edit.setObjectName(_fromUtf8("grouping_edit"))
self.horizontalLayout_5.addWidget(self.grouping_edit)
self.grouping_browse = QtGui.QPushButton(Frame)
- self.grouping_browse.setObjectName("grouping_browse")
+ self.grouping_browse.setObjectName(_fromUtf8("grouping_browse"))
self.horizontalLayout_5.addWidget(self.grouping_browse)
spacerItem5 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Minimum)
self.horizontalLayout_5.addItem(spacerItem5)
--
GitLab