@@ -137,12 +137,45 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 | |||
|
142 | if dataOut.flagDataAsBlock: | |||
|
143 | ||||
|
144 | for i in range(dataOut.nProfiles): | |||
|
145 | ||||
|
146 | wintitle1 = wintitle + " [Profile = %d] " %i | |||
|
147 | ||||
|
148 | if type == "power": | |||
|
149 | self.plot_power(dataOut.heightList, | |||
|
150 | dataOut.data[:,i,:], | |||
|
151 | id, | |||
|
152 | channelIndexList, | |||
|
153 | thisDatetime, | |||
|
154 | wintitle1, | |||
|
155 | show, | |||
|
156 | xmin, | |||
|
157 | xmax, | |||
|
158 | ymin, | |||
|
159 | ymax) | |||
|
160 | ||||
|
161 | if type == "iq": | |||
|
162 | self.plot_iq(dataOut.heightList, | |||
|
163 | dataOut.data[:,i,:], | |||
|
164 | id, | |||
|
165 | channelIndexList, | |||
|
166 | thisDatetime, | |||
|
167 | wintitle1, | |||
|
168 | show, | |||
|
169 | xmin, | |||
|
170 | xmax, | |||
|
171 | ymin, | |||
|
172 | ymax) | |||
|
173 | ||||
|
174 | self.draw() | |||
|
175 | ||||
|
176 | else: | |||
|
177 | wintitle += " [Profile = %d] " %dataOut.profileIndex | |||
|
178 | ||||
146 | if type == "power": |
|
179 | if type == "power": | |
147 | self.plot_power(dataOut.heightList, |
|
180 | self.plot_power(dataOut.heightList, | |
148 | dataOut.data, |
|
181 | dataOut.data, | |
@@ -169,7 +202,6 class Scope(Figure): | |||||
169 | ymin, |
|
202 | ymin, | |
170 | ymax) |
|
203 | ymax) | |
171 |
|
204 | |||
172 |
|
||||
173 | self.draw() |
|
205 | self.draw() | |
174 |
|
206 | |||
175 | self.save(figpath=figpath, |
|
207 | self.save(figpath=figpath, |
General Comments 0
You need to be logged in to leave comments.
Login now