##// END OF EJS Templates
Bug fixed: translating float values to integer
Miguel Valdez -
r677:5a045da2ac8c
parent child
Show More
@@ -56,9 +56,6 class ParameterConf():
56
56
57 if value == '':
57 if value == '':
58 raise ValueError, "%s: This parameter value is empty" %self.name
58 raise ValueError, "%s: This parameter value is empty" %self.name
59
60 if format == 'bool':
61 value = int(value)
62
59
63 if format == 'list':
60 if format == 'list':
64 strList = value.split(',')
61 strList = value.split(',')
@@ -158,6 +155,12 class ParameterConf():
158
155
159 return self.__formated_value
156 return self.__formated_value
160
157
158 if format == 'bool':
159 value = int(value)
160
161 if format == 'int':
162 value = float(value)
163
161 format_func = eval(format)
164 format_func = eval(format)
162
165
163 self.__formated_value = format_func(value)
166 self.__formated_value = format_func(value)
@@ -2953,7 +2953,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
2953 self.volGraphCebSave.setCheckState(QtCore.Qt.Unchecked)
2953 self.volGraphCebSave.setCheckState(QtCore.Qt.Unchecked)
2954 else:
2954 else:
2955 value = parmObj.getValue()
2955 value = parmObj.getValue()
2956 if int(value):
2956 if value:
2957 self.volGraphCebSave.setCheckState(QtCore.Qt.Checked)
2957 self.volGraphCebSave.setCheckState(QtCore.Qt.Checked)
2958 else:
2958 else:
2959 self.volGraphCebSave.setCheckState(QtCore.Qt.Unchecked)
2959 self.volGraphCebSave.setCheckState(QtCore.Qt.Unchecked)
@@ -3131,16 +3131,14 class BasicWindow(QMainWindow, Ui_BasicWindow):
3131 else:
3131 else:
3132 for parmObj in opObj.getParameterObjList():
3132 for parmObj in opObj.getParameterObjList():
3133 if parmObj.name == 'timeInterval':
3133 if parmObj.name == 'timeInterval':
3134 value = opObj.getParameterValue(parameterName='timeInterval')
3134 value = opObj.getParameterValue(parameterName='timeInterval')
3135 value = float(value)
3136 self.specOpIncoherent.setText(str(value))
3135 self.specOpIncoherent.setText(str(value))
3137 self.specOpIncoherent.setEnabled(True)
3136 self.specOpIncoherent.setEnabled(True)
3138 self.specOpCebIncoherent.setCheckState(QtCore.Qt.Checked)
3137 self.specOpCebIncoherent.setCheckState(QtCore.Qt.Checked)
3139 self.specOpCobIncInt.setCurrentIndex(0)
3138 self.specOpCobIncInt.setCurrentIndex(0)
3140
3139
3141 if parmObj.name == 'n':
3140 if parmObj.name == 'n':
3142 value = opObj.getParameterValue(parameterName='n')
3141 value = opObj.getParameterValue(parameterName='n')
3143 value = float(value)
3144 self.specOpIncoherent.setText(str(value))
3142 self.specOpIncoherent.setText(str(value))
3145 self.specOpIncoherent.setEnabled(True)
3143 self.specOpIncoherent.setEnabled(True)
3146 self.specOpCebIncoherent.setCheckState(QtCore.Qt.Checked)
3144 self.specOpCebIncoherent.setCheckState(QtCore.Qt.Checked)
@@ -3733,8 +3731,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
3733 else:
3731 else:
3734 for parmObj in opObj.getParameterObjList():
3732 for parmObj in opObj.getParameterObjList():
3735 if parmObj.name == 'timeInterval':
3733 if parmObj.name == 'timeInterval':
3736 value = opObj.getParameterValue(parameterName='timeInterval')
3734 value = opObj.getParameterValue(parameterName='timeInterval')
3737 value = float(value)
3738 self.specHeisOpIncoherent.setText(str(value))
3735 self.specHeisOpIncoherent.setText(str(value))
3739 self.specHeisOpIncoherent.setEnabled(True)
3736 self.specHeisOpIncoherent.setEnabled(True)
3740 self.specHeisOpCebIncoherent.setCheckState(QtCore.Qt.Checked)
3737 self.specHeisOpCebIncoherent.setCheckState(QtCore.Qt.Checked)
@@ -70,7 +70,7 class Ui_EnvWindow(object):
70 iconStart = QtGui.QIcon()
70 iconStart = QtGui.QIcon()
71 iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
71 iconStart.addPixmap(QtGui.QPixmap(_fromUtf8( os.path.join(FIGURES_PATH, icon_name) )), QtGui.QIcon.Normal, QtGui.QIcon.Off)
72 self.actionStarToolbar.setIcon(iconStart)
72 self.actionStarToolbar.setIcon(iconStart)
73
73
74 return
74 return
75
75
76 def setupUi(self, MainWindow):
76 def setupUi(self, MainWindow):
General Comments 0
You need to be logged in to leave comments. Login now