##// END OF EJS Templates
schain-jc
RSS
SplitProfiles and CombineProfiles options were added to SignalChainGUI
Miguel Valdez -
r826:35f7f21e0298
parent child
Show More
Show file before | Show file after | Hide comments
@@ -738,6 +738,28 class BasicWindow(QMainWindow, Ui_BasicWindow):
738 self.volOpComHeights.setEnabled(False)
738 self.volOpComHeights.setEnabled(False)
739
739
740 @pyqtSignature("int")
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 def on_volOpCebFilter_stateChanged(self, p0):
763 def on_volOpCebFilter_stateChanged(self, p0):
742 """
764 """
743 Name='Decoder', optype='other'
765 Name='Decoder', optype='other'
@@ -991,20 +1013,17 class BasicWindow(QMainWindow, Ui_BasicWindow):
991 opObj = puObj.addOperation(name=name_operation)
1013 opObj = puObj.addOperation(name=name_operation)
992 opObj.addParameter(name=name_parameter1, value=valueList[0], format=format)
1014 opObj.addParameter(name=name_parameter1, value=valueList[0], format=format)
993 opObj.addParameter(name=name_parameter2, value=valueList[1], format=format)
1015 opObj.addParameter(name=name_parameter2, value=valueList[1], format=format)
994
1016
995 if self.volOpCebFilter.isChecked():
1017 if self.volOpCebSplitter.isChecked():
996 value = str(self.volOpFilter.text())
1018 value = str(self.volOpSplitter.text())
997
1019
998 if not isInt(value):
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 return 0
1022 return 0
1023
1024 opObj = puObj.addOperation(name="SplitProfiles", optype='external')
1025 opObj.addParameter(name='n', value=value, format='int')
1001
1026
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)
1007
1008 if self.volOpCebProfile.isChecked():
1027 if self.volOpCebProfile.isChecked():
1009 value = str(self.volOpProfile.text())
1028 value = str(self.volOpProfile.text())
1010
1029
@@ -1026,6 +1045,29 class BasicWindow(QMainWindow, Ui_BasicWindow):
1026 opObj = puObj.addOperation(name='ProfileSelector', optype='other')
1045 opObj = puObj.addOperation(name='ProfileSelector', optype='other')
1027 opObj.addParameter(name=name_parameter, value=value, format=format)
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 if self.volOpCebDecodification.isChecked():
1071 if self.volOpCebDecodification.isChecked():
1030 name_operation = 'Decoder'
1072 name_operation = 'Decoder'
1031 opObj = puObj.addOperation(name=name_operation, optype='other')
1073 opObj = puObj.addOperation(name=name_operation, optype='other')
@@ -2910,6 +2952,28 class BasicWindow(QMainWindow, Ui_BasicWindow):
2910 self.volOpHeights.setEnabled(True)
2952 self.volOpHeights.setEnabled(True)
2911 self.volOpCebHeights.setCheckState(QtCore.Qt.Checked)
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 opObj = puObj.getOperationObj(name="filterByHeights")
2977 opObj = puObj.getOperationObj(name="filterByHeights")
2914 if opObj == None:
2978 if opObj == None:
2915 self.volOpFilter.clear()
2979 self.volOpFilter.clear()
@@ -5099,14 +5163,19 class BasicWindow(QMainWindow, Ui_BasicWindow):
5099 self.volOpChannel.setEnabled(False)
5163 self.volOpChannel.setEnabled(False)
5100 self.volOpHeights.setEnabled(False)
5164 self.volOpHeights.setEnabled(False)
5101 self.volOpProfile.setEnabled(False)
5165 self.volOpProfile.setEnabled(False)
5102 self.volOpRadarfrequency.setEnabled(False)
5166 self.volOpRadarfrequency.setEnabled(False)
5167 self.volOpSplitter.setEnabled(False)
5168 self.volOpCombiner.setEnabled(False)
5169
5103 self.volOpCebChannels.setCheckState(0)
5170 self.volOpCebChannels.setCheckState(0)
5104 self.volOpCebRadarfrequency.setCheckState(0)
5171 self.volOpCebRadarfrequency.setCheckState(0)
5105 self.volOpCebHeights.setCheckState(0)
5172 self.volOpCebHeights.setCheckState(0)
5106 self.volOpCebFilter.setCheckState(0)
5173 self.volOpCebFilter.setCheckState(0)
5107 self.volOpCebProfile.setCheckState(0)
5174 self.volOpCebProfile.setCheckState(0)
5108 self.volOpCebDecodification.setCheckState(0)
5175 self.volOpCebDecodification.setCheckState(0)
5109 self.volOpCebCohInt.setCheckState(0)
5176 self.volOpCebCohInt.setCheckState(0)
5177 self.volOpCebSplitter.setCheckState(0)
5178 self.volOpCebCombiner.setCheckState(0)
5110
5179
5111 self.volOpChannel.clear()
5180 self.volOpChannel.clear()
5112 self.volOpHeights.clear()
5181 self.volOpHeights.clear()
@@ -5114,6 +5183,8 class BasicWindow(QMainWindow, Ui_BasicWindow):
5114 self.volOpFilter.clear()
5183 self.volOpFilter.clear()
5115 self.volOpCohInt.clear()
5184 self.volOpCohInt.clear()
5116 self.volOpRadarfrequency.clear()
5185 self.volOpRadarfrequency.clear()
5186 self.volOpSplitter.clear()
5187 self.volOpCombiner.clear()
5117
5188
5118 if datatype == 'Spectra':
5189 if datatype == 'Spectra':
5119
5190
@@ -5651,10 +5722,10 class BasicWindow(QMainWindow, Ui_BasicWindow):
5651 self.volOpProfile.setEnabled(False)
5722 self.volOpProfile.setEnabled(False)
5652 self.volOpComMode.setEnabled(False)
5723 self.volOpComMode.setEnabled(False)
5653
5724
5654 self.volOpReshaper.setEnabled(False)
5725 self.volOpSplitter.setEnabled(False)
5726 self.volOpCombiner.setEnabled(False)
5655 self.volOpAdjustHei.setEnabled(False)
5727 self.volOpAdjustHei.setEnabled(False)
5656
5728
5657 self.volOpCebReshaper.setEnabled(False)
5658 self.volOpCebAdjustHei.setEnabled(False)
5729 self.volOpCebAdjustHei.setEnabled(False)
5659
5730
5660 self.volGraphPath.setEnabled(False)
5731 self.volGraphPath.setEnabled(False)
Show file before | Show file after | Hide comments
@@ -85,38 +85,44 class Ui_VoltageTab(object):
85 self.volOpHeights.setObjectName(_fromUtf8("volOpHeights"))
85 self.volOpHeights.setObjectName(_fromUtf8("volOpHeights"))
86 self.gridLayout.addWidget(self.volOpHeights, 3, 3, 1, 2)
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 self.volOpCebProfile = QtGui.QCheckBox(self.tabopVoltage)
96 self.volOpCebProfile = QtGui.QCheckBox(self.tabopVoltage)
91 self.volOpCebProfile.setObjectName(_fromUtf8("volOpCebProfile"))
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 self.volOpComProfile = QtGui.QComboBox(self.tabopVoltage)
100 self.volOpComProfile = QtGui.QComboBox(self.tabopVoltage)
95 self.volOpComProfile.setObjectName(_fromUtf8("volOpComProfile"))
101 self.volOpComProfile.setObjectName(_fromUtf8("volOpComProfile"))
96 self.volOpComProfile.addItem(_fromUtf8(""))
102 self.volOpComProfile.addItem(_fromUtf8(""))
97 self.volOpComProfile.addItem(_fromUtf8(""))
103 self.volOpComProfile.addItem(_fromUtf8(""))
98 self.volOpComProfile.addItem(_fromUtf8(""))
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 self.volOpProfile = QtGui.QLineEdit(self.tabopVoltage)
107 self.volOpProfile = QtGui.QLineEdit(self.tabopVoltage)
102 self.volOpProfile.setObjectName(_fromUtf8("volOpProfile"))
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)
111 self.volOpCebCombiner = QtGui.QCheckBox(self.tabopVoltage)
106 self.volOpCebReshaper.setObjectName(_fromUtf8("volOpCebReshaper"))
112 self.volOpCebCombiner.setObjectName(_fromUtf8("volOpCebCombiner"))
107 self.gridLayout.addWidget(self.volOpCebReshaper, 6, 0, 1, 1)
113 self.gridLayout.addWidget(self.volOpCebCombiner, 7, 0, 1, 1)
108
114
109 self.volOpReshaper = QtGui.QLineEdit(self.tabopVoltage)
115 self.volOpCombiner = QtGui.QLineEdit(self.tabopVoltage)
110 self.volOpReshaper.setObjectName(_fromUtf8("volOpReshaper"))
116 self.volOpCombiner.setObjectName(_fromUtf8("volOpCombiner"))
111 self.gridLayout.addWidget(self.volOpReshaper, 6, 1, 1, 4)
117 self.gridLayout.addWidget(self.volOpCombiner, 7, 1, 1, 4)
112
118
113 self.volOpCebFilter = QtGui.QCheckBox(self.tabopVoltage)
119 self.volOpCebFilter = QtGui.QCheckBox(self.tabopVoltage)
114 self.volOpCebFilter.setObjectName(_fromUtf8("volOpCebFilter"))
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 self.volOpFilter = QtGui.QLineEdit(self.tabopVoltage)
123 self.volOpFilter = QtGui.QLineEdit(self.tabopVoltage)
118 self.volOpFilter.setObjectName(_fromUtf8("volOpFilter"))
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 # spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
127 # spacerItem = QtGui.QSpacerItem(40, 20, QtGui.QSizePolicy.Expanding, QtGui.QSizePolicy.Minimum)
122 # self.gridLayout.addItem(spacerItem, 6, 4, 1, 1)
128 # self.gridLayout.addItem(spacerItem, 6, 4, 1, 1)
@@ -133,21 +139,21 class Ui_VoltageTab(object):
133
139
134 self.volOpCebDecodification = QtGui.QCheckBox(self.tabopVoltage)
140 self.volOpCebDecodification = QtGui.QCheckBox(self.tabopVoltage)
135 self.volOpCebDecodification.setObjectName(_fromUtf8("volOpCebDecodification"))
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 self.volLabCodeMode = QtGui.QLabel(self.tabopVoltage)
144 self.volLabCodeMode = QtGui.QLabel(self.tabopVoltage)
139 self.volLabCodeMode.setObjectName(_fromUtf8("volLabCodeMode"))
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 self.volOpComMode = QtGui.QComboBox(self.tabopVoltage)
148 self.volOpComMode = QtGui.QComboBox(self.tabopVoltage)
143 self.volOpComMode.setObjectName(_fromUtf8("volOpComMode"))
149 self.volOpComMode.setObjectName(_fromUtf8("volOpComMode"))
144 self.volOpComMode.addItem(_fromUtf8(""))
150 self.volOpComMode.addItem(_fromUtf8(""))
145 self.volOpComMode.addItem(_fromUtf8(""))
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 self.volLabCodeType = QtGui.QLabel(self.tabopVoltage)
154 self.volLabCodeType = QtGui.QLabel(self.tabopVoltage)
149 self.volLabCodeType.setObjectName(_fromUtf8("volLabCodeType"))
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 self.volOpComCode = QtGui.QComboBox(self.tabopVoltage)
158 self.volOpComCode = QtGui.QComboBox(self.tabopVoltage)
153 self.volOpComCode.setObjectName(_fromUtf8("volOpComCode"))
159 self.volOpComCode.setObjectName(_fromUtf8("volOpComCode"))
@@ -165,39 +171,39 class Ui_VoltageTab(object):
165 self.volOpComCode.addItem(_fromUtf8(""))
171 self.volOpComCode.addItem(_fromUtf8(""))
166 self.volOpComCode.addItem(_fromUtf8(""))
172 self.volOpComCode.addItem(_fromUtf8(""))
167 self.volOpComCode.addItem(_fromUtf8(""))
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 self.volLabCode = QtGui.QLabel(self.tabopVoltage)
176 self.volLabCode = QtGui.QLabel(self.tabopVoltage)
171 self.volLabCode.setObjectName(_fromUtf8("volLabCode"))
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 self.volOpCode = QtGui.QLineEdit(self.tabopVoltage)
180 self.volOpCode = QtGui.QLineEdit(self.tabopVoltage)
175 self.volOpCode.setObjectName(_fromUtf8("volOpCode"))
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 self.volOpCebFlip = QtGui.QCheckBox(self.tabopVoltage)
184 self.volOpCebFlip = QtGui.QCheckBox(self.tabopVoltage)
179 self.volOpCebFlip.setObjectName(_fromUtf8("volOpCebFlip"))
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 self.volOpFlip = QtGui.QLineEdit(self.tabopVoltage)
188 self.volOpFlip = QtGui.QLineEdit(self.tabopVoltage)
183 self.volOpFlip.setObjectName(_fromUtf8("volOpFlip"))
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 self.volOpCebCohInt = QtGui.QCheckBox(self.tabopVoltage)
192 self.volOpCebCohInt = QtGui.QCheckBox(self.tabopVoltage)
187 self.volOpCebCohInt.setObjectName(_fromUtf8("volOpCebCohInt"))
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 self.volOpCohInt = QtGui.QLineEdit(self.tabopVoltage)
196 self.volOpCohInt = QtGui.QLineEdit(self.tabopVoltage)
191 self.volOpCohInt.setObjectName(_fromUtf8("volOpCohInt"))
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 self.volOpCebAdjustHei = QtGui.QCheckBox(self.tabopVoltage)
200 self.volOpCebAdjustHei = QtGui.QCheckBox(self.tabopVoltage)
195 self.volOpCebAdjustHei.setObjectName(_fromUtf8("volOpCebAdjustHei"))
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 self.volOpAdjustHei = QtGui.QLineEdit(self.tabopVoltage)
204 self.volOpAdjustHei = QtGui.QLineEdit(self.tabopVoltage)
199 self.volOpAdjustHei.setObjectName(_fromUtf8("volOpAdjustHei"))
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 self.tabWidgetVoltage.addTab(self.tabopVoltage, _fromUtf8(""))
208 self.tabWidgetVoltage.addTab(self.tabopVoltage, _fromUtf8(""))
203
209
@@ -338,8 +344,9 class Ui_VoltageTab(object):
338 self.volLabCodeType.setText(_translate("MainWindow", "Code type:", None))
344 self.volLabCodeType.setText(_translate("MainWindow", "Code type:", None))
339 self.volOpCebChannels.setText(_translate("MainWindow", "Select Channels:", None))
345 self.volOpCebChannels.setText(_translate("MainWindow", "Select Channels:", None))
340 self.volOpCebHeights.setText(_translate("MainWindow", "Select Heights:", None))
346 self.volOpCebHeights.setText(_translate("MainWindow", "Select Heights:", None))
341 self.volOpCebFilter.setText(_translate("MainWindow", "Filter:", None))
347 self.volOpCebFilter.setText(_translate("MainWindow", "Range Window Filter:", None))
342 self.volOpCebReshaper.setText(_translate("MainWindow", "Reshape data: ", None))
348 self.volOpCebSplitter.setText(_translate("MainWindow", "Split Profiles: ", None))
349 self.volOpCebCombiner.setText(_translate("MainWindow", "Combine Profiles: ", None))
343 self.volOpCebRadarfrequency.setText(_translate("MainWindow", "Radar frequency (MHz):", None))
350 self.volOpCebRadarfrequency.setText(_translate("MainWindow", "Radar frequency (MHz):", None))
344 self.volLabCodeMode.setText(_translate("MainWindow", "Mode:", None))
351 self.volLabCodeMode.setText(_translate("MainWindow", "Mode:", None))
345 self.volLabCode.setText(_translate("MainWindow", "Code:", None))
352 self.volLabCode.setText(_translate("MainWindow", "Code:", None))
General Comments 0
You need to be logged in to leave comments. Login now