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