##// END OF EJS Templates
schain
RSS
Some messages added to SpectraHeis window
Miguel Valdez -
r650:227519f1dba2
parent child
Show More
Show file before | Show file after | Hide comments
@@ -2063,27 +2063,29 class BasicWindow(QMainWindow, Ui_BasicWindow):
2063 if not opObj.addParameter(name=name_parameter, value=value, format=format):
2063 if not opObj.addParameter(name=name_parameter, value=value, format=format):
2064 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
2064 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
2065 return 0
2065 return 0
2066
2067 channelList = str(self.specHeisGgraphChannelList.text())
2068 freq_range = str(self.specHeisGgraphXminXmax.text())
2069 power_range = str(self.specHeisGgraphYminYmax.text())
2070 time_range = str(self.specHeisGgraphTminTmax.text())
2071 timerange = str(self.specHeisGgraphTimeRange.text())
2066
2072
2067 # ---- Spectra Plot-----
2073 # ---- Spectra Plot-----
2068 if self.specHeisGraphCebSpectraplot.isChecked():
2074 if self.specHeisGraphCebSpectraplot.isChecked():
2075
2069 name_operation = 'SpectraHeisScope'
2076 name_operation = 'SpectraHeisScope'
2070 optype = 'other'
2077 optype = 'other'
2078 opObj = puObj.addOperation(name=name_operation, optype=optype)
2071
2079
2072 name_parameter = 'id'
2080 name_parameter = 'id'
2073 format = 'int'
2081 format = 'int'
2074
2075 channelList = str(self.specHeisGgraphChannelList.text())
2076 xvalue = str(self.specHeisGgraphXminXmax.text())
2077 yvalue = str(self.specHeisGgraphYminYmax.text())
2078
2079 opObj = puObj.addOperation(name=name_operation, optype=optype)
2080 value = opObj.id
2082 value = opObj.id
2081
2083
2082 if not opObj.addParameter(name=name_parameter, value=value, format=format):
2084 if not opObj.addParameter(name=name_parameter, value=value, format=format):
2083 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
2085 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
2084 return 0
2086 return 0
2085
2087
2086 if not channelList == '':
2088 if not (channelList == ''):
2087 name_parameter = 'channelList'
2089 name_parameter = 'channelList'
2088 format = 'intlist'
2090 format = 'intlist'
2089
2091
@@ -2093,18 +2095,18 class BasicWindow(QMainWindow, Ui_BasicWindow):
2093
2095
2094 opObj.addParameter(name=name_parameter, value=channelList, format=format)
2096 opObj.addParameter(name=name_parameter, value=channelList, format=format)
2095
2097
2096 if not xvalue == '':
2098 if not freq_range == '':
2097 xvalueList = xvalue.split(',')
2099 xvalueList = freq_range.split(',')
2098
2100
2099 if len(xvalueList) != 2:
2101 if len(xvalueList) != 2:
2100 self.console.append("Invalid value '%s' for '%s'" %(xvalue, "xrange"))
2102 self.console.append("Invalid value '%s' for '%s'" %(freq_range, "xrange"))
2101 return 0
2103 return 0
2102
2104
2103 value1 = xvalueList[0]
2105 value1 = xvalueList[0]
2104 value2 = xvalueList[1]
2106 value2 = xvalueList[1]
2105
2107
2106 if not isFloat(value1) or not isFloat(value2):
2108 if not isFloat(value1) or not isFloat(value2):
2107 self.console.append("Invalid value '%s' for '%s'" %(xvalue, "xrange"))
2109 self.console.append("Invalid value '%s' for '%s'" %(freq_range, "xrange"))
2108 return 0
2110 return 0
2109
2111
2110 name1 = 'xmin'
2112 name1 = 'xmin'
@@ -2115,18 +2117,18 class BasicWindow(QMainWindow, Ui_BasicWindow):
2115 opObj.addParameter(name=name2, value=value2, format=format)
2117 opObj.addParameter(name=name2, value=value2, format=format)
2116
2118
2117 #------specHeisGgraphYmin-Ymax---
2119 #------specHeisGgraphYmin-Ymax---
2118 if not yvalue == '':
2120 if not power_range == '':
2119 yvalueList = yvalue.split(",")
2121 yvalueList = power_range.split(",")
2120
2122
2121 if len(yvalueList) != 2:
2123 if len(yvalueList) != 2:
2122 self.console.append("Invalid value '%s' for '%s'" %(xvalue, "xrange"))
2124 self.console.append("Invalid value '%s' for '%s'" %(power_range, "xrange"))
2123 return 0
2125 return 0
2124
2126
2125 value1 = yvalueList[0]
2127 value1 = yvalueList[0]
2126 value2 = yvalueList[1]
2128 value2 = yvalueList[1]
2127
2129
2128 if not isFloat(value1) or not isFloat(value2):
2130 if not isFloat(value1) or not isFloat(value2):
2129 self.console.append("Invalid value '%s' for '%s'" %(yvalue, "yrange"))
2131 self.console.append("Invalid value '%s' for '%s'" %(power_range, "yrange"))
2130 return 0
2132 return 0
2131
2133
2132 name1 = 'ymin'
2134 name1 = 'ymin'
@@ -2174,17 +2176,12 class BasicWindow(QMainWindow, Ui_BasicWindow):
2174 opObj = puObj.addOperation(name=name_operation, optype=optype)
2176 opObj = puObj.addOperation(name=name_operation, optype=optype)
2175 value = opObj.id
2177 value = opObj.id
2176 opObj.addParameter(name=name_parameter, value=value, format=format)
2178 opObj.addParameter(name=name_parameter, value=value, format=format)
2177
2178 channelList = str(self.specHeisGgraphChannelList.text())
2179 xvalue = str(self.specHeisGgraphTminTmax.text())
2180 yvalue = str(self.specHeisGgraphYminYmax.text())
2181 timerange = str(self.specHeisGgraphTimeRange.text())
2182
2179
2183 if not channelList == '':
2180 if not channelList == '':
2184 opObj.addParameter(name='channelList', value=channelList, format='intlist')
2181 opObj.addParameter(name='channelList', value=channelList, format='intlist')
2185
2182
2186 if not xvalue == '':
2183 if not time_range == '':
2187 xvalueList = xvalue.split(',')
2184 xvalueList = time_range.split(',')
2188 try:
2185 try:
2189 value = float(xvalueList[0])
2186 value = float(xvalueList[0])
2190 value = float(xvalueList[1])
2187 value = float(xvalueList[1])
@@ -2203,13 +2200,14 class BasicWindow(QMainWindow, Ui_BasicWindow):
2203 opObj.addParameter(name='timerange', value=timerange, format=format)
2200 opObj.addParameter(name='timerange', value=timerange, format=format)
2204
2201
2205
2202
2206 if not yvalue == '':
2203 if not power_range == '':
2207 yvalueList = yvalue.split(",")
2204 yvalueList = power_range.split(",")
2208 try:
2205 try:
2209 value = float(yvalueList[0])
2206 value = float(yvalueList[0])
2210 value = float(yvalueList[1])
2207 value = float(yvalueList[1])
2211 except:
2208 except:
2212 return 0
2209 return 0
2210
2213 format = 'float'
2211 format = 'float'
2214 opObj.addParameter(name='ymin', value=yvalueList[0], format=format)
2212 opObj.addParameter(name='ymin', value=yvalueList[0], format=format)
2215 opObj.addParameter(name='ymax', value=yvalueList[1], format=format)
2213 opObj.addParameter(name='ymax', value=yvalueList[1], format=format)
@@ -5531,6 +5529,15 class BasicWindow(QMainWindow, Ui_BasicWindow):
5531
5529
5532 self.specGraphPrefix.setToolTip('Example: EXPERIMENT_NAME')
5530 self.specGraphPrefix.setToolTip('Example: EXPERIMENT_NAME')
5533
5531
5532
5533 self.specHeisOpIncoherent.setToolTip('Example: 10')
5534
5535 self.specHeisGgraphChannelList.setToolTip('Example: 0,2,3')
5536 self.specHeisGgraphXminXmax.setToolTip('Example (Hz): -1000, 1000')
5537 self.specHeisGgraphYminYmax.setToolTip('Example (dB): 5, 35')
5538 self.specHeisGgraphTminTmax.setToolTip('Example (hours): 0, 24')
5539 self.specHeisGgraphTimeRange.setToolTip('Example (hours): 8')
5540
5534 self.labelSet.show()
5541 self.labelSet.show()
5535 self.proSet.show()
5542 self.proSet.show()
5536
5543
Show file before | Show file after | Hide comments
@@ -213,18 +213,18 class Ui_SpectraHeisTab(object):
213 self.tabWidgetSpectraHeis.setTabText(self.tabWidgetSpectraHeis.indexOf(self.tabopSpectraHeis), _translate("MainWindow", "Operation", None))
213 self.tabWidgetSpectraHeis.setTabText(self.tabWidgetSpectraHeis.indexOf(self.tabopSpectraHeis), _translate("MainWindow", "Operation", None))
214 self.label_54.setText(_translate("MainWindow", "Prefix", None))
214 self.label_54.setText(_translate("MainWindow", "Prefix", None))
215 self.specHeisGraphToolPath.setText(_translate("MainWindow", "...", None))
215 self.specHeisGraphToolPath.setText(_translate("MainWindow", "...", None))
216 self.label_62.setText(_translate("MainWindow", "ymin - ymax", None))
216 self.label_62.setText(_translate("MainWindow", "Intensity range (dB)", None))
217 self.label_63.setText(_translate("MainWindow", "Tmin - Tmax:", None))
217 self.label_63.setText(_translate("MainWindow", "Time range (hours):", None))
218 self.label_64.setText(_translate("MainWindow", "Time Range:", None))
218 self.label_64.setText(_translate("MainWindow", "Time interval:", None))
219 self.label_65.setText(_translate("MainWindow", "Wr Period", None))
219 self.label_65.setText(_translate("MainWindow", "Wr Period", None))
220 self.label_60.setText(_translate("MainWindow", "Channel List:", None))
220 self.label_60.setText(_translate("MainWindow", "Channel List:", None))
221 self.label_61.setText(_translate("MainWindow", "xmin - xmax", None))
221 self.label_61.setText(_translate("MainWindow", "Frequency range", None))
222 self.label_56.setText(_translate("MainWindow", "Save", None))
222 self.label_56.setText(_translate("MainWindow", "Save", None))
223 self.label_57.setText(_translate("MainWindow", "ftp", None))
223 self.label_57.setText(_translate("MainWindow", "ftp", None))
224 self.label_58.setText(_translate("MainWindow", "Spectra Plot", None))
224 self.label_58.setText(_translate("MainWindow", "Spectra Plot", None))
225 self.label_53.setText(_translate("MainWindow", "Path", None))
225 self.label_53.setText(_translate("MainWindow", "Path", None))
226 self.label_55.setText(_translate("MainWindow", "Show", None))
226 self.label_55.setText(_translate("MainWindow", "Show", None))
227 self.label_59.setText(_translate("MainWindow", "RTI PLot", None))
227 self.label_59.setText(_translate("MainWindow", "RTI Plot", None))
228
228
229 self.tabWidgetSpectraHeis.setTabText(self.tabWidgetSpectraHeis.indexOf(self.tabgraphSpectraHeis), _translate("MainWindow", "Graphics", None))
229 self.tabWidgetSpectraHeis.setTabText(self.tabWidgetSpectraHeis.indexOf(self.tabgraphSpectraHeis), _translate("MainWindow", "Graphics", None))
230 self.label_67.setText(_translate("MainWindow", "Path:", None))
230 self.label_67.setText(_translate("MainWindow", "Path:", None))
General Comments 0
You need to be logged in to leave comments. Login now