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

Merge "Issue #2476: Fix indent error in SmartScript._getGridsResult()." into development

Browse source 
Former-commit-id: 0bfd9a1c98 [formerly a5bc64473a] [formerly 42229b8eee [formerly 60bcc1509f4f748bcfecd3f6f0a7d36b6d4faf2b]]
Former-commit-id: 42229b8eee
Former-commit-id: 6442e2e933
This commit is contained in:
Ron Anderson 2013-11-07 14:38:39 -06:00 • committed by Gerrit Code Review
commit 9d56a36dbe
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,8 +50,10 @@
# so mask can be used with advanced indexing # so mask can be used with advanced indexing
# (e.g. grid[mask] = value) # (e.g. grid[mask] = value)
# Oct 07, 2013 2424 randerso remove use of pytz # Oct 07, 2013 2424 randerso remove use of pytz
# Oct 29, 2013 2476 njensen Improved getting wx/discrete keys in _getGridResults # Oct 29, 2013 2476 njensen Improved getting wx/discrete keys in _getGridResults
# Oct 31, 2013 2508 randerso Change to use DiscreteGridSlice.getKeys() # Oct 31, 2013 2508 randerso Change to use DiscreteGridSlice.getKeys()
# Nov 07, 2013 2476 dgilling Fix _getGridsResult() for retrieving
# Wx/Discrete in First mode.
# #
######################################################################## ########################################################################
import types, string, time, sys import types, string, time, sys
@ -485,7 +487,7 @@ class SmartScript(BaseTool.BaseTool):
if result[0].dtype != numpy.int8: if result[0].dtype != numpy.int8:
# scalar # scalar
result = result[0] result = result[0]
else: else:
# discrete or weather # discrete or weather
keys = JUtil.javaObjToPyVal(slice.getKeyList()) keys = JUtil.javaObjToPyVal(slice.getKeyList())
result.append(keys) result.append(keys)