diff --git a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py index 6c407bc0d6e9a3902f482e8ae814f25894df35c2..8108b6346e243f4c91811c7acdaf634745cd834e 100644 --- a/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py +++ b/scripts/Interface/reduction_gui/reduction/diffraction/diffraction_adv_setup_script.py @@ -182,7 +182,7 @@ class AdvancedSetupScript(BaseScriptElement): self.cropwavelengthmin = getFloatElement(instrument_dom, "cropwavelengthmin", AdvancedSetupScript.cropwavelengthmin) - self.cropwavelengthmax = getFloatElement(instrument_dom, 'cropwavelengthmax', + self.cropwavelengthmax = getFloatElement(instrument_dom, 'cropwavelengthmax', AdvancedSetupScript.cropwavelengthmax) self.removepropmppulsewidth = getFloatElement(instrument_dom, "removepromptpulsewidth", diff --git a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py index 0da3b8b5c0be790bebfb9be6f87adfca09f1c7a3..1022f508800d54ac58a516ac470487ff1a13650a 100644 --- a/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py +++ b/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py @@ -2,10 +2,8 @@ ################################################################################ # Advanced Setup Widget ################################################################################ -from PyQt4 import QtGui, uic, QtCore -from functools import partial +from PyQt4 import QtGui, QtCore from reduction_gui.widgets.base_widget import BaseWidget -import reduction_gui.widgets.util as util from reduction_gui.reduction.diffraction.diffraction_adv_setup_script import AdvancedSetupScript import ui.diffraction.ui_diffraction_adv_setup @@ -45,8 +43,6 @@ class AdvancedSetupWidget(BaseWidget): def initialize_content(self): """ Initialize content/UI """ - # FIXME : Fill in the contraints, states and connections to this method ASAP - # Constraints/Validator iv4 = QtGui.QIntValidator(self._content.maxchunksize_edit) iv4.setBottom(0) @@ -105,7 +101,7 @@ class AdvancedSetupWidget(BaseWidget): self.connect(self._content.help_button, QtCore.SIGNAL("clicked()"),\ self._show_help) # Hanlder for events - # FIXME - Need to add an event hanlder for the change of instrument and facility + # TODO - Need to add an event hanlder for the change of instrument and facility # Validated widgets @@ -134,7 +130,7 @@ class AdvancedSetupWidget(BaseWidget): self._content.preserveevents_checkbox.setChecked(state.preserveevents) self._content.extension_combo.setCurrentIndex(self._content.extension_combo.findText(state.extension)) self._content.outputfileprefix_edit.setText(state.outputfileprefix) - + # range of wavelength self._content.cropwavelengthmin_edit.setText(str(state.cropwavelengthmin)) self._content.lineEdit_croppedWavelengthMax.setText(str(state.cropwavelengthmax))