| @@ -1090,20 +1090,11 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
| 1090 | if self.volGraphCebshow.isChecked(): |
|
1090 | if self.volGraphCebshow.isChecked(): | |
| 1091 | name_operation = 'Scope' |
|
1091 | name_operation = 'Scope' | |
| 1092 | optype = 'other' |
|
1092 | optype = 'other' | |
| 1093 | name_parameter = 'type' |
|
|||
| 1094 | value = 'Scope' |
|
|||
| 1095 | if self.idImagscope == 0: |
|
|||
| 1096 | self.idImagscope = 100 |
|
|||
| 1097 | else: |
|
|||
| 1098 | self.idImagscope = self.idImagscope + 1 |
|
|||
| 1099 |
|
1093 | |||
| 1100 | name_parameter1 = 'id' |
|
1094 | name_parameter1 = 'id' | |
| 1101 | value1 = int(self.idImagscope) |
|
1095 | format1 = 'int' | |
| 1102 | format1 = 'int' |
|
|||
| 1103 | format = 'str' |
|
|||
| 1104 |
|
1096 | |||
| 1105 | opObj = puObj.addOperation(name=name_operation, optype=optype) |
|
1097 | opObj = puObj.addOperation(name=name_operation, optype=optype) | |
| 1106 | # opObj.addParameter(name=name_parameter, value=value, format=format) |
|
|||
| 1107 | opObj.addParameter(name=name_parameter1, value=opObj.id, format=format1) |
|
1098 | opObj.addParameter(name=name_parameter1, value=opObj.id, format=format1) | |
| 1108 |
|
1099 | |||
| 1109 | channelList = str(self.volGraphChannelList.text()).strip() |
|
1100 | channelList = str(self.volGraphChannelList.text()).strip() | |
| @@ -1202,6 +1193,11 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
| 1202 |
|
1193 | |||
| 1203 | return 1 |
|
1194 | return 1 | |
| 1204 |
|
1195 | |||
|
|
1196 | @pyqtSignature("") | |||
|
|
1197 | def on_volGraphClear_clicked(self): | |||
|
|
1198 | ||||
|
|
1199 | self.console.clear() | |||
|
|
1200 | ||||
| 1205 | """ |
|
1201 | """ | |
| 1206 | Voltage Graph |
|
1202 | Voltage Graph | |
| 1207 | """ |
|
1203 | """ | |
| @@ -2016,6 +2012,12 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
| 2016 |
|
2012 | |||
| 2017 | return 1 |
|
2013 | return 1 | |
| 2018 |
|
2014 | |||
|
|
2015 | ||||
|
|
2016 | @pyqtSignature("") | |||
|
|
2017 | def on_specGraphClear_clicked(self): | |||
|
|
2018 | ||||
|
|
2019 | self.console.clear() | |||
|
|
2020 | ||||
| 2019 | """ |
|
2021 | """ | |
| 2020 | Spectra Graph |
|
2022 | Spectra Graph | |
| 2021 | """ |
|
2023 | """ | |
| @@ -2129,11 +2131,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
| 2129 | if not os.path.exists(save_path): |
|
2131 | if not os.path.exists(save_path): | |
| 2130 | self.console.clear() |
|
2132 | self.console.clear() | |
| 2131 | self.console.append("Write a valid path") |
|
2133 | self.console.append("Write a valid path") | |
| 2132 |
return |
|
2134 | return | |
| 2133 |
|
||||
| 2134 | @pyqtSignature("") |
|
|||
| 2135 | def on_specGraphClear_clicked(self): |
|
|||
| 2136 | return |
|
|||
| 2137 |
|
2135 | |||
| 2138 | @pyqtSignature("") |
|
2136 | @pyqtSignature("") | |
| 2139 | def on_specHeisGraphToolPath_clicked(self): |
|
2137 | def on_specHeisGraphToolPath_clicked(self): | |
| @@ -2202,8 +2200,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
| 2202 | power_range = str(self.specHeisGgraphYminYmax.text()) |
|
2200 | power_range = str(self.specHeisGgraphYminYmax.text()) | |
| 2203 | time_range = str(self.specHeisGgraphTminTmax.text()) |
|
2201 | time_range = str(self.specHeisGgraphTminTmax.text()) | |
| 2204 | timerange = str(self.specHeisGgraphTimeRange.text()) |
|
2202 | timerange = str(self.specHeisGgraphTimeRange.text()) | |
| 2205 |
|
|
2203 | ||
| 2206 | # ---- Spectra Plot----- |
|
|||
| 2207 | if self.specHeisGraphCebSpectraplot.isChecked(): |
|
2204 | if self.specHeisGraphCebSpectraplot.isChecked(): | |
| 2208 |
|
2205 | |||
| 2209 | name_operation = 'SpectraHeisScope' |
|
2206 | name_operation = 'SpectraHeisScope' | |
| @@ -2248,8 +2245,7 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
| 2248 |
|
2245 | |||
| 2249 | opObj.addParameter(name=name1, value=value1, format=format) |
|
2246 | opObj.addParameter(name=name1, value=value1, format=format) | |
| 2250 | opObj.addParameter(name=name2, value=value2, format=format) |
|
2247 | opObj.addParameter(name=name2, value=value2, format=format) | |
| 2251 |
|
|
2248 | ||
| 2252 | #------specHeisGgraphYmin-Ymax--- |
|
|||
| 2253 | if not power_range == '': |
|
2249 | if not power_range == '': | |
| 2254 | yvalueList = power_range.split(",") |
|
2250 | yvalueList = power_range.split(",") | |
| 2255 |
|
2251 | |||
| @@ -2414,6 +2410,12 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
| 2414 | self._enable_play_button() |
|
2410 | self._enable_play_button() | |
| 2415 |
|
2411 | |||
| 2416 | return 1 |
|
2412 | return 1 | |
|
|
2413 | ||||
|
|
2414 | @pyqtSignature("") | |||
|
|
2415 | def on_specHeisGraphClear_clicked(self): | |||
|
|
2416 | ||||
|
|
2417 | self.console.clear() | |||
|
|
2418 | ||||
| 2417 | @pyqtSignature("int") |
|
2419 | @pyqtSignature("int") | |
| 2418 | def on_specHeisGraphCebSpectraplot_stateChanged(self, p0): |
|
2420 | def on_specHeisGraphCebSpectraplot_stateChanged(self, p0): | |
| 2419 |
|
2421 | |||
| @@ -2473,10 +2475,6 class BasicWindow(QMainWindow, Ui_BasicWindow): | |||||
| 2473 | def on_specHeisGraphftpRTIplot_stateChanged(self, p0): |
|
2475 | def on_specHeisGraphftpRTIplot_stateChanged(self, p0): | |
| 2474 | if p0 == 2: |
|
2476 | if p0 == 2: | |
| 2475 | self.specHeisGgraphftpratio.setEnabled(True) |
|
2477 | self.specHeisGgraphftpratio.setEnabled(True) | |
| 2476 |
|
||||
| 2477 | @pyqtSignature("") |
|
|||
| 2478 | def on_specHeisGraphClear_clicked(self): |
|
|||
| 2479 | pass |
|
|||
| 2480 |
|
2478 | |||
| 2481 | def __checkSpecGraphSaving(self): |
|
2479 | def __checkSpecGraphSaving(self): | |
| 2482 |
|
2480 | |||
General Comments 0
You need to be logged in to leave comments.
Login now