##// END OF EJS Templates
schain-jc
RSS
Bugs fixed in Signal Chain GUI:...
Miguel Valdez -
r643:bf37eba8f6f6
parent child
Show More
Show file before | Show file after | Hide comments
@@ -4,4 +4,4 Created on Feb 7, 2012
4 4 @author $Author$
5 5 @version $Id$
6 6 '''
7 __version__ = "2.1.5.1" No newline at end of file
7 __version__ = "2.1.5.2" No newline at end of file
Show file before | Show file after | Hide comments
@@ -79,7 +79,7 class ParameterConf():
79 79 value = value.replace(']', '')
80 80
81 81 strList = value.split(',')
82 intList = [int(x) for x in strList]
82 intList = [int(float(x)) for x in strList]
83 83
84 84 self.__formated_value = intList
85 85
@@ -175,6 +175,13 class ParameterConf():
175 175 self.value = str(value)
176 176 self.format = str.lower(format)
177 177
178 try:
179 self.getValue()
180 except:
181 return 0
182
183 return 1
184
178 185 def update(self, name, value, format='str'):
179 186
180 187 self.name = name
@@ -301,7 +308,8 class OperationConf():
301 308 id = self.__getNewId()
302 309
303 310 parmConfObj = ParameterConf()
304 parmConfObj.setup(id, name, value, format)
311 if not parmConfObj.setup(id, name, value, format):
312 return None
305 313
306 314 self.parmConfObjList.append(parmConfObj)
307 315
Show file before | Show file after | Hide comments
@@ -56,6 +56,33 def isRadarPath(path):
56 56 return 0
57 57
58 58 return 1
59
60 def isInt(value):
61
62 try:
63 int(value)
64 except:
65 return 0
66
67 return 1
68
69 def isFloat(value):
70
71 try:
72 float(value)
73 except:
74 return 0
75
76 return 1
77
78 def isList(value):
79
80 x = ast.literal_eval(value)
81
82 if type(x) in (tuple, list):
83 return 1
84
85 return 0
59 86
60 87 class BasicWindow(QMainWindow, Ui_BasicWindow):
61 88 """
@@ -436,7 +463,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
436 463
437 464 self.actionStart.setEnabled(False)
438 465 self.actionStarToolbar.setEnabled(False)
439
466
467 self.console.clear()
468
440 469 if self.create:
441 470
442 471 projectId = self.__getNewProjectId()
@@ -705,6 +734,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
705 734 self.actionSaveToolbar.setEnabled(False)
706 735 self.actionStarToolbar.setEnabled(False)
707 736
737 self.console.clear()
738 self.console.append("Checking input parameters ...")
739
708 740 puObj = self.getSelectedItemObj()
709 741 puObj.removeOperations()
710 742
@@ -718,10 +750,13 class BasicWindow(QMainWindow, Ui_BasicWindow):
718 750 radarfreq = float(self.volOpRadarfrequency.text())*1e6
719 751 except:
720 752 self.console.clear()
721 self.console.append("Write the parameter Radar Frequency type float")
753 self.console.append("Invalid value '%s' for Radar Frequency" %value)
722 754 return 0
755
723 756 opObj = puObj.addOperation(name=name_operation)
724 opObj.addParameter(name=name_parameter, value=radarfreq, format=format)
757 if not opObj.addParameter(name=name_parameter, value=radarfreq, format=format):
758 self.console.append("Invalid value '%s' for %s" %(value,name_parameter))
759 return 0
725 760
726 761 if self.volOpCebChannels.isChecked():
727 762 value = str(self.volOpChannel.text())
@@ -739,7 +774,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
739 774 name_parameter = 'channelIndexList'
740 775
741 776 opObj = puObj.addOperation(name=name_operation)
742 opObj.addParameter(name=name_parameter, value=value, format=format)
777 if not opObj.addParameter(name=name_parameter, value=value, format=format):
778 self.console.append("Invalid value '%s' for %s" %(value,name_parameter))
779 return 0
743 780
744 781 if self.volOpCebHeights.isChecked():
745 782 value = str(self.volOpHeights.text())
@@ -773,7 +810,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
773 810 name_operation = 'filterByHeights'
774 811 name_parameter = 'window'
775 812 opObj = puObj.addOperation(name=name_operation)
776 opObj.addParameter(name=name_parameter, value=value, format=format)
813 if not opObj.addParameter(name=name_parameter, value=value, format=format):
814 self.console.append("Invalid value '%s' for %s" %(value,name_parameter))
815 return 0
777 816
778 817 if self.volOpCebProfile.isChecked():
779 818 value = str(self.volOpProfile.text())
@@ -793,61 +832,90 class BasicWindow(QMainWindow, Ui_BasicWindow):
793 832 name_parameter = 'rangeList'
794 833
795 834 opObj = puObj.addOperation(name='ProfileSelector', optype='other')
796 opObj.addParameter(name=name_parameter, value=value, format=format)
835 if not opObj.addParameter(name=name_parameter, value=value, format=format):
836 self.console.append("Invalid value '%s' for %s" %(value,name_parameter))
837 return 0
797 838
798 839 if self.volOpCebDecodification.isChecked():
799
800 if self.volOpComMode.currentIndex() == 0:
801 mode = '0'
802 if self.volOpComMode.currentIndex() == 1:
803 mode = '1'
804 if self.volOpComMode.currentIndex() == 2:
805 mode = '2'
806
807 if self.volOpComCode.currentIndex() == 0:
808 opObj = puObj.addOperation(name='Decoder', optype='other')
809 opObj.addParameter(name='mode', value=mode, format='int')
840 name_operation = 'Decoder'
841
842 #User defined
843 nBaud = None
844 nCode = None
845
846 code = str(self.volOpCode.text())
847 try:
848 code_tmp = ast.literal_eval(code)
849 except:
850 code_tmp = []
851
852 if len(code_tmp) < 1:
853 self.console.append("Please write a right value for Code (Exmaple: [1,1,-1], [1,-1,1])")
854 return 0
855
856 if type(code_tmp) not in (tuple, list):
857 self.console.append("Please write a right value for Code (Exmaple: [1,1,-1], [1,-1,1])")
858 return 0
859
860 if len(code_tmp) > 1 and type(code_tmp[0]) in (tuple, list): #[ [1,-1,1], [1,1,-1] ]
861 nBaud = len(code_tmp[0])
862 nCode = len(code_tmp)
863 elif len(code_tmp) == 1 and type(code_tmp[0]) in (tuple, list): #[ [1,-1,1] ]
864 nBaud = len(code_tmp[0])
865 nCode = 1
866 elif type(code_tmp[0]) in (int, float): #[1,-1,1] or (1,-1,1)
867 nBaud = len(code_tmp)
868 nCode = 1
810 869 else:
811 #User defined
812 code = str(self.volOpCode.text())
813 try:
814 code_tmp = ast.literal_eval(code)
815 except:
816 code_tmp = []
870 self.console.append("Please write a right value for Code (Exmaple: [1,1,-1], [1,-1,1])")
871 return 0
817 872
818 if len(code_tmp) < 1:
819 self.console.append("Please fill the code value")
820 return 0
873 if not nBaud or not nCode:
874 self.console.append("Please write a right value for Code")
875 return 0
876
877 opObj = puObj.addOperation(name='Decoder', optype='other')
878
879 code = code.replace("(", "")
880 code = code.replace(")", "")
881 code = code.replace("[", "")
882 code = code.replace("]", "")
883
884 if not opObj.addParameter(name='code', value=code, format='intlist'):
885 self.console.append("Please write a right value for Code")
886 return 0
887 if not opObj.addParameter(name='nCode', value=nCode, format='int'):
888 self.console.append("Please write a right value for Code")
889 return 0
890 if not opObj.addParameter(name='nBaud', value=nBaud, format='int'):
891 self.console.append("Please write a right value for Code")
892 return 0
893
894 name_parameter = 'mode'
895 format = 'int'
896
897 value = str(self.volOpComMode.currentIndex())
898
899 if not opObj.addParameter(name=name_parameter, value=value, format=format):
900 self.console.append("Invalid value '%s' for '%s'" %(value,name_parameter))
901 return 0
821 902
822 if len(code_tmp) == 1 or type(code_tmp[0]) != int:
823 nBaud = len(code_tmp[0])
824 nCode = len(code_tmp)
825 else:
826 nBaud = len(code_tmp)
827 nCode = 1
828
829 opObj = puObj.addOperation(name='Decoder', optype='other')
830
831 code = code.replace("(", "")
832 code = code.replace(")", "")
833 code = code.replace("[", "")
834 code = code.replace("]", "")
835 opObj.addParameter(name='code', value=code, format='intlist')
836 opObj.addParameter(name='nCode', value=nCode, format='int')
837 opObj.addParameter(name='nBaud', value=nBaud, format='int')
838 opObj.addParameter(name='mode', value=mode, format='int')
839 903
840 904 if self.volOpCebFlip.isChecked():
841 905 name_operation = 'deFlip'
842 906 optype = 'self'
843 value = str(self.volOpFlip.text())
907
908 opObj = puObj.addOperation(name=name_operation, optype=optype)
909
844 910 name_parameter = 'channelList'
845 911 format = 'intlist'
912 value = str(self.volOpFlip.text())
913
914 if value != "":
915 if not opObj.addParameter(name=name_parameter, value=value, format=format):
916 self.console.append("Invalid value '%s' for '%s'" %(value,name_parameter))
917 return 0
846 918
847 opObj = puObj.addOperation(name=name_operation, optype=optype)
848 if value:
849 opObj.addParameter(name=name_parameter, value=value, format=format)
850
851 919 if self.volOpCebCohInt.isChecked():
852 920 name_operation = 'CohInt'
853 921 optype = 'other'
@@ -861,7 +929,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
861 929 format = 'float'
862 930
863 931 opObj = puObj.addOperation(name=name_operation, optype=optype)
864 opObj.addParameter(name=name_parameter, value=value, format=format)
932
933 if not opObj.addParameter(name=name_parameter, value=value, format=format):
934 self.console.append("Invalid value '%s' for '%s'" %(value,name_parameter))
935 return 0
865 936
866 937 if self.volGraphCebshow.isChecked():
867 938 name_operation = 'Scope'
@@ -914,7 +985,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
914 985 if self.volGraphCebSave.isChecked():
915 986 checkPath = True
916 987 opObj.addParameter(name='save', value='1', format='int')
917 opObj.addParameter(name='figpath', value=self.volGraphPath.text(), format='str')
988 opObj.addParameter(name='figpath', value=str(self.volGraphPath.text()), format='str')
918 989 value = str(self.volGraphPrefix.text()).replace(" ","")
919 990 if value:
920 991 opObj.addParameter(name='figfile', value=value, format='str')
@@ -948,11 +1019,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
948 1019 try:
949 1020 self.refreshPUProperties(puObj)
950 1021 except:
951 self.console.append("Check input parameters")
1022 self.console.append("An error reading input parameters was found ...Check them!")
952 1023 return 0
953 1024
954 self.console.append("If you want to save your project")
955 self.console.append("click on your project name in the Tree Project Explorer")
1025 self.console.append("Save your project and press Play button to start signal processing")
956 1026
957 1027 self.actionSaveToolbar.setEnabled(True)
958 1028 self.actionStarToolbar.setEnabled(True)
@@ -1102,68 +1172,72 class BasicWindow(QMainWindow, Ui_BasicWindow):
1102 1172 self.actionSaveToolbar.setEnabled(False)
1103 1173 self.actionStarToolbar.setEnabled(False)
1104 1174
1175 self.console.clear()
1176 self.console.append("Checking input parameters ...")
1177
1105 1178 projectObj = self.getSelectedProjectObj()
1106 1179 puObj = self.getSelectedItemObj()
1107 1180
1108 1181 puObj.removeOperations()
1109 1182
1110 1183 if self.specOpCebRadarfrequency.isChecked():
1111 value = self.specOpRadarfrequency.text()
1184 value = str(self.specOpRadarfrequency.text())
1112 1185 format = 'float'
1113 1186 name_operation = 'setRadarFrequency'
1114 1187 name_parameter = 'frequency'
1115 if not value == "":
1116 try:
1117 radarfreq = float(self.specOpRadarfrequency.text())*1e6
1118 except:
1119 self.console.clear()
1120 self.console.append("Write the parameter Radar Frequency type float")
1121 return 0
1122 opObj = puObj.addOperation(name=name_operation)
1123 opObj.addParameter(name=name_parameter, value=radarfreq, format=format)
1188
1189 if not isFloat(value):
1190 self.console.clear()
1191 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
1192 return 0
1193
1194 radarfreq = float(value)*1e6
1195 opObj = puObj.addOperation(name=name_operation)
1196 opObj.addParameter(name=name_parameter, value=radarfreq, format=format)
1124 1197
1125 1198 inputId = puObj.getInputId()
1126 1199 inputPuObj = projectObj.getProcUnitObj(inputId)
1127 1200
1128 1201 if inputPuObj.datatype == 'Voltage' or inputPuObj.datatype == 'USRP':
1129 1202
1130 try:
1131 value = int(self.specOpnFFTpoints.text())
1132 puObj.addParameter(name='nFFTPoints', value=value, format='int')
1133 except:
1134 self.console.clear()
1135 self.console.append("Please write the number of FFT")
1203 value = str(self.specOpnFFTpoints.text())
1204
1205 if not isInt(value):
1206 self.console.append("Invalid value '%s' for '%s'" %(value, 'nFFTPoints'))
1136 1207 return 0
1137 1208
1138 try:
1139 value1 = int(self.specOpProfiles.text())
1140 puObj.addParameter(name='nProfiles', value=value1, format='int')
1141 except:
1142 self.console.append("Please Write the number of Profiles")
1143
1144 try:
1145 value2 = int(self.specOpippFactor.text())
1146 puObj.addParameter(name='ippFactor' , value=value2 , format='int')
1147 except:
1148 self.console.append("Please Write the Number of IppFactor")
1209 puObj.addParameter(name='nFFTPoints', value=value, format='int')
1149 1210
1150
1211 value = str(self.specOpProfiles.text())
1212 if not isInt(value):
1213 self.console.append("Please write a value on Profiles field")
1214 else:
1215 puObj.addParameter(name='nProfiles', value=value, format='int')
1216
1217 value = str(self.specOpippFactor.text())
1218 if not isInt(value):
1219 self.console.append("Please write a value on IppFactor field")
1220 else:
1221 puObj.addParameter(name='ippFactor' , value=value , format='int')
1222
1151 1223 if self.specOpCebCrossSpectra.isChecked():
1152 1224 name_parameter = 'pairsList'
1153 1225 format = 'pairslist'
1154 value2 = self.specOppairsList.text()
1226 value = str(self.specOppairsList.text())
1155 1227
1156 if value2 == "":
1228 if value == "":
1157 1229 print "Please fill the pairs list field"
1158 1230 return 0
1159 1231
1160 puObj.addParameter(name=name_parameter, value=value2, format=format)
1232 if not opObj.addParameter(name=name_parameter, value=value, format=format):
1233 self.console.append("Invalid value '%s' for '%s'" %(value,name_parameter))
1234 return 0
1161 1235
1162 1236 if self.specOpCebHeights.isChecked():
1163 1237 value = str(self.specOpHeights.text())
1164 1238
1165 1239 if value == "":
1166 print "Please fill height range"
1240 self.console.append("Empty value for '%s'" %(value, "Height range"))
1167 1241 return 0
1168 1242
1169 1243 valueList = value.split(',')
@@ -1171,6 +1245,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
1171 1245 value0 = valueList[0]
1172 1246 value1 = valueList[1]
1173 1247
1248 if not isFloat(value0) or not isFloat(value1):
1249 self.console.append("Invalid value '%s' for '%s'" %(value, "Height range"))
1250 return 0
1251
1174 1252 if self.specOpComHeights.currentIndex() == 0:
1175 1253 name_operation = 'selectHeights'
1176 1254 name_parameter1 = 'minHei'
@@ -1179,43 +1257,55 class BasicWindow(QMainWindow, Ui_BasicWindow):
1179 1257 name_operation = 'selectHeightsByIndex'
1180 1258 name_parameter1 = 'minIndex'
1181 1259 name_parameter2 = 'maxIndex'
1260
1182 1261 opObj = puObj.addOperation(name=name_operation)
1183 1262 opObj.addParameter(name=name_parameter1, value=value0, format=format)
1184 1263 opObj.addParameter(name=name_parameter2, value=value1, format=format)
1185 1264
1186 1265 if self.specOpCebChannel.isChecked():
1187 value = str(self.specOpChannel.text())
1188 1266
1189 if value == "":
1190 print "Please fill channel list"
1191 return 0
1192
1193 format = 'intlist'
1194 1267 if self.specOpComChannel.currentIndex() == 0:
1195 1268 name_operation = "selectChannels"
1196 1269 name_parameter = 'channelList'
1197 1270 else:
1198 1271 name_operation = "selectChannelsByIndex"
1199 1272 name_parameter = 'channelIndexList'
1273
1274 format = 'intlist'
1275 value = str(self.specOpChannel.text())
1276
1277 if value == "":
1278 print "Please fill channel list"
1279 return 0
1280
1281 if not isList(value):
1282 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
1283 return 0
1200 1284
1201 1285 opObj = puObj.addOperation(name=name_operation)
1202 1286 opObj.addParameter(name=name_parameter, value=value, format=format)
1203 1287
1204 1288 if self.specOpCebIncoherent.isChecked():
1205 value = str(self.specOpIncoherent.text())
1206 1289
1207 if value == "":
1208 print "Please fill Incoherent integration value"
1209 return 0
1210
1211 1290 name_operation = 'IncohInt'
1212 1291 optype = 'other'
1292
1213 1293 if self.specOpCobIncInt.currentIndex() == 0:
1214 1294 name_parameter = 'timeInterval'
1215 1295 format = 'float'
1216 1296 else:
1217 1297 name_parameter = 'n'
1218 1298 format = 'float'
1299
1300 value = str(self.specOpIncoherent.text())
1301
1302 if value == "":
1303 print "Please fill Incoherent integration value"
1304 return 0
1305
1306 if not isFloat(value):
1307 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
1308 return 0
1219 1309
1220 1310 opObj = puObj.addOperation(name=name_operation, optype=optype)
1221 1311 opObj.addParameter(name=name_parameter, value=value, format=format)
@@ -1237,7 +1327,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
1237 1327
1238 1328
1239 1329 if self.specOpCebgetNoise.isChecked():
1240 value = self.specOpgetNoise.text()
1330 value = str(self.specOpgetNoise.text())
1241 1331 valueList = value.split(',')
1242 1332 format = 'float'
1243 1333 name_operation = "getNoise"
@@ -1332,7 +1422,12 class BasicWindow(QMainWindow, Ui_BasicWindow):
1332 1422 opObj.addParameter(name='id', value=opObj.id, format='int')
1333 1423
1334 1424 if not channelList == '':
1335 opObj.addParameter(name='channelList', value=channelList, format='intlist')
1425
1426 if not isList(channelList):
1427 self.console.append("Invalid channelList")
1428 return 0
1429
1430 opObj.addParameter(name='channelList', value=channelList, format='intlist')
1336 1431
1337 1432 if not vel_range == '':
1338 1433 xvalueList = vel_range.split(',')
@@ -1480,6 +1575,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
1480 1575 opObj.addParameter(name='id', value=opObj.id, format='int')
1481 1576
1482 1577 if not channelList == '':
1578 if not isList(channelList):
1579 self.console.append("Invalid channelList")
1580 return 0
1483 1581 opObj.addParameter(name='channelList', value=channelList, format='intlist')
1484 1582
1485 1583 if not trange == '':
@@ -1635,6 +1733,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
1635 1733 opObj.addParameter(name='id', value=opObj.id, format='int')
1636 1734
1637 1735 if not channelList == '':
1736 if not isList(channelList):
1737 self.console.append("Invalid channelList")
1738 return 0
1739
1638 1740 opObj.addParameter(name='channelList', value=channelList, format='intlist')
1639 1741
1640 1742 if not db_range == '':
@@ -1684,6 +1786,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
1684 1786 opObj.addParameter(name='id', value=opObj.id, format='int')
1685 1787
1686 1788 if not channelList == '':
1789 if not isList(channelList):
1790 self.console.append("Invalid channelList")
1791 return 0
1687 1792 opObj.addParameter(name='channelList', value=channelList, format='intlist')
1688 1793
1689 1794 # if not timerange == '':
@@ -1759,11 +1864,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
1759 1864 try:
1760 1865 self.refreshPUProperties(puObj)
1761 1866 except:
1762 self.console.append("Check input parameters")
1867 self.console.append("An error reading input parameters was found ... Check them!")
1763 1868 return 0
1764 1869
1765 self.console.append("If you want to save your project")
1766 self.console.append("click on your project name in the Tree Project Explorer")
1870 self.console.append("Save your project and press Play button to start signal processing")
1767 1871
1768 1872 self.actionSaveToolbar.setEnabled(True)
1769 1873 self.actionStarToolbar.setEnabled(True)
@@ -1923,77 +2027,104 class BasicWindow(QMainWindow, Ui_BasicWindow):
1923 2027 self.actionSaveToolbar.setEnabled(False)
1924 2028 self.actionStarToolbar.setEnabled(False)
1925 2029
2030 self.console.clear()
2031 self.console.append("Checking input parameters ...")
2032
1926 2033 puObj = self.getSelectedItemObj()
1927 2034 puObj.removeOperations()
1928 2035
1929 2036 if self.specHeisOpCebIncoherent.isChecked():
1930 value = self.specHeisOpIncoherent.text()
2037 value = str(self.specHeisOpIncoherent.text())
1931 2038 name_operation = 'IncohInt4SpectraHeis'
1932 2039 optype = 'other'
2040
2041 name_parameter = 'timeInterval'
2042 format = 'float'
2043
1933 2044 if self.specOpCobIncInt.currentIndex() == 0:
1934 2045 name_parameter = 'timeInterval'
1935 2046 format = 'float'
2047
2048 if not isFloat(value):
2049 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
2050 return 0
2051
1936 2052 opObj = puObj.addOperation(name=name_operation, optype=optype)
1937 opObj.addParameter(name=name_parameter, value=value, format=format)
2053
2054 if not opObj.addParameter(name=name_parameter, value=value, format=format):
2055 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
2056 return 0
1938 2057
1939 2058 # ---- Spectra Plot-----
1940 2059 if self.specHeisGraphCebSpectraplot.isChecked():
1941 2060 name_operation = 'SpectraHeisScope'
1942 2061 optype = 'other'
1943 name_parameter = 'type'
1944 value = 'SpectraHeisScope'
1945 format = 'str'
1946 if self.idImagspectraHeis == 0:
1947 self.idImagspectraHeis = 800
1948 else:
1949 self.idImagspectraHeis = self.idImagspectraHeis + 1
1950 name_parameter1 = 'id'
1951 value1 = int(self.idImagspectraHeis)
1952 format1 = 'int'
1953 2062
1954 format = 'str'
2063 name_parameter = 'id'
2064 format = 'int'
1955 2065
1956 channelList = self.specHeisGgraphChannelList.text()
1957 xvalue = self.specHeisGgraphXminXmax.text()
1958 yvalue = self.specHeisGgraphYminYmax.text()
2066 channelList = str(self.specHeisGgraphChannelList.text())
2067 xvalue = str(self.specHeisGgraphXminXmax.text())
2068 yvalue = str(self.specHeisGgraphYminYmax.text())
2069
1959 2070 opObj = puObj.addOperation(name=name_operation, optype=optype)
1960 # opObj.addParameter(name=name_parameter, value=value, format=format)
1961 opObj.addParameter(name=name_parameter1, value=value1, format=format1)
2071 value = opObj.id
2072
2073 if not opObj.addParameter(name=name_parameter, value=value, format=format):
2074 self.console.append("Invalid value '%s' for '%s'" %(value, name_parameter))
2075 return 0
1962 2076
1963 2077 if not channelList == '':
1964 2078 name_parameter = 'channelList'
1965 2079 format = 'intlist'
2080
2081 if not isList(channelList):
2082 self.console.append("Invalid value '%s' for '%s'" %(channelList, name_parameter))
2083 return 0
2084
1966 2085 opObj.addParameter(name=name_parameter, value=channelList, format=format)
1967 2086
1968 2087 if not xvalue == '':
1969 xvalueList = xvalue.split(',')
1970 try:
1971 value1 = float(xvalueList[0])
1972 value2 = float(xvalueList[1])
1973 except:
1974 self.console.clear()
1975 self.console.append("Please Write corrects parameter xmin-xmax")
1976 return 0
1977 name1 = 'xmin'
1978 name2 = 'xmax'
1979 format = 'float'
1980 opObj.addParameter(name=name1, value=value1, format=format)
1981 opObj.addParameter(name=name2, value=value2, format=format)
2088 xvalueList = xvalue.split(',')
2089
2090 if len(xvalueList) != 2:
2091 self.console.append("Invalid value '%s' for '%s'" %(xvalue, "xrange"))
2092 return 0
2093
2094 value1 = xvalueList[0]
2095 value2 = xvalueList[1]
2096
2097 if not isFloat(value1) or not isFloat(value2):
2098 self.console.append("Invalid value '%s' for '%s'" %(xvalue, "xrange"))
2099 return 0
2100
2101 name1 = 'xmin'
2102 name2 = 'xmax'
2103 format = 'float'
2104
2105 opObj.addParameter(name=name1, value=value1, format=format)
2106 opObj.addParameter(name=name2, value=value2, format=format)
2107
1982 2108 #------specHeisGgraphYmin-Ymax---
1983 2109 if not yvalue == '':
1984 yvalueList = yvalue.split(",")
1985 try:
1986 value1 = float(yvalueList[0])
1987 value2 = float(yvalueList[1])
1988 except:
1989 self.console.clear()
1990 self.console.append("Please Write corrects parameter Ymix-Ymax")
1991 return 0
1992 name1 = 'ymin'
1993 name2 = 'ymax'
1994 format = 'float'
1995 opObj.addParameter(name=name1, value=value1, format=format)
1996 opObj.addParameter(name=name2, value=value2, format=format)
2110 yvalueList = yvalue.split(",")
2111
2112 if len(yvalueList) != 2:
2113 self.console.append("Invalid value '%s' for '%s'" %(xvalue, "xrange"))
2114 return 0
2115
2116 value1 = yvalueList[0]
2117 value2 = yvalueList[1]
2118
2119 if not isFloat(value1) or not isFloat(value2):
2120 self.console.append("Invalid value '%s' for '%s'" %(yvalue, "yrange"))
2121 return 0
2122
2123 name1 = 'ymin'
2124 name2 = 'ymax'
2125 format = 'float'
2126 opObj.addParameter(name=name1, value=value1, format=format)
2127 opObj.addParameter(name=name2, value=value2, format=format)
1997 2128
1998 2129 if self.specHeisGraphSaveSpectra.isChecked():
1999 2130 checkPath = True
@@ -2001,8 +2132,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
2001 2132 name_parameter2 = 'figpath'
2002 2133 name_parameter3 = 'figfile'
2003 2134 value1 = '1'
2004 value2 = self.specHeisGraphPath.text()
2005 value3 = self.specHeisGraphPrefix.text()
2135 value2 = str(self.specHeisGraphPath.text())
2136 value3 = str(self.specHeisGraphPrefix.text())
2006 2137 format1 = 'bool'
2007 2138 format2 = 'str'
2008 2139 opObj.addParameter(name=name_parameter1, value=value1 , format=format1)
@@ -2014,7 +2145,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
2014 2145 self.console.clear()
2015 2146 self.console.append("Please Write prefix")
2016 2147 return 0
2017 opObj.addParameter(name='figfile', value=self.specHeisGraphPrefix.text(), format='str')
2148 opObj.addParameter(name='figfile', value=str(self.specHeisGraphPrefix.text()), format='str')
2018 2149
2019 2150 # opObj.addParameter(name=name_parameter3, value=value3, format=format2)
2020 2151 # opObj.addParameter(name='wr_period', value='5',format='int')
@@ -2027,29 +2158,18 class BasicWindow(QMainWindow, Ui_BasicWindow):
2027 2158 if self.specHeisGraphCebRTIplot.isChecked():
2028 2159 name_operation = 'RTIfromSpectraHeis'
2029 2160 optype = 'other'
2030 name_parameter = 'type'
2031 value = 'RTIfromSpectraHeis'
2032 format = 'str'
2033
2034 if self.idImagrtiHeis == 0:
2035 self.idImagrtiHeis = 900
2036 else:
2037 self.idImagrtiHeis = self.idImagrtiHeis + 1
2038 2161
2039 name_parameter1 = 'id'
2040 value1 = int(self.idImagrtiHeis)
2041 format1 = 'int'
2042
2043 format = 'str'
2162 name_parameter = 'id'
2163 format = 'int'
2044 2164
2045 2165 opObj = puObj.addOperation(name=name_operation, optype=optype)
2046 # opObj.addParameter(name=name_parameter, value=value, format=format)
2047 opObj.addParameter(name=name_parameter1, value=value1, format=format1)
2166 value = opObj.id
2167 opObj.addParameter(name=name_parameter, value=value, format=format)
2048 2168
2049 channelList = self.specHeisGgraphChannelList.text()
2050 xvalue = self.specHeisGgraphTminTmax.text()
2051 yvalue = self.specHeisGgraphYminYmax.text()
2052 timerange = self.specHeisGgraphTimeRange.text()
2169 channelList = str(self.specHeisGgraphChannelList.text())
2170 xvalue = str(self.specHeisGgraphTminTmax.text())
2171 yvalue = str(self.specHeisGgraphYminYmax.text())
2172 timerange = str(self.specHeisGgraphTimeRange.text())
2053 2173
2054 2174 if not channelList == '':
2055 2175 opObj.addParameter(name='channelList', value=channelList, format='intlist')
@@ -2088,8 +2208,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
2088 2208 if self.specHeisGraphSaveRTIplot.isChecked():
2089 2209 checkPath = True
2090 2210 opObj.addParameter(name='save', value='1', format='bool')
2091 opObj.addParameter(name='figpath', value=self.specHeisGraphPath.text(), format='str')
2092 value = self.specHeisGraphPrefix.text()
2211 opObj.addParameter(name='figpath', value=str(self.specHeisGraphPath.text()), format='str')
2212 value = str(self.specHeisGraphPrefix.text())
2093 2213 if not value == "":
2094 2214 try:
2095 2215 value = str(self.specHeisGraphPrefix.text())
@@ -2107,7 +2227,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
2107 2227
2108 2228 localfolder = None
2109 2229 if checkPath:
2110 localfolder = str(self.specGraphPath.text())
2230 localfolder = str(self.specHeisGraphPath.text())
2111 2231 if localfolder == '':
2112 2232 self.console.clear()
2113 2233 self.console.append("Graphic path should be defined")
@@ -2140,10 +2260,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
2140 2260 try:
2141 2261 self.refreshPUProperties(puObj)
2142 2262 except:
2143 self.console.append("Check input parameters")
2263 self.console.append("An error reading input parameters was found ... Check them!")
2144 2264 return 0
2145 2265
2146 self.console.append("Click on save icon ff you want to save your project")
2266 self.console.append("Save your project and press Play button to start signal processing")
2147 2267
2148 2268 self.actionSaveToolbar.setEnabled(True)
2149 2269 self.actionStarToolbar.setEnabled(True)
@@ -2390,7 +2510,7 class BasicWindow(QMainWindow, Ui_BasicWindow):
2390 2510 ippKm = float(value)
2391 2511 except:
2392 2512 if datatype=="USRP":
2393 outputstr = 'IPP value (%s) must be a float number' % str(self.proIPPKm.text())
2513 outputstr = 'IPP value "%s" must be a float number' % str(self.proIPPKm.text())
2394 2514 self.console.append(outputstr)
2395 2515 parms_ok = False
2396 2516
General Comments 0
You need to be logged in to leave comments. Login now