##// END OF EJS Templates
SplitProfiles and CombineProfiles options were added to SignalChainGUI
Miguel Valdez -
r826:35f7f21e0298
parent child
Show More
@@ -738,6 +738,28 class BasicWindow(QMainWindow, Ui_BasicWindow):
738 738 self.volOpComHeights.setEnabled(False)
739 739
740 740 @pyqtSignature("int")
741 def on_volOpCebSplitter_stateChanged(self, p0):
742 """
743 Name='Splitter', optype='other'
744 """
745 if p0 == 2:
746 self.volOpSplitter.setEnabled(True)
747
748 if p0 == 0:
749 self.volOpSplitter.setEnabled(False)
750
751 @pyqtSignature("int")
752 def on_volOpCebCombiner_stateChanged(self, p0):
753 """
754 Name='Combiner', optype='other'
755 """
756 if p0 == 2:
757 self.volOpCombiner.setEnabled(True)
758
759 if p0 == 0:
760 self.volOpCombiner.setEnabled(False)
761
762 @pyqtSignature("int")
741 763 def on_volOpCebFilter_stateChanged(self, p0):
742 764 """
743 765 Name='Decoder', optype='other'
@@ -992,18 +1014,15 class BasicWindow(QMainWindow, Ui_BasicWindow):
992 1014 opObj.addParameter(name=name_parameter1, value=valueList[0], format=format)
993 1015 opObj.addParameter(name=name_parameter2, value=valueList[1], format=format)
994 1016
995 if self.volOpCebFilter.isChecked():
996 value = str(self.volOpFilter.text())
1017 if self.volOpCebSplitter.isChecked():
1018 value = str(self.volOpSplitter.text())
997 1019
998 1020 if not isInt(value):
999 self.console.append("Invalid value '%s' for Filter" %value)
1021 self.console.append("Invalid value '%s' for Profile Splitter" %value)
1000 1022 return 0
1001 1023
1002 format = 'int'
1003 name_operation = 'filterByHeights'
1004 name_parameter = 'window'
1005 opObj = puObj.addOperation(name=name_operation)
1006 opObj.addParameter(name=name_parameter, value=value, format=format)
1024 opObj = puObj.addOperation(name="SplitProfiles", optype='external')
1025 opObj.addParameter(name='n', value=value, format='int')
1007 1026
1008 1027 if self.volOpCebProfile.isChecked():
1009 1028 value = str(self.volOpProfile.text())
@@ -1026,6 +1045,29 class BasicWindow(QMainWindow, Ui_BasicWindow):
1026 1045 opObj = puObj.addOperation(name='ProfileSelector', optype='other')
1027 1046 opObj.addParameter(name=name_parameter, value=value, format=format)
1028 1047
1048 if self.volOpCebCombiner.isChecked():
1049 value = str(self.volOpCombiner.text())
1050
1051 if not isInt(value):
1052 self.console.append("Invalid value '%s' for Profile Combiner" %value)
1053 return 0
1054
1055 opObj = puObj.addOperation(name="CombineProfiles", optype='external')
1056 opObj.addParameter(name='n', value=value, format='int')
1057
1058 if self.volOpCebFilter.isChecked():
1059 value = str(self.volOpFilter.text())
1060
1061 if not isInt(value):
1062 self.console.append("Invalid value '%s' for Filter" %value)
1063 return 0
1064
1065 format = 'int'
1066 name_operation = 'filterByHeights'
1067 name_parameter = 'window'
1068 opObj = puObj.addOperation(name=name_operation)
1069 opObj.addParameter(name=name_parameter, value=value, format=format)
1070
1029 1071 if self.volOpCebDecodification.isChecked():
1030 1072 name_operation = 'Decoder'
1031 1073 opObj = puObj.addOperation(name=name_operation, optype='other')
@@ -2910,6 +2952,28 class BasicWindow(QMainWindow, Ui_BasicWindow):
2910 2952 self.volOpHeights.setEnabled(True)
2911 2953 self.volOpCebHeights.setCheckState(QtCore.Qt.Checked)
2912 2954
2955 opObj = puObj.getOperationObj(name="SplitProfiles")
2956 if opObj == None:
2957 self.volOpSplitter.clear()
2958 self.volOpCebSplitter.setCheckState(0)
2959 else:
2960 value = opObj.getParameterValue(parameterName='n')
2961 value = str(value)
2962 self.volOpSplitter.setText(value)
2963 self.volOpSplitter.setEnabled(True)
2964 self.volOpCebSplitter.setCheckState(QtCore.Qt.Checked)
2965
2966 opObj = puObj.getOperationObj(name="CombineProfiles")
2967 if opObj == None:
2968 self.volOpCombiner.clear()
2969 self.volOpCebCombiner.setCheckState(0)
2970 else:
2971 value = opObj.getParameterValue(parameterName='n')
2972 value = str(value)
2973 self.volOpCombiner.setText(value)
2974 self.volOpCombiner.setEnabled(True)
2975 self.volOpCebCombiner.setCheckState(QtCore.Qt.Checked)
2976
2913 2977 opObj = puObj.getOperationObj(name="filterByHeights")
2914 2978 if opObj == None:
2915 2979 self.volOpFilter.clear()
@@ -5100,6 +5164,9 class BasicWindow(QMainWindow, Ui_BasicWindow):
5100 5164 self.volOpHeights.setEnabled(False)
5101 5165 self.volOpProfile.setEnabled(False)
5102 5166 self.volOpRadarfrequency.setEnabled(False)
5167 self.volOpSplitter.setEnabled(False)
5168 self.volOpCombiner.setEnabled(False)
5169
5103 5170 self.volOpCebChannels.setCheckState(0)
5104 5171 self.volOpCebRadarfrequency.setCheckState(0)
5105 5172 self.volOpCebHeights.setCheckState(0)
@@ -5107,6 +5174,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
5107 5174 self.volOpCebProfile.setCheckState(0)
5108 5175 self.volOpCebDecodification.setCheckState(0)
5109 5176 self.volOpCebCohInt.setCheckState(0)
5177 self.volOpCebSplitter.setCheckState(0)
5178 self.volOpCebCombiner.setCheckState(0)
5110 5179
5111 5180 self.volOpChannel.clear()
5112 5181 self.volOpHeights.clear()
@@ -5114,6 +5183,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
5114 5183 self.volOpFilter.clear()
5115 5184 self.volOpCohInt.clear()
5116 5185 self.volOpRadarfrequency.clear()
5186 self.volOpSplitter.clear()
5187 self.volOpCombiner.clear()
5117 5188
5118 5189 if datatype == 'Spectra':
5119 5190
@@ -5651,10 +5722,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
5651 5722 self.volOpProfile.setEnabled(False)
5652 5723 self.volOpComMode.setEnabled(False)
5653 5724
5654 self.volOpReshaper.setEnabled(False)
5725 self.volOpSplitter.setEnabled(False)
5726 self.volOpCombiner.setEnabled(False)
5655 5727 self.volOpAdjustHei.setEnabled(False)
5656 5728
5657 self.volOpCebReshaper.setEnabled(False)
5658 5729 self.volOpCebAdjustHei.setEnabled(False)
5659 5730
5660 5731 self.volGraphPath.setEnabled(False)
@@ -85,38 +85,44 class Ui_VoltageTab(object):
85 85 self.volOpHeights.setObjectName(_fromUtf8("volOpHeights"))
86 86 self.gridLayout.addWidget(self.volOpHeights, 3, 3, 1, 2)
87 87
88 self.volOpCebSplitter = QtGui.QCheckBox(self.tabopVoltage)
89 self.volOpCebSplitter.setObjectName(_fromUtf8("volOpCebSplitter"))
90 self.gridLayout.addWidget(self.volOpCebSplitter, 5, 0, 1, 1)
88 91
92 self.volOpSplitter = QtGui.QLineEdit(self.tabopVoltage)
93 self.volOpSplitter.setObjectName(_fromUtf8("volOpSplitter"))
94 self.gridLayout.addWidget(self.volOpSplitter, 5, 1, 1, 4)
89 95
90 96 self.volOpCebProfile = QtGui.QCheckBox(self.tabopVoltage)
91 97 self.volOpCebProfile.setObjectName(_fromUtf8("volOpCebProfile"))
92 self.gridLayout.addWidget(self.volOpCebProfile, 5, 0, 1, 1)
98 self.gridLayout.addWidget(self.volOpCebProfile, 6, 0, 1, 1)
93 99
94 100 self.volOpComProfile = QtGui.QComboBox(self.tabopVoltage)
95 101 self.volOpComProfile.setObjectName(_fromUtf8("volOpComProfile"))
96 102 self.volOpComProfile.addItem(_fromUtf8(""))
97 103 self.volOpComProfile.addItem(_fromUtf8(""))
98 104 self.volOpComProfile.addItem(_fromUtf8(""))
99 self.gridLayout.addWidget(self.volOpComProfile, 5, 1, 1, 2)
105 self.gridLayout.addWidget(self.volOpComProfile, 6, 1, 1, 2)
100 106
101 107 self.volOpProfile = QtGui.QLineEdit(self.tabopVoltage)
102 108 self.volOpProfile.setObjectName(_fromUtf8("volOpProfile"))
103 self.gridLayout.addWidget(self.volOpProfile, 5, 3, 1, 2)
109 self.gridLayout.addWidget(self.volOpProfile, 6, 3, 1, 2)
104 110
105 self.volOpCebReshaper = QtGui.QCheckBox(self.tabopVoltage)
106 self.volOpCebReshaper.setObjectName(_fromUtf8("volOpCebReshaper"))
107 self.gridLayout.addWidget(self.volOpCebReshaper, 6, 0, 1, 1)
111 self.volOpCebCombiner = QtGui.QCheckBox(self.tabopVoltage)
112 self.volOpCebCombiner.setObjectName(_fromUtf8("volOpCebCombiner"))
113 self.gridLayout.addWidget(self.volOpCebCombiner, 7, 0, 1, 1)
108 114
109 self.volOpReshaper = QtGui.QLineEdit(self.tabopVoltage)
110 self.volOpReshaper.setObjectName(_fromUtf8("volOpReshaper"))
111 self.gridLayout.addWidget(self.volOpReshaper, 6, 1, 1, 4)
115 self.volOpCombiner = QtGui.QLineEdit(self.tabopVoltage)
116 self.volOpCombiner.setObjectName(_fromUtf8("volOpCombiner"))
117 self.gridLayout.addWidget(self.volOpCombiner, 7, 1, 1, 4)
112 118
113 119 self.volOpCebFilter = QtGui.QCheckBox(self.tabopVoltage)
114 120 self.volOpCebFilter.setObjectName(_fromUtf8("volOpCebFilter"))
115 self.gridLayout.addWidget(self.volOpCebFilter, 7, 0, 1, 1)
121 self.gridLayout.addWidget(self.volOpCebFilter, 8, 0, 1, 1)
116 122
117 123 self.volOpFilter = QtGui.QLineEdit(self.tabopVoltage)
118 124 self.volOpFilter.setObjectName(_fromUtf8("volOpFilter"))
119 self.gridLayout.addWidget(self.volOpFilter, 7, 1, 1, 4)
125 self.gridLayout.addWidget(self.volOpFilter, 8, 1, 1, 4)
120 126
121 127 # spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
122 128 # self.gridLayout.addItem(spacerItem, 6, 4, 1, 1)
@@ -133,21 +139,21 class Ui_VoltageTab(object):
133 139
134 140 self.volOpCebDecodification = QtGui.QCheckBox(self.tabopVoltage)
135 141 self.volOpCebDecodification.setObjectName(_fromUtf8("volOpCebDecodification"))
136 self.gridLayout.addWidget(self.volOpCebDecodification, 8, 0, 1, 1)
142 self.gridLayout.addWidget(self.volOpCebDecodification, 9, 0, 1, 1)
137 143
138 144 self.volLabCodeMode = QtGui.QLabel(self.tabopVoltage)
139 145 self.volLabCodeMode.setObjectName(_fromUtf8("volLabCodeMode"))
140 self.gridLayout.addWidget(self.volLabCodeMode, 8, 1, 1, 1)
146 self.gridLayout.addWidget(self.volLabCodeMode, 9, 1, 1, 1)
141 147
142 148 self.volOpComMode = QtGui.QComboBox(self.tabopVoltage)
143 149 self.volOpComMode.setObjectName(_fromUtf8("volOpComMode"))
144 150 self.volOpComMode.addItem(_fromUtf8(""))
145 151 self.volOpComMode.addItem(_fromUtf8(""))
146 self.gridLayout.addWidget(self.volOpComMode, 8, 2, 1, 3)
152 self.gridLayout.addWidget(self.volOpComMode, 9, 2, 1, 3)
147 153
148 154 self.volLabCodeType = QtGui.QLabel(self.tabopVoltage)
149 155 self.volLabCodeType.setObjectName(_fromUtf8("volLabCodeType"))
150 self.gridLayout.addWidget(self.volLabCodeType, 9, 1, 1, 1)
156 self.gridLayout.addWidget(self.volLabCodeType, 10, 1, 1, 1)
151 157
152 158 self.volOpComCode = QtGui.QComboBox(self.tabopVoltage)
153 159 self.volOpComCode.setObjectName(_fromUtf8("volOpComCode"))
@@ -165,39 +171,39 class Ui_VoltageTab(object):
165 171 self.volOpComCode.addItem(_fromUtf8(""))
166 172 self.volOpComCode.addItem(_fromUtf8(""))
167 173 self.volOpComCode.addItem(_fromUtf8(""))
168 self.gridLayout.addWidget(self.volOpComCode, 9, 2, 1, 3)
174 self.gridLayout.addWidget(self.volOpComCode, 10, 2, 1, 3)
169 175
170 176 self.volLabCode = QtGui.QLabel(self.tabopVoltage)
171 177 self.volLabCode.setObjectName(_fromUtf8("volLabCode"))
172 self.gridLayout.addWidget(self.volLabCode, 10, 1, 1, 1)
178 self.gridLayout.addWidget(self.volLabCode, 11, 1, 1, 1)
173 179
174 180 self.volOpCode = QtGui.QLineEdit(self.tabopVoltage)
175 181 self.volOpCode.setObjectName(_fromUtf8("volOpCode"))
176 self.gridLayout.addWidget(self.volOpCode, 10, 2, 1, 3)
182 self.gridLayout.addWidget(self.volOpCode, 11, 2, 1, 3)
177 183
178 184 self.volOpCebFlip = QtGui.QCheckBox(self.tabopVoltage)
179 185 self.volOpCebFlip.setObjectName(_fromUtf8("volOpCebFlip"))
180 self.gridLayout.addWidget(self.volOpCebFlip, 11, 0, 1, 1)
186 self.gridLayout.addWidget(self.volOpCebFlip, 12, 0, 1, 1)
181 187
182 188 self.volOpFlip = QtGui.QLineEdit(self.tabopVoltage)
183 189 self.volOpFlip.setObjectName(_fromUtf8("volOpFlip"))
184 self.gridLayout.addWidget(self.volOpFlip, 11, 1, 1, 4)
190 self.gridLayout.addWidget(self.volOpFlip, 13, 1, 1, 4)
185 191
186 192 self.volOpCebCohInt = QtGui.QCheckBox(self.tabopVoltage)
187 193 self.volOpCebCohInt.setObjectName(_fromUtf8("volOpCebCohInt"))
188 self.gridLayout.addWidget(self.volOpCebCohInt, 12, 0, 1, 1)
194 self.gridLayout.addWidget(self.volOpCebCohInt, 13, 0, 1, 1)
189 195
190 196 self.volOpCohInt = QtGui.QLineEdit(self.tabopVoltage)
191 197 self.volOpCohInt.setObjectName(_fromUtf8("volOpCohInt"))
192 self.gridLayout.addWidget(self.volOpCohInt, 12, 1, 1, 4)
198 self.gridLayout.addWidget(self.volOpCohInt, 13, 1, 1, 4)
193 199
194 200 self.volOpCebAdjustHei = QtGui.QCheckBox(self.tabopVoltage)
195 201 self.volOpCebAdjustHei.setObjectName(_fromUtf8("volOpCebAdjustHei"))
196 self.gridLayout.addWidget(self.volOpCebAdjustHei, 13, 0, 1, 1)
202 self.gridLayout.addWidget(self.volOpCebAdjustHei, 14, 0, 1, 1)
197 203
198 204 self.volOpAdjustHei = QtGui.QLineEdit(self.tabopVoltage)
199 205 self.volOpAdjustHei.setObjectName(_fromUtf8("volOpAdjustHei"))
200 self.gridLayout.addWidget(self.volOpAdjustHei, 13, 1, 1, 4)
206 self.gridLayout.addWidget(self.volOpAdjustHei, 14, 1, 1, 4)
201 207
202 208 self.tabWidgetVoltage.addTab(self.tabopVoltage, _fromUtf8(""))
203 209
@@ -338,8 +344,9 class Ui_VoltageTab(object):
338 344 self.volLabCodeType.setText(_translate("MainWindow", "Code type:", None))
339 345 self.volOpCebChannels.setText(_translate("MainWindow", "Select Channels:", None))
340 346 self.volOpCebHeights.setText(_translate("MainWindow", "Select Heights:", None))
341 self.volOpCebFilter.setText(_translate("MainWindow", "Filter:", None))
342 self.volOpCebReshaper.setText(_translate("MainWindow", "Reshape data: ", None))
347 self.volOpCebFilter.setText(_translate("MainWindow", "Range Window Filter:", None))
348 self.volOpCebSplitter.setText(_translate("MainWindow", "Split Profiles: ", None))
349 self.volOpCebCombiner.setText(_translate("MainWindow", "Combine Profiles: ", None))
343 350 self.volOpCebRadarfrequency.setText(_translate("MainWindow", "Radar frequency (MHz):", None))
344 351 self.volLabCodeMode.setText(_translate("MainWindow", "Mode:", None))
345 352 self.volLabCode.setText(_translate("MainWindow", "Code:", None))
General Comments 0
You need to be logged in to leave comments. Login now