Refs #5454. Changing incident energy widgets to make things clearer.

Code/Mantid/scripts/Interface/reduction_gui/reduction/inelastic/dgs_sample_data_setup_script.py

@@ -12,8 +12,8 @@ from reduction_gui.reduction.scripter import BaseScriptElement
 class SampleSetupScript(BaseScriptElement):
     
     sample_file = ""
-    incident_energy = ""
-    fixed_ei = False
+    incident_energy_guess = ""
+    use_ei_guess = False
     rebin_et = False
     et_range_low = ""
     et_range_width = ""
@@ -28,8 +28,8 @@ class SampleSetupScript(BaseScriptElement):
         
     def to_script(self):
         script =  "SampleFile=\"%s\",\n" % self.sample_file
-        script += "IncidentEnergy=\"%s\",\n" % self.incident_energy
-        script += "FixedIncidentEnergy=%s,\n" % self.fixed_ei
+        script += "IncidentEnergyGuess=\"%s\",\n" % self.incident_energy_guess
+        script += "UseIncidentEnergyGuess=%s,\n" % self.use_ei_guess
         if self.rebin_et:
             script += "EnergyTransferRange=\"%s,%s,%s\",\n" % (self.et_range_low, 
                                                                self.et_range_width, 
@@ -45,8 +45,8 @@ class SampleSetupScript(BaseScriptElement):
         """
         xml = "<SampleSetup>\n"
         xml += "  <sample_file>%s</sample_file>\n" % self.sample_file
-        xml += "  <incident_energy>%s</incident_energy>\n" % self.incident_energy
-        xml += "  <fixed_ei>%s</fixed_ei>\n" % str(self.fixed_ei)
+        xml += "  <incident_energy_guess>%s</incident_energy_guess>\n" % self.incident_energy_guess
+        xml += "  <use_ei_guess>%s</use_ei_guess>\n" % str(self.use_ei_guess)
         xml += "  <et_range>\n"
         xml += "    <low>%s</low>\n" % self.et_range_low
         xml += "    <width>%s</width>\n"  % self.et_range_width
@@ -70,12 +70,12 @@ class SampleSetupScript(BaseScriptElement):
             self.sample_file = BaseScriptElement.getStringElement(instrument_dom, 
                                                                   "sample_file",
                                                                   default=SampleSetupScript.sample_file)
-            self.incident_energy = BaseScriptElement.getStringElement(instrument_dom,
-                                                                     "incident_energy",
-                                                                     default=SampleSetupScript.incident_energy)
-            self.fixed_ei = BaseScriptElement.getBoolElement(instrument_dom,
-                                                             "fixed_ei",
-                                                             default=SampleSetupScript.fixed_ei)
+            self.incident_energy_guess = BaseScriptElement.getStringElement(instrument_dom,
+                                                                            "incident_energy_guess",
+                                                                            default=SampleSetupScript.incident_energy_guess)
+            self.use_ei_guess = BaseScriptElement.getBoolElement(instrument_dom,
+                                                                 "use_ei_guess",
+                                                                 default=SampleSetupScript.use_ei_guess)
             self.et_range_low = BaseScriptElement.getStringElement(instrument_dom,
                                                                    "et_range/low",
                                                                    default=SampleSetupScript.et_range_low)
@@ -100,8 +100,8 @@ class SampleSetupScript(BaseScriptElement):
             Reset state
         """
         self.sample_file = SampleSetupScript.sample_file
-        self.incident_energy = SampleSetupScript.incident_energy
-        self.fixed_ei = SampleSetupScript.fixed_ei
+        self.incident_energy_guess = SampleSetupScript.incident_energy_guess
+        self.use_ei_guess = SampleSetupScript.use_ei_guess
         self.rebin_et = SampleSetupScript.rebin_et
         self.et_range_low = SampleSetupScript.et_range_low
         self.et_range_width = SampleSetupScript.et_range_width

Code/Mantid/scripts/Interface/reduction_gui/widgets/inelastic/dgs_sample_setup.py

@@ -31,10 +31,10 @@ class SampleSetupWidget(BaseWidget):
         
     def initialize_content(self):
         # Constraints
-        dv = QtGui.QDoubleValidator(self._content.ei_edit)
+        dv = QtGui.QDoubleValidator(self._content.ei_guess_edit)
         dv.setBottom(0.0)
-        self._content.ei_edit.setValidator(dv)
-        util.set_valid(self._content.ei_edit, False)
+        self._content.ei_guess_edit.setValidator(dv)
+        util.set_valid(self._content.ei_guess_edit, False)
         self._content.etr_low_edit.setValidator(QtGui.QDoubleValidator(self._content.etr_low_edit))
         util.set_valid(self._content.etr_low_edit, False)
         self._content.etr_width_edit.setValidator(QtGui.QDoubleValidator(self._content.etr_width_edit))
@@ -50,7 +50,7 @@ class SampleSetupWidget(BaseWidget):
         self.connect(self._content.grouping_browse, QtCore.SIGNAL("clicked()"), 
                      self._grouping_browse)
         # Validated widgets
-        self._connect_validated_lineedit(self._content.ei_edit)
+        self._connect_validated_lineedit(self._content.ei_guess_edit)
         self._connect_validated_lineedit(self._content.etr_low_edit)
         self._connect_validated_lineedit(self._content.etr_width_edit)
         self._connect_validated_lineedit(self._content.etr_high_edit)
@@ -91,9 +91,9 @@ class SampleSetupWidget(BaseWidget):
             @param state: SampleSetupScript object
         """
         self._content.sample_edit.setText(state.sample_file)
-        self._check_and_set_lineedit_content(self._content.ei_edit, 
-                                             state.incident_energy)
-        self._content.fixed_ei_chkbox.setChecked(state.fixed_ei)
+        self._check_and_set_lineedit_content(self._content.ei_guess_edit, 
+                                             state.incident_energy_guess)
+        self._content.use_ei_guess_chkbox.setChecked(state.use_ei_guess)
         self._content.et_range_box.setChecked(state.rebin_et)
         self._check_and_set_lineedit_content(self._content.etr_low_edit, 
                                              state.et_range_low)
@@ -111,8 +111,8 @@ class SampleSetupWidget(BaseWidget):
         """
         s = SampleSetupScript()
         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.incident_energy_guess = self._content.ei_guess_edit.text()
+        s.use_ei_guess = self._content.use_ei_guess_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()

Code/Mantid/scripts/Interface/ui/inelastic/dgs_sample_setup.ui

@@ -66,7 +66,7 @@
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLabel" name="ei_label">
+      <widget class="QLabel" name="ei_guess_label">
        <property name="minimumSize">
         <size>
          <width>110</width>
@@ -74,12 +74,12 @@
         </size>
        </property>
        <property name="text">
-        <string>Incident Energy</string>
+        <string>Incident Energy Guess</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QLineEdit" name="ei_edit">
+      <widget class="QLineEdit" name="ei_guess_edit">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
          <horstretch>0</horstretch>
@@ -112,9 +112,9 @@
       </spacer>
      </item>
      <item>
-      <widget class="QCheckBox" name="fixed_ei_chkbox">
+      <widget class="QCheckBox" name="use_ei_guess_chkbox">
        <property name="text">
-        <string>Fixed Ei</string>
+        <string>Use Guess (No Calculation)</string>
        </property>
       </widget>
      </item>

Code/Mantid/scripts/Interface/ui/inelastic/ui_dgs_sample_setup.py

@@ -2,7 +2,7 @@
 
 # Form implementation generated from reading ui file 'ui/inelastic/dgs_sample_setup.ui'
 #
-# Created: Fri Jul 13 08:49:22 2012
+# Created: Mon Jul 23 16:41:16 2012
 #      by: PyQt4 UI code generator 4.9.1
 #
 # WARNING! All changes made in this file will be lost!
@@ -39,26 +39,26 @@ class Ui_Frame(object):
         self.verticalLayout_2.addLayout(self.horizontalLayout)
         self.horizontalLayout_2 = QtGui.QHBoxLayout()
         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(_fromUtf8("ei_label"))
-        self.horizontalLayout_2.addWidget(self.ei_label)
-        self.ei_edit = QtGui.QLineEdit(Frame)
+        self.ei_guess_label = QtGui.QLabel(Frame)
+        self.ei_guess_label.setMinimumSize(QtCore.QSize(110, 0))
+        self.ei_guess_label.setObjectName(_fromUtf8("ei_guess_label"))
+        self.horizontalLayout_2.addWidget(self.ei_guess_label)
+        self.ei_guess_edit = QtGui.QLineEdit(Frame)
         sizePolicy = QtGui.QSizePolicy(QtGui.QSizePolicy.Fixed, QtGui.QSizePolicy.Fixed)
         sizePolicy.setHorizontalStretch(0)
         sizePolicy.setVerticalStretch(0)
-        sizePolicy.setHeightForWidth(self.ei_edit.sizePolicy().hasHeightForWidth())
-        self.ei_edit.setSizePolicy(sizePolicy)
-        self.ei_edit.setObjectName(_fromUtf8("ei_edit"))
-        self.horizontalLayout_2.addWidget(self.ei_edit)
+        sizePolicy.setHeightForWidth(self.ei_guess_edit.sizePolicy().hasHeightForWidth())
+        self.ei_guess_edit.setSizePolicy(sizePolicy)
+        self.ei_guess_edit.setObjectName(_fromUtf8("ei_guess_edit"))
+        self.horizontalLayout_2.addWidget(self.ei_guess_edit)
         self.ei_units_label = QtGui.QLabel(Frame)
         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(_fromUtf8("fixed_ei_chkbox"))
-        self.horizontalLayout_2.addWidget(self.fixed_ei_chkbox)
+        self.use_ei_guess_chkbox = QtGui.QCheckBox(Frame)
+        self.use_ei_guess_chkbox.setObjectName(_fromUtf8("use_ei_guess_chkbox"))
+        self.horizontalLayout_2.addWidget(self.use_ei_guess_chkbox)
         spacerItem2 = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
         self.horizontalLayout_2.addItem(spacerItem2)
         self.verticalLayout_2.addLayout(self.horizontalLayout_2)
@@ -160,9 +160,9 @@ class Ui_Frame(object):
         Frame.setWindowTitle(QtGui.QApplication.translate("Frame", "Frame", None, QtGui.QApplication.UnicodeUTF8))
         self.sample_label.setText(QtGui.QApplication.translate("Frame", "Sample Data", None, QtGui.QApplication.UnicodeUTF8))
         self.sample_browse.setText(QtGui.QApplication.translate("Frame", "Browse", None, QtGui.QApplication.UnicodeUTF8))
-        self.ei_label.setText(QtGui.QApplication.translate("Frame", "Incident Energy", None, QtGui.QApplication.UnicodeUTF8))
+        self.ei_guess_label.setText(QtGui.QApplication.translate("Frame", "Incident Energy Guess", None, QtGui.QApplication.UnicodeUTF8))
         self.ei_units_label.setText(QtGui.QApplication.translate("Frame", "meV", None, QtGui.QApplication.UnicodeUTF8))
-        self.fixed_ei_chkbox.setText(QtGui.QApplication.translate("Frame", "Fixed Ei", None, QtGui.QApplication.UnicodeUTF8))
+        self.use_ei_guess_chkbox.setText(QtGui.QApplication.translate("Frame", "Use Guess (No Calculation)", None, QtGui.QApplication.UnicodeUTF8))
         self.et_range_box.setTitle(QtGui.QApplication.translate("Frame", "Energy Transfer Range (meV)", None, QtGui.QApplication.UnicodeUTF8))
         self.etr_low_label.setText(QtGui.QApplication.translate("Frame", "Low", None, QtGui.QApplication.UnicodeUTF8))
         self.etr_width_label.setText(QtGui.QApplication.translate("Frame", "Width", None, QtGui.QApplication.UnicodeUTF8))