From 436530070e31d4c48b8bc7168203d71599381e7e 2013-07-11 14:25:58 From: Daniel Valdez Date: 2013-07-11 14:25:58 Subject: [PATCH] Cambios realizados para adaptar los valores de Cohencia en un rango elegido por el usuario, por defecto de 0-1. --- diff --git a/schainpy/model/graphics/mpldriver.py b/schainpy/model/graphics/mpldriver.py index 9803b67..ff42359 100644 --- a/schainpy/model/graphics/mpldriver.py +++ b/schainpy/model/graphics/mpldriver.py @@ -7,7 +7,7 @@ if 'linux' in sys.platform: matplotlib.use("TKAgg") if 'darwin' in sys.platform: - matplotlib.use("TKAgg") + matplotlib.use("GTKAgg") import matplotlib.pyplot @@ -103,7 +103,8 @@ def createPline(ax, x, y, xmin, xmax, ymin, ymax, xlabel='', ylabel='', title='' xtickspos = numpy.array([float("%.1f"%i) for i in xtickspos]) ax.set_xticks(xtickspos) else: - xtickspos = numpy.arange(nxticks)*int((xmax-xmin)/(nxticks)) + int(xmin) +# xtickspos = numpy.arange(nxticks)*int((xmax-xmin)/(nxticks)) + int(xmin) + xtickspos = numpy.arange(nxticks)*float(xmax-xmin)/float(nxticks) + int(xmin) ax.set_xticks(xtickspos) for tick in ax.get_xticklabels(): diff --git a/schainpy/model/jroplot.py b/schainpy/model/jroplot.py index 795a6ff..2e4b6ed 100644 --- a/schainpy/model/jroplot.py +++ b/schainpy/model/jroplot.py @@ -821,6 +821,8 @@ class CoherenceMap(Figure): tmin, tmax = self.getTimeLim(x, xmin, xmax) if ymin == None: ymin = numpy.nanmin(y) if ymax == None: ymax = numpy.nanmax(y) + if zmin == None: zmin = 0. + if zmax == None: zmax = 1. self.name = thisDatetime.strftime("%Y%m%d_%H%M%S") @@ -844,7 +846,7 @@ class CoherenceMap(Figure): title = "Coherence %d%d: %s" %(pair[0], pair[1], thisDatetime.strftime("%d-%b-%Y %H:%M:%S")) axes = self.axesList[i*self.__nsubplots*2] axes.pcolorbuffer(x, y, z, - xmin=tmin, xmax=tmax, ymin=ymin, ymax=ymax, zmin=0, zmax=1, + xmin=tmin, xmax=tmax, ymin=ymin, ymax=ymax, zmin=zmin, zmax=zmax, xlabel=xlabel, ylabel=ylabel, title=title, rti=True, XAxisAsTime=True, ticksize=9, cblabel='', colormap=coherence_cmap, cbsize="1%") @@ -852,7 +854,7 @@ class CoherenceMap(Figure): counter += 1 axes = self.axesList[i*self.__nsubplots*2 + counter] axes.pline(coherence, y, - xmin=0, xmax=1, ymin=ymin, ymax=ymax, + xmin=zmin, xmax=zmax, ymin=ymin, ymax=ymax, xlabel='', ylabel='', title='', ticksize=7, ytick_visible=False, nxticks=5, grid='x')