diff --git a/schainpy/model/graphics/mpldriver.py b/schainpy/model/graphics/mpldriver.py index 4a57143..0880362 100644 --- a/schainpy/model/graphics/mpldriver.py +++ b/schainpy/model/graphics/mpldriver.py @@ -96,19 +96,19 @@ def createPline(ax, x, y, xmin, xmax, ymin, ymax, xlabel='', ylabel='', title='' printLabels(ax, xlabel, ylabel, title) ###################################################### - if (xmax-xmin)<=1: - xtickspos = numpy.linspace(xmin,xmax,nxticks) - 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) - ax.set_xticks(xtickspos) - - for tick in ax.get_xticklabels(): - tick.set_visible(xtick_visible) - - for tick in ax.xaxis.get_major_ticks(): - tick.label.set_fontsize(ticksize) +# if (xmax-xmin)<=1: +# xtickspos = numpy.linspace(xmin,xmax,nxticks) +# 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) +# ax.set_xticks(xtickspos) +# +# for tick in ax.get_xticklabels(): +# tick.set_visible(xtick_visible) +# +# for tick in ax.xaxis.get_major_ticks(): +# tick.label.set_fontsize(ticksize) ###################################################### for tick in ax.get_yticklabels(): @@ -300,7 +300,7 @@ def pmultiline(iplot, x, y, xlabel='', ylabel='', title=''): def createPmultilineYAxis(ax, x, y, xmin, xmax, ymin, ymax, xlabel='', ylabel='', title='', legendlabels=None, ticksize=9, xtick_visible=True, ytick_visible=True, - nxticks=4, nyticks=10, marker='^', markersize=8, linestyle="solid", + nxticks=4, nyticks=10, marker='+', markersize=8, linestyle="solid", grid=None, XAxisAsTime=False): """ @@ -311,7 +311,8 @@ def createPmultilineYAxis(ax, x, y, xmin, xmax, ymin, ymax, xlabel='', ylabel='' matplotlib.pyplot.ioff() - lines = ax.plot(x, y.T, marker=marker,markersize=markersize,linestyle=linestyle) +# lines = ax.plot(x, y.T, marker=marker,markersize=markersize,linestyle=linestyle) + lines = ax.plot(x, y.T, 'o', markersize=5) leg = ax.legend(lines, legendlabels, loc='upper left', bbox_to_anchor=(1.01, 1.00), numpoints=1, handlelength=1.5, \ handletextpad=0.5, borderpad=0.5, labelspacing=0.5, borderaxespad=0.) diff --git a/schainpy/model/jroplot.py b/schainpy/model/jroplot.py index d37d418..bdae6cf 100644 --- a/schainpy/model/jroplot.py +++ b/schainpy/model/jroplot.py @@ -1022,6 +1022,7 @@ class SpectraHeisScope(Figure): self.HEIGHT = 250 self.WIDTHPROF = 120 self.HEIGHTPROF = 0 + self.counterftp = 0 def getSubplots(self): @@ -1092,7 +1093,7 @@ class SpectraHeisScope(Figure): def run(self, dataOut, idfigure, wintitle="", channelList=None, xmin=None, xmax=None, ymin=None, ymax=None, save=False, - figpath='./', figfile=None): + figpath='./', figfile=None, ftp=False, ftpratio=1): """ @@ -1164,6 +1165,12 @@ class SpectraHeisScope(Figure): figfile = self.getFilename(name = date) self.saveFigure(figpath, figfile) + + self.counterftp += 1 + if (ftp and (self.counterftp==ftpratio)): + figfilename = os.path.join(figpath,figfile) + self.sendByFTP(figfilename) + self.counterftp = 0 class RTIfromSpectraHeis(Figure): @@ -1183,6 +1190,7 @@ class RTIfromSpectraHeis(Figure): self.HEIGHT = 200 self.WIDTHPROF = 120 self.HEIGHTPROF = 0 + self.counterftp = 0 self.xdata = None self.ydata = None @@ -1215,7 +1223,7 @@ class RTIfromSpectraHeis(Figure): def run(self, dataOut, idfigure, wintitle="", channelList=None, showprofile='True', xmin=None, xmax=None, ymin=None, ymax=None, timerange=None, - save=False, figpath='./', figfile=None): + save=False, figpath='./', figfile=None, ftp=False, ftpratio=1): if channelList == None: channelIndexList = dataOut.channelIndexList @@ -1271,7 +1279,8 @@ class RTIfromSpectraHeis(Figure): self.setWinTitle(title) - title = "RTI %s" %(thisDatetime.strftime("%d-%b-%Y")) +# title = "RTI %s" %(thisDatetime.strftime("%d-%b-%Y")) + title = "RTI-Noise - %s" %(thisDatetime.strftime("%d-%b-%Y %H:%M:%S")) legendlabels = ["channel %d"%idchannel for idchannel in channelList] axes = self.axesList[0] @@ -1286,7 +1295,7 @@ class RTIfromSpectraHeis(Figure): axes.pmultilineyaxis(x=self.xdata, y=self.ydata, xmin=tmin, xmax=tmax, ymin=ymin, ymax=ymax, - xlabel=xlabel, ylabel=ylabel, title=title, legendlabels=legendlabels, marker='x', markersize=8, linestyle="solid", + xlabel=xlabel, ylabel=ylabel, title=title, legendlabels=legendlabels, marker='.', markersize=8, linestyle="solid", XAxisAsTime=True ) @@ -1299,6 +1308,12 @@ class RTIfromSpectraHeis(Figure): self.saveFigure(figpath, figfile) + self.counterftp += 1 + if (ftp and (self.counterftp==ftpratio)): + figfilename = os.path.join(figpath,figfile) + self.sendByFTP(figfilename) + self.counterftp = 0 + if x[1] + (x[1]-x[0]) >= self.axesList[0].xmax: self.__isConfig = False del self.xdata diff --git a/schainpy/test/SunExperiment.py b/schainpy/test/SunExperiment.py index 944c92c..311ebc9 100644 --- a/schainpy/test/SunExperiment.py +++ b/schainpy/test/SunExperiment.py @@ -5,20 +5,22 @@ sys.path.append(path) from controller import * -desc = "EWDrifts Experiment Test" -filename = "ewdrifts.xml" +desc = "Sun Experiment Test" +filename = "sunexp.xml" controllerObj = Project() controllerObj.setup(id = '191', name='test01', description=desc) - +#/Users/dsuarez/Documents/RadarData/SunExperiment +#/Volumes/data_e/PaseDelSol/Raw/100KHZ readUnitConfObj = controllerObj.addReadUnit(datatype='Voltage', - path='/Volumes/data_e/PaseDelSol/Raw/100KHZ', + path='/Users/dsuarez/Documents/RadarData/SunExperiment', startDate='2013/02/06', endDate='2013/12/31', - startTime='17:30:00', + startTime='00:30:00', endTime='17:40:59', online=0, + delay=3, walk=1) procUnitConfObj0 = controllerObj.addProcUnit(datatype='Voltage', inputId=readUnitConfObj.getId()) @@ -31,27 +33,31 @@ opObj11.addParameter(name='timeInterval', value='5', format='float') opObj11 = procUnitConfObj1.addOperation(name='SpectraHeisScope', optype='other') opObj11.addParameter(name='idfigure', value='10', format='int') opObj11.addParameter(name='wintitle', value='SpectraHeisPlot', format='str') -opObj11.addParameter(name='ymin', value='125', format='int') -opObj11.addParameter(name='ymax', value='140', format='int') +#opObj11.addParameter(name='ymin', value='125', format='int') +#opObj11.addParameter(name='ymax', value='140', format='int') #opObj11.addParameter(name='channelList', value='0,1,2', format='intlist') #opObj11.addParameter(name='showprofile', value='1', format='int') opObj11.addParameter(name='save', value='1', format='bool') +opObj11.addParameter(name='figfile', value='spc-noise.png', format='str') opObj11.addParameter(name='figpath', value='/Users/dsuarez/Pictures/sun_pics', format='str') - - -#opObj11 = procUnitConfObj1.addOperation(name='RTIfromSpectraHeis', optype='other') -#opObj11.addParameter(name='idfigure', value='6', format='int') -#opObj11.addParameter(name='wintitle', value='RTIPLot', format='str') -##opObj11.addParameter(name='zmin', value='10', format='int') -##opObj11.addParameter(name='zmax', value='40', format='int') -#opObj11.addParameter(name='ymin', value='60', format='int') -#opObj11.addParameter(name='ymax', value='130', format='int') -##opObj11.addParameter(name='channelList', value='0,1,2,3', format='intlist') +opObj11.addParameter(name='ftp', value='1', format='int') +opObj11.addParameter(name='ftpratio', value='10', format='int') + +opObj11 = procUnitConfObj1.addOperation(name='RTIfromSpectraHeis', optype='other') +opObj11.addParameter(name='idfigure', value='6', format='int') +opObj11.addParameter(name='wintitle', value='RTIPLot', format='str') +#opObj11.addParameter(name='zmin', value='10', format='int') +#opObj11.addParameter(name='zmax', value='40', format='int') +opObj11.addParameter(name='ymin', value='60', format='int') +opObj11.addParameter(name='ymax', value='85', format='int') +#opObj11.addParameter(name='channelList', value='0,1,2,3', format='intlist') #opObj11.addParameter(name='timerange', value='600', format='int') -##opObj11.addParameter(name='showprofile', value='0', format='int') -#opObj11.addParameter(name='save', value='1', format='bool') -#opObj11.addParameter(name='figpath', value='/Users/dsuarez/Pictures/sun_pics', format='str') - +#opObj11.addParameter(name='showprofile', value='0', format='int') +opObj11.addParameter(name='save', value='1', format='bool') +opObj11.addParameter(name='figfile', value='rti-noise.png', format='str') +opObj11.addParameter(name='figpath', value='/Users/dsuarez/Pictures/sun_pics', format='str') +opObj11.addParameter(name='ftp', value='1', format='int') +opObj11.addParameter(name='ftpratio', value='10', format='int') print "Escribiendo el archivo XML"