Fix the enable/disable issue with van peak strip. Refs #6851.

mantidproject · Apr 22, 2013 · c8bdb29 · c8bdb29
1 parent b06c16e
commit c8bdb29
Showing 1 changed file with 25 additions and 13 deletions.
diff --git a/Code/Mantid/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py b/Code/Mantid/scripts/Interface/reduction_gui/widgets/diffraction/diffraction_adv_setup.py
@@ -78,9 +78,10 @@ def initialize_content(self):
         self._content.extension_combo.setCurrentIndex(1)
 
         self._content.stripvanpeaks_chkbox.setChecked(True)
-        self._content.vanpeakfwhm_edit.setEnabled(False)
-        self._content.vansmoothpar_edit.setEnabled(False)
-        self._content.vanpeaktol_edit.setEnabled(False)
+        self._syncStripVanPeakWidgets(True)
+        # self._content.vanpeakfwhm_edit.setEnabled(False)
+        # self._content.vansmoothpar_edit.setEnabled(False)
+        # self._content.vanpeaktol_edit.setEnabled(False)
 
         self._content.preserveevents_checkbox.setChecked(True)
         self._content.filterbadpulses_chkbox.setChecked(True)
@@ -110,6 +111,7 @@ def set_state(self, state):
         self._content.filterbadpulses_chkbox.setChecked(state.filterbadpulses)
 
         self._content.stripvanpeaks_chkbox.setChecked(state.stripvanadiumpeaks)
+        self._syncStripVanPeakWidgets(state.stripvanadiumpeaks)
         self._content.vanpeakfwhm_edit.setText(str(state.vanadiumfwhm))
         self._content.vanpeaktol_edit.setText(str(state.vanadiumpeaktol))
         self._content.vansmoothpar_edit.setText(str(state.vanadiumsmoothparams))
@@ -158,16 +160,17 @@ def _detinstrumentchange(self):
     def _stripvanpeaks_clicked(self):
         """ Handling if strip-vanadium-peak check box is clicked
         """
-        if self._content.stripvanpeaks_chkbox.isChecked() is True:
-            # Enable all the edits
-            self._content.vanpeakfwhm_edit.setEnabled(True)
-            self._content.vansmoothpar_edit.setEnabled(True)
-            self._content.vanpeaktol_edit.setEnabled(True)
-        else:
-            # Disable all the edits
-            self._content.vanpeakfwhm_edit.setEnabled(False)
-            self._content.vansmoothpar_edit.setEnabled(False)
-            self._content.vanpeaktol_edit.setEnabled(False)
+        self._syncStripVanPeakWidgets(self._content.stripvanpeaks_chkbox.isChecked())
+        #if self._content.stripvanpeaks_chkbox.isChecked() is True:
+        #    # Enable all the edits
+        #    self._content.vanpeakfwhm_edit.setEnabled(True)
+        #    self._content.vansmoothpar_edit.setEnabled(True)
+        #    self._content.vanpeaktol_edit.setEnabled(True)
+        #else:
+        #    # Disable all the edits
+        #    self._content.vanpeakfwhm_edit.setEnabled(False)
+        #    self._content.vansmoothpar_edit.setEnabled(False)
+        #    self._content.vanpeaktol_edit.setEnabled(False)
 
         return
 
@@ -181,4 +184,13 @@ def __init__(self, parent=None):
 
         return
 
+    def _syncStripVanPeakWidgets(self, stripvanpeak): 
+        """ Synchronize the other widgets with vanadium peak
+        """
+        self._content.vanpeakfwhm_edit.setEnabled(stripvanpeak)
+        self._content.vansmoothpar_edit.setEnabled(stripvanpeak)
+        self._content.vanpeaktol_edit.setEnabled(stripvanpeak)
+
+        return
+
 #ENDCLASSDEF