From 8844aec3c35c7b611c47dd7c74d466f16719d497 2015-12-04 20:46:15 From: Miguel Valdez Date: 2015-12-04 20:46:15 Subject: [PATCH] Channel title was fixed in plots --- diff --git a/schainpy/model/graphics/jroplot_correlation.py b/schainpy/model/graphics/jroplot_correlation.py index da3d8e4..9f12d54 100644 --- a/schainpy/model/graphics/jroplot_correlation.py +++ b/schainpy/model/graphics/jroplot_correlation.py @@ -160,7 +160,7 @@ class CorrelationPlot(Figure): for i in range(self.nplots): str_datetime = '%s %s'%(thisDatetime.strftime("%Y/%m/%d"),thisDatetime.strftime("%H:%M:%S")) - title = "Channel %d and %d: : %s" %(dataOut.pairsList[i][0]+1,dataOut.pairsList[i][1]+1 , str_datetime) + title = "Channel %d and %d: : %s" %(dataOut.pairsList[i][0],dataOut.pairsList[i][1] , str_datetime) axes = self.axesList[i*self.__nsubplots] axes.pcolor(x, y, zdB[i,:,:], xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax, zmin=zmin, zmax=zmax, diff --git a/schainpy/model/graphics/jroplot_parameters.py b/schainpy/model/graphics/jroplot_parameters.py index 614f685..40d81e4 100644 --- a/schainpy/model/graphics/jroplot_parameters.py +++ b/schainpy/model/graphics/jroplot_parameters.py @@ -159,7 +159,7 @@ class MomentsPlot(Figure): for i in range(self.nplots): str_datetime = '%s %s'%(thisDatetime.strftime("%Y/%m/%d"),thisDatetime.strftime("%H:%M:%S")) - title = "Channel %d: %4.2fdB: %s" %(dataOut.channelList[i]+1, noisedB[i], str_datetime) + title = "Channel %d: %4.2fdB: %s" %(dataOut.channelList[i], noisedB[i], str_datetime) axes = self.axesList[i*self.__nsubplots] axes.pcolor(x, y, zdB[i,:,:], xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax, zmin=zmin, zmax=zmax, @@ -759,7 +759,7 @@ class ParametersPlot(Figure): ticksize=9, cblabel=zlabel, cbsize="1%") if DOP: - title = "%s Channel %d: %s" %(parameterName, channelIndexList[i]+1, thisDatetime.strftime("%Y/%m/%d %H:%M:%S")) + title = "%s Channel %d: %s" %(parameterName, channelIndexList[i], thisDatetime.strftime("%Y/%m/%d %H:%M:%S")) if ((dataOut.azimuth!=None) and (dataOut.zenith!=None)): title = title + '_' + 'azimuth,zenith=%2.2f,%2.2f'%(dataOut.azimuth, dataOut.zenith) @@ -771,7 +771,7 @@ class ParametersPlot(Figure): ticksize=9, cblabel=zlabel, cbsize="1%") if SNR: - title = "Channel %d Signal Noise Ratio (SNR): %s" %(channelIndexList[i]+1, thisDatetime.strftime("%Y/%m/%d %H:%M:%S")) + title = "Channel %d Signal Noise Ratio (SNR): %s" %(channelIndexList[i], thisDatetime.strftime("%Y/%m/%d %H:%M:%S")) axes = self.axesList[(j)*self.__nsubplots] if not onlySNR: axes = self.axesList[(j + 1)*self.__nsubplots] @@ -951,7 +951,7 @@ class SpectralFittingPlot(Figure): self.setWinTitle(title) for i in range(self.nplots): # title = "Channel %d: %4.2fdB" %(dataOut.channelList[i]+1, noisedB[i]) - title = "Height %4.1f km\nChannel %d:" %(cutHeight, listChannels[i]+1) + title = "Height %4.1f km\nChannel %d:" %(cutHeight, listChannels[i]) axes = self.axesList[i*self.__nsubplots] if fit == False: axes.pline(x, zdB[i,:], diff --git a/schainpy/model/graphics/jroplot_spectra.py b/schainpy/model/graphics/jroplot_spectra.py index 611ce2a..5458094 100644 --- a/schainpy/model/graphics/jroplot_spectra.py +++ b/schainpy/model/graphics/jroplot_spectra.py @@ -168,7 +168,7 @@ class SpectraPlot(Figure): for i in range(self.nplots): str_datetime = '%s %s'%(thisDatetime.strftime("%Y/%m/%d"),thisDatetime.strftime("%H:%M:%S")) - title = "Channel %d: %4.2fdB: %s" %(dataOut.channelList[i]+1, noisedB[i], str_datetime) + title = "Channel %d: %4.2fdB: %s" %(dataOut.channelList[i], noisedB[i], str_datetime) if len(dataOut.beam.codeList) != 0: title = "Ch%d:%4.2fdB,%2.2f,%2.2f:%s" %(dataOut.channelList[i]+1, noisedB[i], dataOut.beam.azimuthList[i], dataOut.beam.zenithList[i], str_datetime) @@ -575,7 +575,7 @@ class RTIPlot(Figure): x[1] = self.xmax for i in range(self.nplots): - title = "Channel %d: %s" %(dataOut.channelList[i]+1, thisDatetime.strftime("%Y/%m/%d %H:%M:%S")) + title = "Channel %d: %s" %(dataOut.channelList[i], thisDatetime.strftime("%Y/%m/%d %H:%M:%S")) if ((dataOut.azimuth!=None) and (dataOut.zenith!=None)): title = title + '_' + 'azimuth,zenith=%2.2f,%2.2f'%(dataOut.azimuth, dataOut.zenith) axes = self.axesList[i*self.__nsubplots] @@ -1088,7 +1088,7 @@ class Noise(Figure): title = "Noise %s" %(thisDatetime.strftime("%Y/%m/%d %H:%M:%S")) - legendlabels = ["channel %d"%(idchannel+1) for idchannel in channelList] + legendlabels = ["channel %d"%(idchannel) for idchannel in channelList] axes = self.axesList[0] self.xdata = numpy.hstack((self.xdata, x[0:1]))