@@ -137,38 +137,70 class Scope(Figure): | |||||
137 | raise ValueError, "Channel %d is not in dataOut.channelList" |
|
137 | raise ValueError, "Channel %d is not in dataOut.channelList" | |
138 | channelIndexList.append(dataOut.channelList.index(channel)) |
|
138 | channelIndexList.append(dataOut.channelList.index(channel)) | |
139 |
|
139 | |||
140 | x = dataOut.heightList |
|
|||
141 | y = dataOut.data[channelIndexList,:] * numpy.conjugate(dataOut.data[channelIndexList,:]) |
|
|||
142 | y = y.real |
|
|||
143 |
|
||||
144 | thisDatetime = datetime.datetime.utcfromtimestamp(dataOut.getTimeRange()[0]) |
|
140 | thisDatetime = datetime.datetime.utcfromtimestamp(dataOut.getTimeRange()[0]) | |
145 |
|
141 | |||
146 | if type == "power": |
|
142 | if dataOut.flagDataAsBlock: | |
147 | self.plot_power(dataOut.heightList, |
|
143 | ||
148 | dataOut.data, |
|
144 | for i in range(dataOut.nProfiles): | |
149 |
|
|
145 | ||
150 | channelIndexList, |
|
146 | wintitle1 = wintitle + " [Profile = %d] " %i | |
151 | thisDatetime, |
|
147 | ||
152 | wintitle, |
|
148 | if type == "power": | |
153 | show, |
|
149 | self.plot_power(dataOut.heightList, | |
154 |
|
|
150 | dataOut.data[:,i,:], | |
155 |
|
|
151 | id, | |
156 |
|
|
152 | channelIndexList, | |
157 |
|
|
153 | thisDatetime, | |
158 |
|
154 | wintitle1, | ||
159 | if type == "iq": |
|
155 | show, | |
160 | self.plot_iq(dataOut.heightList, |
|
156 | xmin, | |
161 |
|
|
157 | xmax, | |
162 |
|
|
158 | ymin, | |
163 |
|
|
159 | ymax) | |
164 | thisDatetime, |
|
160 | ||
165 |
|
|
161 | if type == "iq": | |
166 | show, |
|
162 | self.plot_iq(dataOut.heightList, | |
167 |
|
|
163 | dataOut.data[:,i,:], | |
168 |
|
|
164 | id, | |
169 |
|
|
165 | channelIndexList, | |
170 |
|
|
166 | thisDatetime, | |
|
167 | wintitle1, | |||
|
168 | show, | |||
|
169 | xmin, | |||
|
170 | xmax, | |||
|
171 | ymin, | |||
|
172 | ymax) | |||
|
173 | ||||
|
174 | self.draw() | |||
171 |
|
175 | |||
|
176 | else: | |||
|
177 | wintitle += " [Profile = %d] " %dataOut.profileIndex | |||
|
178 | ||||
|
179 | if type == "power": | |||
|
180 | self.plot_power(dataOut.heightList, | |||
|
181 | dataOut.data, | |||
|
182 | id, | |||
|
183 | channelIndexList, | |||
|
184 | thisDatetime, | |||
|
185 | wintitle, | |||
|
186 | show, | |||
|
187 | xmin, | |||
|
188 | xmax, | |||
|
189 | ymin, | |||
|
190 | ymax) | |||
|
191 | ||||
|
192 | if type == "iq": | |||
|
193 | self.plot_iq(dataOut.heightList, | |||
|
194 | dataOut.data, | |||
|
195 | id, | |||
|
196 | channelIndexList, | |||
|
197 | thisDatetime, | |||
|
198 | wintitle, | |||
|
199 | show, | |||
|
200 | xmin, | |||
|
201 | xmax, | |||
|
202 | ymin, | |||
|
203 | ymax) | |||
172 |
|
204 | |||
173 | self.draw() |
|
205 | self.draw() | |
174 |
|
206 |
General Comments 0
You need to be logged in to leave comments.
Login now