|
|
@@
-37,7
+37,6
class PlotData(Operation, Process):
|
|
|
37
|
self.dataOut = None
|
|
37
|
self.dataOut = None
|
|
|
38
|
self.isConfig = False
|
|
38
|
self.isConfig = False
|
|
|
39
|
self.figure = None
|
|
39
|
self.figure = None
|
|
|
40
|
self.figure2 = None #JM modificatiom
|
|
|
|
|
|
41
|
self.axes = []
|
|
40
|
self.axes = []
|
|
|
42
|
self.localtime = kwargs.pop('localtime', True)
|
|
41
|
self.localtime = kwargs.pop('localtime', True)
|
|
|
43
|
self.show = kwargs.get('show', True)
|
|
42
|
self.show = kwargs.get('show', True)
|
|
|
@@
-60,6
+59,15
class PlotData(Operation, Process):
|
|
|
60
|
self.times = []
|
|
59
|
self.times = []
|
|
|
61
|
#self.interactive = self.kwargs['parent']
|
|
60
|
#self.interactive = self.kwargs['parent']
|
|
|
62
|
|
|
61
|
|
|
|
|
|
|
62
|
'''
|
|
|
|
|
|
63
|
this new parameter is created to plot data from varius channels at different figures
|
|
|
|
|
|
64
|
1. crear una lista de figuras donde se puedan plotear las figuras,
|
|
|
|
|
|
65
|
2. dar las opciones de configuracion a cada figura, estas opciones son iguales para ambas figuras
|
|
|
|
|
|
66
|
3. probar?
|
|
|
|
|
|
67
|
'''
|
|
|
|
|
|
68
|
self.ind_plt_ch = kwargs.get('ind_plt_ch', False)
|
|
|
|
|
|
69
|
self.figurelist = None
|
|
|
|
|
|
70
|
|
|
|
63
|
|
|
71
|
|
|
|
64
|
def fill_gaps(self, x_buffer, y_buffer, z_buffer):
|
|
72
|
def fill_gaps(self, x_buffer, y_buffer, z_buffer):
|
|
|
65
|
|
|
73
|
|
|
|
@@
-94,37
+102,42
class PlotData(Operation, Process):
|
|
|
94
|
def __plot(self):
|
|
102
|
def __plot(self):
|
|
|
95
|
|
|
103
|
|
|
|
96
|
print 'plotting...{}'.format(self.CODE)
|
|
104
|
print 'plotting...{}'.format(self.CODE)
|
|
|
97
|
|
|
105
|
if self.ind_plt_ch is False : #standard
|
|
|
98
|
if self.show:
|
|
106
|
if self.show:
|
|
|
99
|
self.figure.show()
|
|
107
|
self.figure.show()
|
|
|
100
|
self.figure2.show()
|
|
|
|
|
|
101
|
|
|
|
|
|
|
102
|
self.plot()
|
|
108
|
self.plot()
|
|
|
103
|
plt.tight_layout()
|
|
109
|
plt.tight_layout()
|
|
|
104
|
|
|
|
|
|
|
105
|
# self.figure.canvas.manager.set_window_title('{} {} - Date:{}'.format(self.title, self.CODE.upper(),
|
|
|
|
|
|
106
|
# datetime.datetime.fromtimestamp(self.max_time).strftime('%y/%m/%d %H:%M:%S')))
|
|
|
|
|
|
107
|
# self.figure2.canvas.manager.set_window_title('{} {} - Date:{}'.format(self.title, self.CODE.upper(),
|
|
|
|
|
|
108
|
# datetime.datetime.fromtimestamp(self.max_time).strftime('%y/%m/%d %H:%M:%S')))
|
|
|
|
|
|
109
|
# =======
|
|
|
|
|
|
110
|
self.figure.canvas.manager.set_window_title('{} {} - {}'.format(self.title, self.CODE.upper(),
|
|
110
|
self.figure.canvas.manager.set_window_title('{} {} - {}'.format(self.title, self.CODE.upper(),
|
|
|
111
|
datetime.datetime.fromtimestamp(self.max_time).strftime('%Y/%m/%d')))
|
|
111
|
datetime.datetime.fromtimestamp(self.max_time).strftime('%Y/%m/%d')))
|
|
|
112
|
self.figure2.canvas.manager.set_window_title('{} {} - {}'.format(self.title, self.CODE.upper(),
|
|
112
|
else :
|
|
|
|
|
|
113
|
for n, eachfigure in enumerate(self.figurelist):
|
|
|
|
|
|
114
|
if self.show:
|
|
|
|
|
|
115
|
eachfigure.show()
|
|
|
|
|
|
116
|
self.plot() # ok? como elijo que figura?
|
|
|
|
|
|
117
|
plt.tight_layout()
|
|
|
|
|
|
118
|
eachfigure.canvas.manager.set_window_title('{} {} - {}'.format(self.title[n], self.CODE.upper(),
|
|
|
113
|
datetime.datetime.fromtimestamp(self.max_time).strftime('%Y/%m/%d')))
|
|
119
|
datetime.datetime.fromtimestamp(self.max_time).strftime('%Y/%m/%d')))
|
|
|
114
|
|
|
120
|
|
|
|
115
|
|
|
|
|
|
|
116
|
if self.save:
|
|
121
|
if self.save:
|
|
|
|
|
|
122
|
if self.ind_plt_ch is False : #standard
|
|
|
117
|
figname = os.path.join(self.save, '{}_{}.png'.format(self.CODE,
|
|
123
|
figname = os.path.join(self.save, '{}_{}.png'.format(self.CODE,
|
|
|
118
|
datetime.datetime.fromtimestamp(self.saveTime).strftime('%y%m%d_%H%M%S')))
|
|
124
|
datetime.datetime.fromtimestamp(self.saveTime).strftime('%y%m%d_%H%M%S')))
|
|
|
119
|
print 'Saving figure: {}'.format(figname)
|
|
125
|
print 'Saving figure: {}'.format(figname)
|
|
|
120
|
self.figure.savefig(figname)
|
|
126
|
self.figure.savefig(figname)
|
|
|
121
|
figname2 = os.path.join(self.save, '{}_{}2.png'.format(self.CODE,
|
|
127
|
else :
|
|
|
|
|
|
128
|
for n, eachfigure in enumerate(self.figurelist):
|
|
|
|
|
|
129
|
#add specific name for each channel in channelList
|
|
|
|
|
|
130
|
figname = os.path.join(self.save, '{}_{}_{}.png'.format(self.titles[n],self.CODE,
|
|
|
122
|
datetime.datetime.fromtimestamp(self.saveTime).strftime('%y%m%d_%H%M%S')))
|
|
131
|
datetime.datetime.fromtimestamp(self.saveTime).strftime('%y%m%d_%H%M%S')))
|
|
|
123
|
print 'Saving figure: {}'.format(figname2)
|
|
|
|
|
|
124
|
self.figure2.savefig(figname2)
|
|
|
|
|
|
125
|
|
|
132
|
|
|
|
|
|
|
133
|
print 'Saving figure: {}'.format(figname)
|
|
|
|
|
|
134
|
eachfigure.savefig(figname)
|
|
|
|
|
|
135
|
|
|
|
|
|
|
136
|
if self.ind_plt_ch is False :
|
|
|
126
|
self.figure.canvas.draw()
|
|
137
|
self.figure.canvas.draw()
|
|
|
127
|
self.figure2.canvas.draw()
|
|
138
|
else :
|
|
|
|
|
|
139
|
for eachfigure in self.figurelist:
|
|
|
|
|
|
140
|
eachfigure.canvas.draw()
|
|
|
128
|
|
|
141
|
|
|
|
129
|
def plot(self):
|
|
142
|
def plot(self):
|
|
|
130
|
|
|
143
|
|
|
|
@@
-246,7
+259,6
class PlotSpectraData(PlotData):
|
|
|
246
|
z = self.data[self.CODE]
|
|
259
|
z = self.data[self.CODE]
|
|
|
247
|
|
|
260
|
|
|
|
248
|
for n, ax in enumerate(self.axes):
|
|
261
|
for n, ax in enumerate(self.axes):
|
|
|
249
|
|
|
|
|
|
|
250
|
if ax.firsttime:
|
|
262
|
if ax.firsttime:
|
|
|
251
|
self.xmax = self.xmax if self.xmax else np.nanmax(x)
|
|
263
|
self.xmax = self.xmax if self.xmax else np.nanmax(x)
|
|
|
252
|
self.xmin = self.xmin if self.xmin else -self.xmax
|
|
264
|
self.xmin = self.xmin if self.xmin else -self.xmax
|
|
|
@@
-484,7
+496,15
class PlotRTIData(PlotData):
|
|
|
484
|
self.ylabel = 'Range [Km]'
|
|
496
|
self.ylabel = 'Range [Km]'
|
|
|
485
|
self.titles = ['Channel {}'.format(x) for x in self.dataOut.channelList]
|
|
497
|
self.titles = ['Channel {}'.format(x) for x in self.dataOut.channelList]
|
|
|
486
|
|
|
498
|
|
|
|
487
|
if self.figure is None:
|
|
499
|
'''
|
|
|
|
|
|
500
|
Logica:
|
|
|
|
|
|
501
|
1) Si la variable ind_plt_ch es True, va a crear mas de 1 figura
|
|
|
|
|
|
502
|
2) guardamos "Figures" en una lista y "axes" en otra, quizas se deberia guardar el
|
|
|
|
|
|
503
|
axis dentro de "Figures" como un diccionario.
|
|
|
|
|
|
504
|
'''
|
|
|
|
|
|
505
|
if self.ind_plt_ch is False: #standard mode
|
|
|
|
|
|
506
|
|
|
|
|
|
|
507
|
if self.figure is None: #solo para la priemra vez
|
|
|
488
|
self.figure = plt.figure(figsize=(self.width, self.height),
|
|
508
|
self.figure = plt.figure(figsize=(self.width, self.height),
|
|
|
489
|
edgecolor='k',
|
|
509
|
edgecolor='k',
|
|
|
490
|
facecolor='w')
|
|
510
|
facecolor='w')
|
|
|
@@
-492,32
+512,40
class PlotRTIData(PlotData):
|
|
|
492
|
self.figure.clf()
|
|
512
|
self.figure.clf()
|
|
|
493
|
self.axes = []
|
|
513
|
self.axes = []
|
|
|
494
|
|
|
514
|
|
|
|
495
|
if self.figure2 is None:
|
|
|
|
|
|
496
|
self.figure2 = plt.figure(figsize=(self.width, self.height),
|
|
|
|
|
|
497
|
edgecolor='k',
|
|
|
|
|
|
498
|
facecolor='w')
|
|
|
|
|
|
499
|
else:
|
|
|
|
|
|
500
|
self.figure2.clf()
|
|
|
|
|
|
501
|
self.axes = []
|
|
|
|
|
|
502
|
|
|
515
|
|
|
|
503
|
ax = self.figure.add_subplot(1,1,1)
|
|
516
|
for n in range(self.nrows):
|
|
|
|
|
|
517
|
ax = self.figure.add_subplot(self.nrows, self.ncols, n+1)
|
|
|
504
|
#ax = self.figure( n+1)
|
|
518
|
#ax = self.figure(n+1)
|
|
|
505
|
ax.firsttime = True
|
|
519
|
ax.firsttime = True
|
|
|
506
|
self.axes.append(ax)
|
|
520
|
self.axes.append(ax)
|
|
|
507
|
|
|
521
|
|
|
|
508
|
ax = self.figure2.add_subplot(1,1,1)
|
|
522
|
else : #append one figure foreach channel in channelList
|
|
|
|
|
|
523
|
if self.figurelist == None:
|
|
|
|
|
|
524
|
self.figurelist = []
|
|
|
|
|
|
525
|
for n in range(self.nrows):
|
|
|
|
|
|
526
|
self.figure = plt.figure(figsize=(self.width, self.height),
|
|
|
|
|
|
527
|
edgecolor='k',
|
|
|
|
|
|
528
|
facecolor='w')
|
|
|
|
|
|
529
|
#add always one subplot
|
|
|
|
|
|
530
|
self.figurelist.append(self.figure)
|
|
|
|
|
|
531
|
|
|
|
|
|
|
532
|
else : # cada dia nuevo limpia el axes, pero mantiene el figure
|
|
|
|
|
|
533
|
for eachfigure in self.figurelist:
|
|
|
|
|
|
534
|
eachfigure.clf() # eliminaria todas las figuras de la lista?
|
|
|
|
|
|
535
|
self.axes = []
|
|
|
|
|
|
536
|
|
|
|
|
|
|
537
|
for eachfigure in self.figurelist:
|
|
|
|
|
|
538
|
ax = eachfigure.add_subplot(1,1,1) #solo 1 axis por figura
|
|
|
509
|
#ax = self.figure( n+1)
|
|
539
|
#ax = self.figure(n+1)
|
|
|
510
|
ax.firsttime = True
|
|
540
|
ax.firsttime = True
|
|
|
|
|
|
541
|
#Cada figura tiene un distinto puntero
|
|
|
511
|
self.axes.append(ax)
|
|
542
|
self.axes.append(ax)
|
|
|
512
|
# for n in range(self.nrows):
|
|
543
|
#plt.close(eachfigure)
|
|
|
513
|
# ax = self.figure.add_subplot(self.nrows, self.ncols, n+1)
|
|
|
|
|
|
514
|
# #ax = self.figure( n+1)
|
|
|
|
|
|
515
|
# ax.firsttime = True
|
|
|
|
|
|
516
|
# self.axes.append(ax)
|
|
|
|
|
|
517
|
|
|
544
|
|
|
|
518
|
|
|
545
|
|
|
|
519
|
def plot(self):
|
|
546
|
def plot(self):
|
|
|
520
|
|
|
547
|
|
|
|
|
|
|
548
|
if self.ind_plt_ch is False: #standard mode
|
|
|
521
|
self.x = np.array(self.times)
|
|
549
|
self.x = np.array(self.times)
|
|
|
522
|
self.y = self.dataOut.getHeiRange()
|
|
550
|
self.y = self.dataOut.getHeiRange()
|
|
|
523
|
self.z = []
|
|
551
|
self.z = []
|
|
|
@@
-542,22
+570,17
class PlotRTIData(PlotData):
|
|
|
542
|
)
|
|
570
|
)
|
|
|
543
|
divider = make_axes_locatable(ax)
|
|
571
|
divider = make_axes_locatable(ax)
|
|
|
544
|
cax = divider.new_horizontal(size='2%', pad=0.05)
|
|
572
|
cax = divider.new_horizontal(size='2%', pad=0.05)
|
|
|
545
|
#self.figure.add_axes(cax)
|
|
573
|
self.figure.add_axes(cax)
|
|
|
546
|
#self.figure2.add_axes(cax)
|
|
|
|
|
|
547
|
plt.colorbar(plot, cax)
|
|
574
|
plt.colorbar(plot, cax)
|
|
|
548
|
ax.set_ylim(self.ymin, self.ymax)
|
|
575
|
ax.set_ylim(self.ymin, self.ymax)
|
|
|
549
|
|
|
|
|
|
|
550
|
ax.xaxis.set_major_formatter(FuncFormatter(func))
|
|
576
|
ax.xaxis.set_major_formatter(FuncFormatter(func))
|
|
|
551
|
ax.xaxis.set_major_locator(LinearLocator(6))
|
|
577
|
ax.xaxis.set_major_locator(LinearLocator(6))
|
|
|
552
|
|
|
|
|
|
|
553
|
ax.set_ylabel(self.ylabel)
|
|
578
|
ax.set_ylabel(self.ylabel)
|
|
|
554
|
|
|
|
|
|
|
555
|
# if self.xmin is None:
|
|
579
|
# if self.xmin is None:
|
|
|
556
|
# xmin = self.min_time
|
|
580
|
# xmin = self.min_time
|
|
|
557
|
# else:
|
|
581
|
# else:
|
|
|
558
|
# xmin = (datetime.datetime.combine(self.dataOut.datatime.date(),
|
|
582
|
# xmin = (datetime.datetime.combine(self.dataOut.datatime.date(),
|
|
|
559
|
# datetime.time(self.xmin, 0, 0))-d1970).total_seconds()
|
|
583
|
# datetime.time(self.xmin, 0, 0))-d1970).total_seconds()
|
|
|
560
|
|
|
|
|
|
|
561
|
ax.set_xlim(xmin, xmax)
|
|
584
|
ax.set_xlim(xmin, xmax)
|
|
|
562
|
ax.firsttime = False
|
|
585
|
ax.firsttime = False
|
|
|
563
|
else:
|
|
586
|
else:
|
|
|
@@
-573,6
+596,63
class PlotRTIData(PlotData):
|
|
|
573
|
size=8)
|
|
596
|
size=8)
|
|
|
574
|
|
|
597
|
|
|
|
575
|
self.saveTime = self.min_time
|
|
598
|
self.saveTime = self.min_time
|
|
|
|
|
|
599
|
else :
|
|
|
|
|
|
600
|
self.x = np.array(self.times)
|
|
|
|
|
|
601
|
self.y = self.dataOut.getHeiRange()
|
|
|
|
|
|
602
|
self.z = []
|
|
|
|
|
|
603
|
|
|
|
|
|
|
604
|
for ch in range(self.nrows):
|
|
|
|
|
|
605
|
self.z.append([self.data[self.CODE][t][ch] for t in self.times])
|
|
|
|
|
|
606
|
|
|
|
|
|
|
607
|
self.z = np.array(self.z)
|
|
|
|
|
|
608
|
for n, eachfigure in enumerate(self.figurelist): #estaba ax in axes
|
|
|
|
|
|
609
|
|
|
|
|
|
|
610
|
x, y, z = self.fill_gaps(*self.decimate())
|
|
|
|
|
|
611
|
xmin = self.min_time
|
|
|
|
|
|
612
|
xmax = xmin+self.xrange*60*60
|
|
|
|
|
|
613
|
self.zmin = self.zmin if self.zmin else np.min(self.z)
|
|
|
|
|
|
614
|
self.zmax = self.zmax if self.zmax else np.max(self.z)
|
|
|
|
|
|
615
|
if self.axes[n].firsttime:
|
|
|
|
|
|
616
|
self.ymin = self.ymin if self.ymin else np.nanmin(self.y)
|
|
|
|
|
|
617
|
self.ymax = self.ymax if self.ymax else np.nanmax(self.y)
|
|
|
|
|
|
618
|
plot = self.axes[n].pcolormesh(x, y, z[n].T,
|
|
|
|
|
|
619
|
vmin=self.zmin,
|
|
|
|
|
|
620
|
vmax=self.zmax,
|
|
|
|
|
|
621
|
cmap=plt.get_cmap(self.colormap)
|
|
|
|
|
|
622
|
)
|
|
|
|
|
|
623
|
divider = make_axes_locatable(self.axes[n])
|
|
|
|
|
|
624
|
cax = divider.new_horizontal(size='2%', pad=0.05)
|
|
|
|
|
|
625
|
eachfigure.add_axes(cax)
|
|
|
|
|
|
626
|
#self.figure2.add_axes(cax)
|
|
|
|
|
|
627
|
plt.colorbar(plot, cax)
|
|
|
|
|
|
628
|
self.axes[n].set_ylim(self.ymin, self.ymax)
|
|
|
|
|
|
629
|
|
|
|
|
|
|
630
|
self.axes[n].xaxis.set_major_formatter(FuncFormatter(func))
|
|
|
|
|
|
631
|
self.axes[n].xaxis.set_major_locator(LinearLocator(6))
|
|
|
|
|
|
632
|
|
|
|
|
|
|
633
|
self.axes[n].set_ylabel(self.ylabel)
|
|
|
|
|
|
634
|
|
|
|
|
|
|
635
|
# if self.xmin is None:
|
|
|
|
|
|
636
|
# xmin = self.min_time
|
|
|
|
|
|
637
|
# else:
|
|
|
|
|
|
638
|
# xmin = (datetime.datetime.combine(self.dataOut.datatime.date(),
|
|
|
|
|
|
639
|
# datetime.time(self.xmin, 0, 0))-d1970).total_seconds()
|
|
|
|
|
|
640
|
|
|
|
|
|
|
641
|
self.axes[n].set_xlim(xmin, xmax)
|
|
|
|
|
|
642
|
self.axes[n].firsttime = False
|
|
|
|
|
|
643
|
else:
|
|
|
|
|
|
644
|
self.axes[n].collections.remove(self.axes[n].collections[0])
|
|
|
|
|
|
645
|
self.axes[n].set_xlim(xmin, xmax)
|
|
|
|
|
|
646
|
plot = self.axes[n].pcolormesh(x, y, z[n].T,
|
|
|
|
|
|
647
|
vmin=self.zmin,
|
|
|
|
|
|
648
|
vmax=self.zmax,
|
|
|
|
|
|
649
|
cmap=plt.get_cmap(self.colormap)
|
|
|
|
|
|
650
|
)
|
|
|
|
|
|
651
|
self.axes[n].set_title('{} {}'.format(self.titles[n],
|
|
|
|
|
|
652
|
datetime.datetime.fromtimestamp(self.max_time).strftime('%y/%m/%d %H:%M:%S')),
|
|
|
|
|
|
653
|
size=8)
|
|
|
|
|
|
654
|
|
|
|
|
|
|
655
|
self.saveTime = self.min_time
|
|
|
576
|
|
|
656
|
|
|
|
577
|
|
|
657
|
|
|
|
578
|
class PlotCOHData(PlotRTIData):
|
|
658
|
class PlotCOHData(PlotRTIData):
|
