diff --git a/schainpy2/Data/JROData.py b/schainpy2/Data/JROData.py index 1cc63de..9e84a66 100644 --- a/schainpy2/Data/JROData.py +++ b/schainpy2/Data/JROData.py @@ -40,11 +40,13 @@ class JROData: channelIndexList = None - flagNoData = False + flagNoData = True flagTimeBlock = False - dataUtcTime = None + utctime = None + + blocksize = None nCode = None @@ -115,9 +117,11 @@ class Voltage(JROData): self.flagTimeBlock = False - self.dataUtcTime = None + self.utctime = None self.nCohInt = None + + self.blocksize = None class Spectra(JROData): @@ -169,10 +173,12 @@ class Spectra(JROData): self.flagTimeBlock = False - self.dataUtcTime = None + self.utctime = None self.nIncohInt = None + self.blocksize = None + class SpectraHeis(JROData): @@ -217,3 +223,7 @@ class SpectraHeis(JROData): self.flagTimeBlock = False self.nPairs = 0 + + self.utctime = None + + self.blocksize = None diff --git a/schainpy2/Graphics/schainPlot.py b/schainpy2/Graphics/schainPlot.py index fc43b98..7bdc643 100644 --- a/schainpy2/Graphics/schainPlot.py +++ b/schainpy2/Graphics/schainPlot.py @@ -5,57 +5,80 @@ import os from schainPlotLib import Driver class Figure: + __isDriverOpen = False __isFigureOpen = False __isConfig = False + drvObj = None + driver = None idfigure = None nframes = None wintitle = None colormap = None - driver = None overplot = None + colorbar = None + + frameObjList = [] + + xw = None + yw = None + xmin = None xmax = None ymin = None ymax = None + minvalue = None maxvalue = None deltax = None deltay = None - frameObjList = [] + + figuretitle = "" xrangestep = None def __init__(self,idfigure, nframes, wintitle, xw=600, yw=800, overplot=0, driver='plplot', colormap=None, colorbar= True, *args): + self.__isDriverOpen = False + self.__isFigureOpen = False + self.__isConfig = False + self.drvObj = Driver(driver, idfigure, xw, yw, wintitle, overplot, colormap, colorbar) self.driver = driver self.idfigure = idfigure - self.xw = xw - self.yw = yw self.nframes = nframes self.wintitle = wintitle self.colormap = colormap self.overplot = overplot self.colorbar = colorbar + + self.xw = xw + self.yw = yw + + self.frameObjList = [] + # self.showGraph1 = args[0] # self.showGraph2 = args[1] self.drvObj.driver.setFigure() self.drvObj.driver.setColormap(colormap) - - def __openDriver(self): + self.drvObj.driver.openDriver() def __initFigure(self): + nrows, ncolumns = self.getSubplots() self.drvObj.driver.openFigure() self.drvObj.driver.setFigTitle(self.figuretitle) self.drvObj.driver.setSubPlots(nrows, ncolumns) + def selectFigure(self): + + self.drvObj.driver.selectFigure() + def __isOutOfXRange(self,x): try: if ((x>=self.xmin) and (x