diff --git a/schainpy/model/graphics/jroplot_base.py b/schainpy/model/graphics/jroplot_base.py index fd2eca7..c6e642c 100644 --- a/schainpy/model/graphics/jroplot_base.py +++ b/schainpy/model/graphics/jroplot_base.py @@ -231,7 +231,6 @@ class Plot(Operation): self.attr_time = kwargs.get('attr_time', 'utctime') self.attr_data = kwargs.get('attr_data', 'data_param') self.decimation = kwargs.get('decimation', None) - self.showSNR = kwargs.get('showSNR', False) self.oneFigure = kwargs.get('oneFigure', True) self.width = kwargs.get('width', None) self.height = kwargs.get('height', None) @@ -262,6 +261,9 @@ class Plot(Operation): self.name ) + if isinstance(self.attr_data, str): + self.attr_data = [self.attr_data] + def __setup_plot(self): ''' Common setup for all figures, here figures and axes are created @@ -322,6 +324,7 @@ class Plot(Operation): self.pf_axes.append(cax) for n in range(self.nrows): + print(self.nrows) if self.colormaps is not None: cmap = plt.get_cmap(self.colormaps[n]) else: @@ -503,33 +506,33 @@ class Plot(Operation): fig = self.figures[n] - figname = os.path.join( - self.save, - self.save_code, - '{}_{}.png'.format( - self.save_code, - self.getDateTime(self.data.max_time).strftime( - '%Y%m%d_%H%M%S' - ), - ) - ) - log.log('Saving figure: {}'.format(figname), self.name) - if not os.path.isdir(os.path.dirname(figname)): - os.makedirs(os.path.dirname(figname)) - fig.savefig(figname) - if self.throttle == 0: figname = os.path.join( self.save, - '{}_{}.png'.format( + self.save_code, + '{}_{}.png'.format( self.save_code, - self.getDateTime(self.data.min_time).strftime( - '%Y%m%d' + self.getDateTime(self.data.max_time).strftime( + '%Y%m%d_%H%M%S' ), ) ) + log.log('Saving figure: {}'.format(figname), self.name) + if not os.path.isdir(os.path.dirname(figname)): + os.makedirs(os.path.dirname(figname)) fig.savefig(figname) + figname = os.path.join( + self.save, + '{}_{}.png'.format( + self.save_code, + self.getDateTime(self.data.min_time).strftime( + '%Y%m%d' + ), + ) + ) + fig.savefig(figname) + def send_to_server(self): ''' ''' diff --git a/schainpy/model/graphics/jroplot_parameters.py b/schainpy/model/graphics/jroplot_parameters.py index 3f022a0..a089b81 100644 --- a/schainpy/model/graphics/jroplot_parameters.py +++ b/schainpy/model/graphics/jroplot_parameters.py @@ -163,7 +163,7 @@ class GenericRTIPlot(Plot): def setup(self): self.xaxis = 'time' self.ncols = 1 - self.nrows = self.data.shape(self.attr_data)[0] + self.nrows = self.data.shape('param')[0] self.nplots = self.nrows self.plots_adjust.update({'hspace':0.8, 'left': 0.1, 'bottom': 0.08, 'right':0.95, 'top': 0.95}) @@ -178,7 +178,7 @@ class GenericRTIPlot(Plot): def update(self, dataOut): data = { - self.attr_data : getattr(dataOut, self.attr_data) + 'param' : numpy.concatenate([getattr(dataOut, attr) for attr in self.attr_data], axis=0) } meta = {} @@ -189,7 +189,7 @@ class GenericRTIPlot(Plot): # self.data.normalize_heights() self.x = self.data.times self.y = self.data.yrange - self.z = self.data[self.attr_data] + self.z = self.data['param'] self.z = numpy.ma.masked_invalid(self.z) diff --git a/schainpy/model/graphics/jroplot_spectra.py b/schainpy/model/graphics/jroplot_spectra.py index 28b72ec..8a5d813 100644 --- a/schainpy/model/graphics/jroplot_spectra.py +++ b/schainpy/model/graphics/jroplot_spectra.py @@ -75,7 +75,7 @@ class SpectraPlot(Plot): for n, ax in enumerate(self.axes): noise = data['noise'][n] if self.CODE == 'spc_moments': - mean = data['moments'][n, 2] + mean = data['moments'][n, 1] if ax.firsttime: self.xmax = self.xmax if self.xmax else numpy.nanmax(x) self.xmin = self.xmin if self.xmin else -self.xmax @@ -466,7 +466,7 @@ class SpectraCutPlot(Plot): self.figures[0].legend(ax.plt, labels, loc='center right') else: for i, line in enumerate(ax.plt): - line.set_data(x, z[n, :, i]) + line.set_data(x, z[n, :, index[i]]) self.titles.append('CH {}'.format(n))