Skip to content

Commit

Permalink
Some minor changes. Refs #6555.
Browse files Browse the repository at this point in the history
1. Set the default value of FilterBadPulse and PreserveEvents to True;
2. Clean up some error message output;
  • Loading branch information
wdzhou authored and peterfpeterson committed Apr 12, 2013
1 parent 00353bc commit 7ea8a70
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@ def initialize_content(self):
self._content.vansmoothpar_edit.setEnabled(False)
self._content.vanpeaktol_edit.setEnabled(False)

# self._handle_tzero_guess(self._content.use_ei_guess_chkbox.isChecked())
self._content.preserveevents_checkbox.setChecked(True)
self._content.filterbadpulses_chkbox.setChecked(True)

# Connections from action/event to function to handle
self.connect(self._content.stripvanpeaks_chkbox, QtCore.SIGNAL("clicked()"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -154,13 +154,13 @@ def set_state(self, state):
self._content.binning_edit.setText(str(state.binning))
state.binning = float(state.binning)
if state.binning > 0.0:
print "[DBx304-1]: state.binning = %f, Set binning type to Linear" % (state.binning)
#print "[DBx304-1]: state.binning = %f, Set binning type to Linear" % (state.binning)
self._content.bintype_combo.setCurrentIndex(0)
print "[DBx304-2]: Done... Set to self._content.bintype_combo.currentText()"
#print "[DBx304-2]: Done... Set to self._content.bintype_combo.currentText()"
else:
print "[DBx304-1]: state.binning = %f, Set binning type to Logarithmic" % (state.binning)
#print "[DBx304-1]: state.binning = %f, Set binning type to Logarithmic" % (state.binning)
self._content.bintype_combo.setCurrentIndex(1)
print "[DBx304-2]: Done... Set to self._content.bintype_combo.currentText()"
#print "[DBx304-2]: Done... Set to self._content.bintype_combo.currentText()"

self._content.binind_checkbox.setChecked(state.binindspace)
self._content.resamplex_edit.setText(str(state.resamplex))
Expand Down

0 comments on commit 7ea8a70

Please sign in to comment.