gfe userPython updates for 17.1.1-3 release

cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/EditTopo.py

@@ -1,22 +1,3 @@
-##
-# This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-# 
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
-# This software product contains export-restricted data whose
-# export/transfer/disclosure is restricted by U.S. law. Dissemination
-# to non-U.S. persons whether in the United States or abroad requires
-# an export license or other authorization.
-# 
-# Contractor Name:        Raytheon Company
-# Contractor Address:     6825 Pine Street, Suite 340
-#                         Mail Stop B8
-#                         Omaha, NE 68106
-#                         402.291.0100
-# 
-# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
-# further licensing information.
-##
 # -*-python-*-
 # ----------------------------------------------------------------------------
 # This software is in the public domain, furnished "as is", without technical

cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/FloodingRainThreat.py

@@ -58,7 +58,9 @@ Lakes_graphicColor = 'blue'
 
 # MAP BACKGROUNDS
 #MapBackgrounds_default = ['Counties','Marine_Zones_XXX','Interstates']
-MapBackgrounds_default = ['Zones_XXX','Marine_Zones_XXX','Interstates','States','Lakes']
+#MapBackgrounds_default = ['Zones_XXX','Marine_Zones_XXX','Interstates','States','Lakes']
+MapBackgrounds_default = ['statesCounties','CWA_All', 'Lakes', 'MarineZones']
+
 XXX_mask = "XXX"
 
 DefaultSamples = ['XXXFloodingRainThreat']

cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/NewTerrain.py

@@ -1,22 +1,3 @@
-##
-# This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-# 
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
-# This software product contains export-restricted data whose
-# export/transfer/disclosure is restricted by U.S. law. Dissemination
-# to non-U.S. persons whether in the United States or abroad requires
-# an export license or other authorization.
-# 
-# Contractor Name:        Raytheon Company
-# Contractor Address:     6825 Pine Street, Suite 340
-#                         Mail Stop B8
-#                         Omaha, NE 68106
-#                         402.291.0100
-# 
-# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
-# further licensing information.
-##
 # -*-python-*-
 # ----------------------------------------------------------------------------
 # This software is in the public domain, furnished "as is", without technical

cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/TornadoThreat.py

@@ -52,7 +52,8 @@ Lakes_graphicColor = 'blue'
 
 # MAP BACKGROUNDS
 #MapBackgrounds_default = ['Counties','Marine_Zones_XXX','Interstates']
-MapBackgrounds_default = ['Zones_XXX','Marine_Zones_XXX','Interstates','States','Lakes']
+MapBackgrounds_default = ['statesCounties','CWA_All', 'Lakes', 'MarineZones']
+
 XXX_mask = "XXX"
 
 DefaultSamples = ['XXXTornadoThreat']

cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/WindThreat.py

@@ -58,7 +58,8 @@ Lakes_graphicColor = 'blue'
 
 # MAP BACKGROUNDS
 #MapBackgrounds_default = ['Counties','Marine_Zones_XXX','Interstates']
-MapBackgrounds_default = ['Zones_XXX','Marine_Zones_XXX','Interstates','States','Lakes']
+MapBackgrounds_default = ['statesCounties','CWA_All', 'Lakes', 'MarineZones']
+
 XXX_mask = "XXX"
 
 DefaultSamples = ['XXXWindThreat']

cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/gfeConfig.py

@@ -1,22 +1,3 @@
-##
-# This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-# 
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
-# This software product contains export-restricted data whose
-# export/transfer/disclosure is restricted by U.S. law. Dissemination
-# to non-U.S. persons whether in the United States or abroad requires
-# an export license or other authorization.
-# 
-# Contractor Name:        Raytheon Company
-# Contractor Address:     6825 Pine Street, Suite 340
-#                         Mail Stop B8
-#                         Omaha, NE 68106
-#                         402.291.0100
-# 
-# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
-# further licensing information.
-##
 # -*-python-*-
 # NOTE: THIS FILE SHOULD NOT BE MODIFIED BY THE USER.  INSTEAD, REFER TO
 # THE BASE,SITE,USER and GFE CONFIGURATION DOCUMENTATION ON HOW TO
@@ -222,7 +203,7 @@ PublishTimes = ['Today', 'Tonight', 'Tomorrow', 'Tomorrow Night', 'Day 3',
 # Defines the initial loaded set of map backgrounds.  The name of each
 # background should match the name (without ".xml") of a map file in the 
 # CAVE/Bundles/maps directory under the Localization perspective.
-MapBackgrounds_default = ['statesCounties','CWA']
+MapBackgrounds_default = ['statesCounties','CWA_All']
 
 # Specific Colors for a map background
 # The user may specify a specific color to be used for a map background,

cave/com.raytheon.viz.gfe/localization/gfe/userPython/gfeConfig/imageTest1.py

@@ -1,22 +1,3 @@
-##
-# This software was developed and / or modified by Raytheon Company,
-# pursuant to Contract DG133W-05-CQ-1067 with the US Government.
-# 
-# U.S. EXPORT CONTROLLED TECHNICAL DATA
-# This software product contains export-restricted data whose
-# export/transfer/disclosure is restricted by U.S. law. Dissemination
-# to non-U.S. persons whether in the United States or abroad requires
-# an export license or other authorization.
-# 
-# Contractor Name:        Raytheon Company
-# Contractor Address:     6825 Pine Street, Suite 340
-#                         Mail Stop B8
-#                         Omaha, NE 68106
-#                         402.291.0100
-# 
-# See the AWIPS II Master Rights File ("Master Rights File.pdf") for
-# further licensing information.
-##
 # Test file for ifpIMAGE
 
 from gfeConfig import *

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

@@ -139,7 +139,7 @@ class SmartScript(BaseTool.BaseTool):
         #self.__pythonGrids = []
         self.__accessTime = 0
         self.__gridLoc = self.__parmMgr.compositeGridLocation()
-        self.__gridShape = (self.__gridLoc.getNy().intValue(), self.__gridLoc.getNx().intValue())
+        self.__gridShape = (self.__gridLoc.getNy(), self.__gridLoc.getNx())
         self.__topoGrid = None
         self.__toolType = "numeric"
         self._empty = self.empty()