schain-jc Commit - r209:8c431837892b

Adicion del metodo saveFigure() para guardar archivos de imagen de la clase Figure(). Se modifica los xaxis se muestran en formato datetime, falta hacer ajustes en los ticks de acuerdo al intervalo [xmin, xmax]

Daniel Valdez -

r209:8c431837892b

parent child

Context file:

r209:8c431837892b

Collapse all files

schainpy/controller.py +2 0

             #    opObj11.addParameter(name='zmin', value='70', format='int')
             #    opObj11.addParameter(name='zmax', value='90', format='int')
                 opObj11.addParameter(name='showprofile', value='0', format='int')
+                opObj11.addParameter(name='save', value='1', format='int')
+                opObj11.addParameter(name='filename', value='/Users/dsuarez/Pictures/SpectraPlot.png', format='str')
                 opObj11 = procUnitConfObj1.addOperation(name='RTIPlot', optype='other')
                 opObj11.addParameter(name='idfigure', value='10', format='int')

schainpy/model/graphics/figure.py +6 0

                     axesObj = Axes(self.fig, *args)
                     self.axesObjList.append(axesObj)
+                def saveFigure(self, *args):
+                    self.__driver.saveFigure(self.fig, *args)
                 def draw(self):
                     self.__driver.draw(self.fig)
                     self.__driver.setAxesText(self.ax, text)
+                def setXAxisAsTime(self):
+                    pass
                 def pline(self, x, y,
                            xmin=None, xmax=None,
                            ymin=None, ymax=None,

schainpy/model/graphics/mpldriver.py +24 -2

             import numpy
+            import datetime
             import matplotlib
             matplotlib.use("TKAgg")
             import matplotlib.pyplot
+            import matplotlib.dates
             #import scitools.numpyutils
             from mpl_toolkits.axes_grid1 import make_axes_locatable
+            from matplotlib.dates import DayLocator, HourLocator, MinuteLocator, SecondLocator, DateFormatter
             def init(idfigure, wintitle, width, height, facecolor="w"):
                 matplotlib.pyplot.ioff()
                 return
+            def saveFigure(fig, filename):
+                fig.savefig(filename)
             def setWinTitle(fig, title):
                 fig.canvas.manager.set_window_title(title)
                 iplot.set_data(x, y)
-            def createPcolor(ax, x, y, z, xmin, xmax, ymin, ymax, zmin, zmax, xlabel='', ylabel='', title='', ticksize = 9, cblabel=''):
+            def createPcolor(ax, x, y, z, xmin, xmax, ymin, ymax, zmin, zmax, xlabel='', ylabel='', title='', ticksize = 9, cblabel='',XAxisAsTime=False):
                 divider = make_axes_locatable(ax)
                 ax_cb = divider.new_horizontal(size="4%", pad=0.05)
                 fig.add_axes(ax_cb)
                 ax.set_xlim([xmin,xmax])
+                if XAxisAsTime:
+                    seconds = numpy.array([xmin, xmax])
+                    datesList = map(datetime.datetime.fromtimestamp, seconds)
+                    ax.set_xlim([datesList[0],datesList[-1]])
+                    ax.xaxis.set_major_locator(MinuteLocator(numpy.arange(0,61,10)))
+                    ax.xaxis.set_minor_locator(SecondLocator(numpy.arange(0,61,60)))
+                    ax.xaxis.set_major_formatter(DateFormatter("%H:%M:%S"))
+                    xdateList = map(datetime.datetime.fromtimestamp, x)
+                    xdate = matplotlib.dates.date2num(xdateList)
+                    x = xdate
                 ax.set_ylim([ymin,ymax])
                 printLabels(ax, xlabel, ylabel, title)
                 imesh.set_array(z.ravel())
             def addpcolor(ax, x, y, z, zmin, zmax):
+                xdateList = map(datetime.datetime.fromtimestamp, x)
+                xdate = matplotlib.dates.date2num(xdateList)
-                imesh = ax.pcolormesh(x,y,z.T,vmin=zmin,vmax=zmax)
+                imesh = ax.pcolormesh(xdate,y,z.T,vmin=zmin,vmax=zmax)
             def draw(fig):

schainpy/model/jroplot.py +12 -5

                             counter += 1
                 def run(self, dataOut, idfigure, wintitle="", channelList=None, showprofile='True',
-                        xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
+                        xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, save=False, filename=None):
                     """
                         z = avg[i].reshape((1,-1))
                         axes.pcolor(x, y, z,
                                     xmin=xmin, xmax=xmax, ymin=ymin, ymax=ymax, zmin=zmin, zmax=zmax,
-                                    xlabel=xlabel, ylabel=ylabel, title=title, rti=True,
+                                    xlabel=xlabel, ylabel=ylabel, title=title, rti=True, XAxisAsTime=True,
                                     ticksize=9, cblabel='')
                         if self.__showprofile:
                     self.draw()
+                    if save:
+                        self.saveFigure(filename)
             class SpectraPlot(Figure):
                 __isConfig = None
                             counter += 1
                 def run(self, dataOut, idfigure, wintitle="", channelList=None, showprofile='True',
-                        xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None):
+                        xmin=None, xmax=None, ymin=None, ymax=None, zmin=None, zmax=None, save=False, filename=None):
                     """
                                     grid='x')
                     self.draw()
+                    if save:
+                        self.saveFigure(filename)
             class Scope(Figure):
                     self.nplots = nplots
                 def run(self, dataOut, idfigure, wintitle="", channelList=None,
-                        xmin=None, xmax=None, ymin=None, ymax=None):
+                        xmin=None, xmax=None, ymin=None, ymax=None, save=False, filename=None):
                     """
                     self.draw()
+                    if save:
+                        self.saveFigure(filename)
   No newline at end of file

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages