xan/awips2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Issue #3097 Fix return type for SmartScript.getGrids()

Browse source 
Change-Id: I13cfa413c5efa32216d08276be57825aff8c0ca0

Former-commit-id: fa1c34691c [formerly fcfd6e4c00] [formerly 374e8224f1] [formerly 613aa1e94a [formerly 374e8224f1 [formerly 1b0bc4789a7166911762d9947552fe54bfe0a137]]]
Former-commit-id: 613aa1e94a
Former-commit-id: 6210770d82431a108e71b3e2243051996167dc6d [formerly 8ba17da4df]
Former-commit-id: 9bcd5d3f4a
This commit is contained in:
Ron Anderson 2014-04-30 17:26:57 +00:00
parent dae2ddb92f
commit 5954a74787
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
cave/com.raytheon.viz.gfe/localization/gfe/userPython/utilities/SmartScript.py
View file

@ -55,6 +55,7 @@
# Nov 07, 2013 2476 dgilling Fix _getGridsResult() for retrieving
# Wx/Discrete in First mode.
# Dec 23, 2013 16893 ryu Added unloadWEs() method (created by njensen)
# Apr 29, 2014 3097 randerso Fixed getGrids() to return non-scalar grids as tuples in all cases
#
########################################################################
import types, string, time, sys
@ -477,7 +478,9 @@ class SmartScript(BaseTool.BaseTool):
else:
# discrete or weather
keys = JUtil.javaObjToPyVal(jxlgrid.getKeyList())
xlgrid.append(keys)
xlgrid = (xlgrid[0], keys)
else:
xlgrid = (xlgrid[0], xlgrid[1])
xlated.append(xlgrid)
retVal = xlated
else:
@ -487,12 +490,14 @@ class SmartScript(BaseTool.BaseTool):
if len(result) == 1:
if result[0].dtype != numpy.int8:
# scalar
result = result[0]
retVal = result[0]
else:
# discrete or weather
keys = JUtil.javaObjToPyVal(slice.getKeyList())
result.append(keys)
retVal = result
retVal = (result[0], keys)
else:
# vector
retVal = (result[0], result[1])
if retVal is None or retVal == []:
if noDataError == 1: