From fd683651e8a8e9ad9d19eca3e8fecdd261373da9 2017-05-23 14:21:49 From: José Chávez Date: 2017-05-23 14:21:49 Subject: [PATCH] paramter.py helper --- diff --git a/schainpy/model/graphics/jroplot_parameters.py b/schainpy/model/graphics/jroplot_parameters.py index 500e2f3..da8e17a 100644 --- a/schainpy/model/graphics/jroplot_parameters.py +++ b/schainpy/model/graphics/jroplot_parameters.py @@ -605,6 +605,40 @@ class ParametersPlot(Figure): nplots = None nchan = None + parameters = { + 'id': global_type_string, + 'wintitle': global_type_string, + 'channelList': global_type_list, + 'paramIndex': global_type_integer, + 'colormap': global_type_colormap, + 'xmin': global_type_float, + 'xmax': global_type_float, + 'ymin': global_type_float, + 'ymax': global_type_float, + 'zmin': global_type_float, + 'zmax': global_type_float, + 'timerange': global_type_float, + 'showSNR': global_type_boolean, + 'SNRthresh': global_type_float, + 'SNRmin': global_type_float, + 'SNRmax': global_type_float, + 'save': global_type_boolean, + 'figpath': global_type_string, + 'lastone': global_type_integer, + 'figfile': global_type_string, + 'ftp': global_type_boolean, + 'wr_period': global_type_integer, + 'show': global_type_boolean, + 'server': global_type_string, + 'folder': global_type_string, + 'username': global_type_string, + 'password': global_type_string, + 'ftp_wei': global_type_integer, + 'exp_code': global_type_integer, + 'sub_exp_code': global_type_integer, + 'plot_pos': global_type_integer, + } + def __init__(self, **kwargs): Figure.__init__(self, **kwargs) self.timerange = None @@ -812,6 +846,46 @@ class Parameters1Plot(Figure): HEIGHTPROF = None PREFIX = 'prm' + parameters = { + 'id': global_type_string, + 'wintitle': global_type_string, + 'channelList': global_type_list, + 'showprofile': global_type_boolean, + 'xmin': global_type_float, + 'xmax': global_type_float, + 'ymin': global_type_float, + 'ymax': global_type_float, + 'zmin': global_type_float, + 'zmax': global_type_float, + 'timerange': global_type_float, + 'parameterIndex': global_type_float, + 'onlyPositive': global_type_boolean, + 'SNRthresh': global_type_float, + 'SNR': global_type_boolean, + 'SNRmin': global_type_float, + 'SNRmax': global_type_float, + 'onlySNR': global_type_boolean, + 'DOP': global_type_boolean, + 'zlabel': global_type_string, + 'parameterName': global_type_string, + 'parameterObject': global_type_string, + 'save': global_type_boolean, + 'figpath': global_type_string, + 'lastone': global_type_integer, + 'figfile': global_type_string, + 'ftp': global_type_boolean, + 'wr_period': global_type_integer, + 'show': global_type_string, + 'server': global_type_string, + 'folder': global_type_string, + 'username': global_type_string, + 'password': global_type_string, + 'ftp_wei': global_type_integer, + 'exp_code': global_type_integer, + 'sub_exp_code': global_type_integer, + 'plot_pos': global_type_integer, + } + def __init__(self, **kwargs): Figure.__init__(self, **kwargs) self.timerange = 2*60*60 @@ -1481,6 +1555,32 @@ class PhasePlot(Figure): PREFIX = 'mphase' + parameters = { + 'id': global_type_string, + 'wintitle': global_type_string, + 'pairsList': global_type_pairsList, + 'showprofile': global_type_boolean, + 'xmin': global_type_float, + 'xmax': global_type_float, + 'ymin': global_type_float, + 'ymax': global_type_float, + 'timerange': global_type_float, + 'save': global_type_boolean, + 'figpath': global_type_string, + 'figfile': global_type_string, + 'show': global_type_boolean, + 'ftp': global_type_boolean, + 'wr_period': global_type_integer, + 'server': global_type_string, + 'folder': global_type_string, + 'username': global_type_string, + 'password': global_type_string, + 'ftp_wei': global_type_integer, + 'exp_code': global_type_integer, + 'sub_exp_code': global_type_integer, + 'plot_pos': global_type_integer, + } + def __init__(self, **kwargs): Figure.__init__(self, **kwargs) self.timerange = 24*60*60 diff --git a/schainpy/model/io/jroIO_param.py b/schainpy/model/io/jroIO_param.py index b3fed36..1f6ecd2 100644 --- a/schainpy/model/io/jroIO_param.py +++ b/schainpy/model/io/jroIO_param.py @@ -602,33 +602,32 @@ class ParamWriter(Operation): lastTime = None + parameters = { + 'path': global_type_string, + 'blocksPerFile':global_type_integer, + 'metadataList': global_type_list, + 'dataList': global_type_list, + 'mode': global_type_integer, + } + def __init__(self, **kwargs): Operation.__init__(self, **kwargs) self.isConfig = False return - def setup(self, dataOut, **kwargs): - - self.path = kwargs['path'] + def setup(self, dataOut, path=None, blocksPerFile=10, metadataList=None, dataList=None, mode=None, **kwargs): - if kwargs.has_key('blocksPerFile'): - self.blocksPerFile = kwargs['blocksPerFile'] - else: - self.blocksPerFile = 10 - - self.metadataList = kwargs['metadataList'] - self.dataList = kwargs['dataList'] + self.path = path + self.blocksPerFile = blocksPerFile + self.metadataList = metadataList + self.dataList = dataList self.dataOut = dataOut - - if kwargs.has_key('mode'): - mode = kwargs['mode'] - - if type(mode) == int: - mode = numpy.zeros(len(self.dataList)) + mode - else: - mode = numpy.ones(len(self.dataList)) - self.mode = mode + + if self.mode is not None: + self.mode = numpy.zeros(len(self.dataList)) + mode + else: + self.mode = numpy.ones(len(self.dataList)) arrayDim = numpy.zeros((len(self.dataList),5)) @@ -1074,10 +1073,11 @@ class ParamWriter(Operation): self.fp.close() return - def run(self, dataOut, **kwargs): + def run(self, dataOut, path=None, blocksPerFile=10, metadataList=None, dataList=None, mode=None, **kwargs): if not(self.isConfig): - flagdata = self.setup(dataOut, **kwargs) + flagdata = self.setup(dataOut, path=path, blocksPerFile=blocksPerFile, + metadataList=metadataList, dataList=dataList, mode=mode, **kwargs) if not(flagdata): return diff --git a/schainpy/utils/parameters.py b/schainpy/utils/parameters.py index a911bc1..cac49d1 100644 --- a/schainpy/utils/parameters.py +++ b/schainpy/utils/parameters.py @@ -7,6 +7,7 @@ global_type_boolean = 'bolean' global_type_float = 'float' global_type_colormap = 'colormap' global_type_list = 'list' +global_type_integer_or_list = 'integer_or_list' #BeaconPhase parameters = { @@ -400,13 +401,17 @@ parameters = { } -ParamWriter +#ParamWriter parameters = { -: global_type_string, - } + 'path': global_type_string, + 'blocksPerFile':global_type_integer, + 'metadataList': global_type_list, + 'dataList': global_type_list, + 'mode': global_type_integer, +} -Parameters1Plot +#Parameters1Plot parameters = { 'id': global_type_string, 'wintitle': global_type_string, @@ -419,22 +424,22 @@ parameters = { 'zmin': global_type_float, 'zmax': global_type_float, 'timerange': global_type_float, - 'parameterIndex': global_type_string, - 'onlyPositive': global_type_string, - 'SNRthresh': global_type_string, - 'SNR': global_type_string, + 'parameterIndex': global_type_float, + 'onlyPositive': global_type_boolean, + 'SNRthresh': global_type_float, + 'SNR': global_type_boolean, 'SNRmin': global_type_float, 'SNRmax': global_type_float, - 'onlySNR': global_type_string, - 'DOP': global_type_string, + 'onlySNR': global_type_boolean, + 'DOP': global_type_boolean, 'zlabel': global_type_string, 'parameterName': global_type_string, 'parameterObject': global_type_string, 'save': global_type_boolean, 'figpath': global_type_string, - 'lastone': global_type_string, + 'lastone': global_type_integer, 'figfile': global_type_string, - 'ftp': global_type_string, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, 'show': global_type_string, 'server': global_type_string, @@ -448,13 +453,13 @@ parameters = { } -ParametersPlot +#ParametersPlot parameters = { 'id': global_type_string, 'wintitle': global_type_string, 'channelList': global_type_list, - 'paramIndex': global_type_string, - 'colormap': global_type_string, + 'paramIndex': global_type_integer, + 'colormap': global_type_colormap, 'xmin': global_type_float, 'xmax': global_type_float, 'ymin': global_type_float, @@ -462,17 +467,17 @@ parameters = { 'zmin': global_type_float, 'zmax': global_type_float, 'timerange': global_type_float, - 'showSNR': global_type_string, - 'SNRthresh': global_type_string, + 'showSNR': global_type_boolean, + 'SNRthresh': global_type_float, 'SNRmin': global_type_float, 'SNRmax': global_type_float, 'save': global_type_boolean, 'figpath': global_type_string, - 'lastone': global_type_string, + 'lastone': global_type_integer, 'figfile': global_type_string, - 'ftp': global_type_string, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, - 'show': global_type_string, + 'show': global_type_boolean, 'server': global_type_string, 'folder': global_type_string, 'username': global_type_string, @@ -484,11 +489,11 @@ parameters = { } -PhasePlot +#PhasePlot parameters = { 'id': global_type_string, 'wintitle': global_type_string, - 'pairsList': 'pairsLists', + 'pairsList': global_type_pairsList, 'showprofile': global_type_boolean, 'xmin': global_type_float, 'xmax': global_type_float, @@ -498,8 +503,8 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'show': global_type_string, - 'ftp': global_type_string, + 'show': global_type_boolean, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, 'server': global_type_string, 'folder': global_type_string, @@ -590,8 +595,8 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'show': global_type_string, - 'ftp': global_type_string, + 'show': global_type_boolean, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, 'server': global_type_string, 'folder': global_type_string, @@ -652,9 +657,9 @@ parameters = { 'figpath': global_type_string, 'lastone': global_type_string, 'figfile': global_type_string, - 'ftp': global_type_string, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, - 'show': global_type_string, + 'show': global_type_boolean, 'server': global_type_string, 'folder': global_type_string, 'username': global_type_string, @@ -680,9 +685,9 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'ftp': global_type_string, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, - 'show': global_type_string, + 'show': global_type_boolean, 'server': global_type_string, 'folder': global_type_string, 'username': global_type_string, @@ -749,9 +754,9 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'show': global_type_string, + 'show': global_type_boolean, 'wr_period': global_type_integer, - 'ftp': global_type_string, + 'ftp': global_type_boolean, 'server': global_type_string, 'folder': global_type_string, 'username': global_type_string, @@ -784,8 +789,8 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'show': global_type_string, - 'ftp': global_type_string, + 'show': global_type_boolean, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, 'server': global_type_string, 'folder': global_type_string, @@ -811,8 +816,8 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'show': global_type_string, - 'ftp': global_type_string, + 'show': global_type_boolean, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, 'server': global_type_string, 'folder': global_type_string, @@ -834,9 +839,9 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'ftp': global_type_string, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, - 'show': global_type_string, + 'show': global_type_boolean, 'server': global_type_string, 'folder': global_type_string, 'username': global_type_string, @@ -869,8 +874,8 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'show': global_type_string, - 'ftp': global_type_string, + 'show': global_type_boolean, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, 'server': global_type_string, 'folder': global_type_string, @@ -920,7 +925,7 @@ parameters = { 'save': global_type_boolean, 'figpath': global_type_string, 'figfile': global_type_string, - 'show': global_type_string, + 'show': global_type_boolean, } @@ -981,9 +986,9 @@ parameters = { 'figpath': global_type_string, 'lastone': global_type_string, 'figfile': global_type_string, - 'ftp': global_type_string, + 'ftp': global_type_boolean, 'wr_period': global_type_integer, - 'show': global_type_string, + 'show': global_type_boolean, 'server': global_type_string, 'folder': global_type_string, 'username': global_type_string,