Skip to content

Commit

Permalink
Fixed problem of format of the config file for the 4th column paramet…
Browse files Browse the repository at this point in the history
…ers. This refs #4303
  • Loading branch information
JeanBilheux committed May 23, 2012
1 parent 358a1eb commit 96ae02a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,8 @@ def initialize_content(self):
self.connect(self._summary.dq0, QtCore.SIGNAL("textChanged(QString)"), call_back)
call_back = partial(self._edit_event, ctrl=self._summary.dq_over_q)
self.connect(self._summary.dq_over_q, QtCore.SIGNAL("textChanged(QString)"), call_back)
call_back = partial(self._edit_event, ctrl=self._summary.fourth_column_switch)
self.connect(self._summary.fourth_column_switch, QtCore.SIGNAL("clicked()"), call_back)

#name of output file changed
call_back = partial(self._edit_event, ctrl=self._summary.cfg_scaling_factor_file_name)
Expand Down Expand Up @@ -277,6 +279,7 @@ def _reset_warnings(self):
util.set_edited(self._summary.incident_medium_combobox, False)
util.set_edited(self._summary.dq0, False)
util.set_edited(self._summary.dq_over_q, False)
util.set_edited(self._summary.fourth_column_switch, False)

def _det_angle_offset_chk_changed(self):
is_checked = self._summary.det_angle_offset_check.isChecked()
Expand Down Expand Up @@ -702,8 +705,8 @@ def _add_data(self):
state.incident_medium_index_selected = _incident_medium_index_selected

#4th column (precision)
state.fourth_column_dq0 = self._summary.dq0
state.fourth_column_dq_over_q = self._summary.dq_over_q
state.fourth_column_dq0 = self._summary.dq0.text()
state.fourth_column_dq_over_q = self._summary.dq_over_q.text()

current_item.setData(QtCore.Qt.UserRole, state)
i+=1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Form implementation generated from reading ui file 'data_refl_simple.ui'
#
# Created: Wed May 23 05:52:12 2012
# Created: Wed May 23 07:27:09 2012
# by: PyQt4 UI code generator 4.7.2
#
# WARNING! All changes made in this file will be lost!
Expand Down

0 comments on commit 96ae02a

Please sign in to comment.