From f8db9d993e9a37ad9f36908f96cfcb6c60e64569 Mon Sep 17 00:00:00 2001 From: David Friedman Date: Mon, 6 Apr 2015 19:38:33 +0000 Subject: [PATCH 1/6] ASM #17215 - CAVE can lockup when volume browser is loaded but no element is selected Change-Id: Ia672d2a4f5e38dcd3b1c43373993779557e86309 Former-commit-id: 87ceca157b69dd6301f2ee0d6d9cee9aa7bb8bc8 --- .../d2d/core/map/D2DMapRenderableDisplay.java | 66 +++++++++++++++++++ .../inventory/SatelliteInventory.java | 14 ++-- 2 files changed, 76 insertions(+), 4 deletions(-) diff --git a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java index c0222742f8..318c5ba824 100644 --- a/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java +++ b/cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/map/D2DMapRenderableDisplay.java @@ -28,6 +28,8 @@ import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; +import com.raytheon.uf.common.status.UFStatus.Priority; +import com.raytheon.uf.viz.core.AbstractTimeMatcher; import com.raytheon.uf.viz.core.IGraphicsTarget; import com.raytheon.uf.viz.core.VizConstants; import com.raytheon.uf.viz.core.drawables.AbstractDescriptor; @@ -39,10 +41,13 @@ import com.raytheon.uf.viz.core.globals.VizGlobalsManager; import com.raytheon.uf.viz.core.map.IMapDescriptor; import com.raytheon.uf.viz.core.map.MapDescriptor; import com.raytheon.uf.viz.core.maps.scales.MapScaleRenderableDisplay; +import com.raytheon.uf.viz.core.maps.scales.MapScalesManager; +import com.raytheon.uf.viz.core.maps.scales.MapScalesManager.ManagedMapScale; import com.raytheon.uf.viz.core.rsc.AbstractVizResource; import com.raytheon.uf.viz.core.rsc.IResourceGroup; import com.raytheon.uf.viz.core.rsc.ResourceList; import com.raytheon.uf.viz.core.rsc.ResourceList.AddListener; +import com.raytheon.uf.viz.core.rsc.ResourceProperties; import com.raytheon.uf.viz.core.rsc.capabilities.DensityCapability; import com.raytheon.uf.viz.core.rsc.capabilities.MagnificationCapability; import com.raytheon.uf.viz.d2d.core.D2DProperties; @@ -61,6 +66,7 @@ import com.raytheon.viz.core.imagery.ImageCombiner; * Feb 9, 2009 njensen Initial creation * Mar 21, 2013 1638 mschenke Made map scales not tied to d2d * Mar 22, 2013 1638 mschenke Moved map scale code to MapScaleRenderableDisplay + * Apr 06, 2015 ASM #17215 D. Friedman Implement clear to avoid removing time match basis * * * @@ -321,4 +327,64 @@ public class D2DMapRenderableDisplay extends MapScaleRenderableDisplay return combinerListener; } + /** Like MapScaleRenderableDisplayer.clear, but avoids removing the time match + * basis until other resources are removed. This reduces time matching churn + * and reduces the chances of lockups. + * @see com.raytheon.uf.viz.core.maps.scales.MapScaleRenderableDisplay#clear() + */ + @Override + public void clear() { + AbstractVizResource timeMatchBasis = null; + AbstractTimeMatcher timeMatcher = descriptor.getTimeMatcher(); + if (timeMatcher instanceof D2DTimeMatcher) { + timeMatchBasis = ((D2DTimeMatcher) timeMatcher).getTimeMatchBasis(); + } + ManagedMapScale scale = MapScalesManager.getInstance().getScaleByName( + getScaleName()); + if (scale != null) { + ResourceList list = descriptor.getResourceList(); + for (ResourcePair rp : list) { + if (rp.getProperties().isSystemResource() == false) { + // Keep system resources + if (rp.getResource() != timeMatchBasis) { + list.remove(rp); + } + } + } + if (timeMatchBasis != null) { + list.removeRsc(timeMatchBasis); + } + loadScale(scale); + } else { + // Map scale could not be found, default to remove all + // non-map/system layers and reset display + ResourceList list = descriptor.getResourceList(); + for (ResourcePair rp : list) { + ResourceProperties props = rp.getProperties(); + if (props.isMapLayer() == false + && props.isSystemResource() == false) { + if (rp.getResource() != timeMatchBasis) { + list.remove(rp); + } + } else { + try { + props.setVisible(true); + rp.getResource().recycle(); + } catch (Throwable e) { + props.setVisible(false); + statusHandler.handle(Priority.PROBLEM, "Clear error: " + + e.getMessage() + ":: The resource [" + + rp.getResource().getSafeName() + + "] has been disabled.", e); + } + } + } + if (timeMatchBasis != null) { + list.removeRsc(timeMatchBasis); + } + + scaleToClientArea(getBounds()); + } + } + } diff --git a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/inventory/SatelliteInventory.java b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/inventory/SatelliteInventory.java index 849c8dad8c..9a59b57993 100644 --- a/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/inventory/SatelliteInventory.java +++ b/cave/com.raytheon.viz.satellite/src/com/raytheon/viz/satellite/inventory/SatelliteInventory.java @@ -69,6 +69,7 @@ import com.raytheon.viz.alerts.observers.ProductAlertObserver; * Apr 09, 2014 2947 bsteffen Initial creation * May 06, 2014 3117 bsteffen Update for new data. * Sep 09, 2014 3356 njensen Remove CommunicationException + * Apr 06, 2014 #17215 D. Friedman Use ReentrantLock * * * @@ -104,11 +105,16 @@ public class SatelliteInventory extends AbstractInventory implements } @Override - public synchronized void initTree(Map derParLibrary) + public void initTree(Map derParLibrary) throws DataCubeException { - level = LevelFactory.getInstance().getLevel("EA", 0.0); - coverages = new SatelliteCoverageCache(); - super.initTree(derParLibrary); + lock.lock(); + try { + level = LevelFactory.getInstance().getLevel("EA", 0.0); + coverages = new SatelliteCoverageCache(); + super.initTree(derParLibrary); + } finally { + lock.unlock(); + } } @Override From b5150e3d431348d55f7b305169b87baa324ffe2d Mon Sep 17 00:00:00 2001 From: Ana Rivera Date: Tue, 7 Apr 2015 18:02:52 +0000 Subject: [PATCH 2/6] VLab Issue #7489 - Fix SFPA42 data_store entry in pqact.conf;fixes #7489 Change-Id: Id7675169dc22035ea9640fdf07351f8667638dd6 Former-commit-id: 2b2b0b0387932888eaa6c8e5b86fc05d7254de3a --- .../Installer.ldm/patch/etc/pqact.conf.template | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template index 2ccaf5a920..5c8b333e94 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -36,6 +36,7 @@ #20130624 1966 rferrel The acars pattern changed to place files in the proper subdirectories. # Name changes to reflect plugin names for modelsounding, goessounding, poessounding. #20140424 3068 dgilling Add pattern for MetOp-B ASCAT T winds. +#20140612 3230 rferrel Add pattern for URMA. #20150202 4066 rferrel Add pattern form Earth Networks Total Lightning: SFPA42 #*************************************************************** # AWIPS 1 PATTERN GRAPHIC ^[PQ].* /redbook/Raw @@ -302,6 +303,11 @@ EXP (.*ecmwf_decrypted.*) NGRID ^(E.[ABCDEFGHI].{1,3}) (KWBJ) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/\7/GRID\8/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H +# URMA +# Pattern provided by Joshua.Watson. +NGRID ^(L.QA98) (KWBR) (..)(..)(..)[^!]*!(grib|grib2)/[^/]*/([^/]*)/#([^/]*)/([0-9]{8})([0-9]{4})(F[0-9]{3})/([^/]*) + FILE -overwrite -log -close -edex /data_store/\6/(\3:yyyy)(\3:mm)\3/\4/URMA/GRID184/\(10)Z_\(11)_\(12)-\1_\2_\3\4\5_(seq).\6.%Y%m%d%H + # AWIPS1: GRID ^[LM].[AB].*KWBS* /Grid/SBN/rawGrib2 # AWIPS1 OCONUS: GRID ^[LM].[ABCDE].*KWBS* /Grid/SBN/rawGrib2 # LMDA98 KWBS 160000 !grib2/ncep/WRF_EM/#130/201012160000F000/WXTZ/0 - NONE @@ -387,8 +393,8 @@ HDS ^(SF(US|PA)41) ([A-Z]{4}) (..)(..)(..) # WMO Heading for Earth Networks Total Lightning -HDS ^(SF(US|PA)42) ([A-Z]{4}) (..)(..)(..) - FILE -overwrite -log -edex -close /data_store/entlightning/(\4:yyyy)(\4:mm)\4/\5/\1_\3_\4\5\6_(seq).nldn.%Y%m%d%H +NGRID ^(SFPA42) ([A-Z]{4}) (..)(..)(..) + FILE -overwrite -log -edex -close /data_store/entlightning/(\3:yyyy)(\3:mm)\3/\4/\1_\2_\3\4\5_(seq).%Y%m%d%H # AWIPS1: TEXT ^[ABCFMNRSUVW]......[KPTMC] /text/NO_STORE # TEXT ^[ABCFMNRSUVW].....[KPTMC] /text/NO_STORE From b11c4a3d9e27c728bd6c82573e456fa4d3e7fbf8 Mon Sep 17 00:00:00 2001 From: "Shawn.Hooper" Date: Fri, 10 Apr 2015 13:20:35 -0400 Subject: [PATCH 3/6] =?UTF-8?q?ASM=20#17222=20-=20Redbook=20=E2=80=93=20SP?= =?UTF-8?q?C=204-8=20Day=20Convective=20Outlook=20products=20display=20on?= =?UTF-8?q?=20menu=20but=20do=20not=20update=20in=20redbookFcstMap.xml"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iac21d5f7a3595f95058a05d2c9c9f5b5a77170be Former-commit-id: d76e74e667e7847a57c9100cc4007dfc6d22ba06 --- .../localization/redbook/redbookMapping.xml | 20 + .../base/redbook/redbookFcstMap.xml | 2150 +++++++++-------- 2 files changed, 1160 insertions(+), 1010 deletions(-) mode change 100644 => 100755 edexOsgi/com.raytheon.uf.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml diff --git a/cave/com.raytheon.viz.redbook/localization/redbook/redbookMapping.xml b/cave/com.raytheon.viz.redbook/localization/redbook/redbookMapping.xml index e965d24c80..7508ea7d21 100644 --- a/cave/com.raytheon.viz.redbook/localization/redbook/redbookMapping.xml +++ b/cave/com.raytheon.viz.redbook/localization/redbook/redbookMapping.xml @@ -899,5 +899,25 @@ PEIE41, PEII42, PEIK98 Precip Fcst - 24hr accum + + PGNW49 + Day 4 Severe Outlook + + + PGNW50 + Day 5 Severe Outlook + + + PGNW51 + Day 6 Severe Outlook + + + PGNW52 + Day 7 Severe Outlook + + + PGNW53 + Day 8 Severe Outlook + diff --git a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml old mode 100644 new mode 100755 index 77a8d8df80..011710649b --- a/edexOsgi/com.raytheon.uf.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml +++ b/edexOsgi/com.raytheon.uf.edex.plugin.redbook/utility/edex_static/base/redbook/redbookFcstMap.xml @@ -19,1182 +19,1312 @@ further_licensing_information. --> - - - PAWO82 - - - - - PAWO83 - - - - - PPKK01 - + + + PAWO82 + + + + PAWO83 + + + + PAW883 + + + + PDKI59 + + + + PPKK01 + 72 - - - - PPKM01 - + + + + PPKM01 + 96 - - - - PPKO01 - + + + + PPKO01 + 120 - - - - PPKQ01 - + + + + PPKQ01 + 144 - - - - PEI745 - - - - - PEIB40 - + + + + PEI745 + + + + PEIB40 + 6 - - - - PEIC43 - + + + + PEIC43 + 12 - - - - PEID44 - + + + + PEID44 + 18 - - - - PEIE40 - + + + + PEIE40 + 24 - - - - PEIF40 - + + + + PEIF40 + 30 - - - - PEIE41 - + + + + PEIE41 + 24 - - - - PEII42 - + + + + PEII42 + 48 - - - - PEIC61 - + + + + PEIC61 + 12 - - - - PEIE62 - + + + + PEIE62 + 24 - - - - PEIG63 - + + + + PEIG63 + 36 - - - - PEII64 - + + + + PEII64 + 48 - - - - PEIO46 - + + + + PEIO46 + 60 - - - - PGIC42 - + + + + PEIS46 + + 168 + + + + PEWA31 + + + + PEWA32 + + + + PEWA33 + + + + PEWA34 + + + + PGIC42 + 12 - - - - PGIE43 - + + + + PGIE43 + 24 - - - - PJMB44 - + + + + PGWA31 + + + + PGWA32 + + + + PGWA39 + + + + PJMB44 + 6 - - - - PJMB45 - + + + + PJMB45 + 6 - - - - PGWI47 - + + + + PGWE46 + + + + PGWI47 + 48 - - - - PHZM50 - + + + + PHZM50 + 96 - - - - PHZO50 - + + + + PHZO50 + 120 - - - - PHZQ50 - + + + + PHZQ50 + 144 - - - - PPHK01 - + + + + PLQI51 + + + + PNWA68 + + + + POWA31 + + + + PPHK01 + 72 - - - - PPHM01 - + + + + PPHM01 + 96 - - - - PPHO01 - + + + + PPHO01 + 120 - - - - PPIC01 - + + + + PYAA98 + + 0 + + + + PYBA98 + + 0 + + + + PPIC01 + 12 - - - - PPIE01 - + + + + PPIE01 + 24 - - - - PPIG01 - + + + + PPIG01 + 36 - - - - PPII01 - + + + + PPII01 + 48 - - - - PPZM50 - + + + + PPAA89 + + + + PPBA89 + + + + PPZM50 + 96 - - - - PPZO50 - + + + + PPZO50 + 120 - - - - PPZQ50 - + + + + PPZQ50 + 144 - - - - PTIC94 - - 12 - - - - PTIE94 - + + + + PRWA51 + + + + PTIC94 + + 12 + + + + PTIE94 + 24 - - - - PJBI88 - - 48 - - - - PTIO52 - + + + + PTIO52 + 60 - - - - PTIO53 - + + + + PTIO53 + 60 - - - - PYWB61 - - 6 - - - - PYWC62 - - 12 - - - - PYWD63 - - 18 - - - - PYWK43 - + + + + PTWA31 + + + + PTWA32 + + + + PTWA94 + + + + PTWA93 + + + + PXVA01 + + + + PXWA50 + + + + PYMA20 + + + + PYMA25 + + + + PYMA30 + + + + PYMA50 + + + + PYMA70 + + + + PYMA85 + + + + PYWA31 + + + + PYWA32 + + + + PYWK43 + 72 - - - - PYWM44 - + + + + PYWK62 + + + + PYWM44 + 96 - - - - PYWO45 - + + + + PYWO45 + 120 - - - - PEIY47 - + + + + PZKY51 + + + + PEIY47 + 180 - - - - PETT00 - - 264 - - - - PTIY51 - + + + + PTIY51 + 180 - - - - PHBV50 - + + + + PHBV50 + 180 - - - - PYWE64 - + + + + PWIA98 + + 0 + + + + PWIE98 + 24 - - - - PMNE98 - + + + + PWIA97 + + 0 + + + + PWIE97 + 24 - - - - PMNE85 - - 24 - - - - PMNE70 - - 24 - - - - PWIA98 - - 12 - - - - PWIE98 - - 24 - - - - PWIE97 - - 24 - - - - PJME07 - - 24 - - - - PJMG07 - - 36 - - - - PJMI07 - - 48 - - - - PEIY50 - - 240 - - - - PTIY98 - - 240 - - - - PYIY88 - - 240 - - - - PEIY96 - - 336 - - - - PEIY97 - + + + + PEIY97 + 168 - - - - PTIY96 - + + + + PEIY96 + 336 - - - - PTIY97 - + + + + PTIY97 + 168 - - - - PYIY96 - + + + + PTIY96 + 336 - - - - PYIY97 - + + + + PYIY97 + 168 - - - - PEIK98 - + + + + PYIY96 + + 336 + + + + PEIK98 + 72 - - - - PTNK98 - + + + + PTNK98 + 72 - - - - PTNM98 - + + + + PTNM98 + 96 - - - - PTNO98 - + + + + PTNO98 + 120 - - - - PTNQ98 - + + + + PTNQ98 + 144 - - - - PTNR98 - + + + + PTNR98 + 240 - - - - PTNT98 - + + + + PTNT98 + 336 - - - - PTNS98 - + + + + PTNS98 + 168 - - - - PTAS90 - + + + + PTAS90 + 240 - - - - PTAS95 - + + + + PTAS95 + 240 - - - - PTAS00 - + + + + PTAS00 + 240 - - - - PTAT90 - + + + + PTAT90 + 336 - - - - PTAT95 - + + + + PTAT95 + 336 - - - - PTAT00 - + + + + PTAT00 + 336 - - - - PEBF98 - + + + + PEBF98 + 36 - - - - PEBG98 - + + + + PEBG98 + 42 - - - - PEBH98 - + + + + PEBH98 + 48 - - - - PEBI88 - + + + + PEBI88 + 54 - - - - PEBI98 - + + + + PEBI98 + 60 - - - - PEBJ88 - + + + + PEBJ88 + 66 - - - - PEBJ98 - + + + + PEBJ98 + 72 - - - - PEBK98 - + + + + PEBK98 + 78 - - - - PWEC88 - + + + + PYNA98 + + + + PWAA85 + + + + PWAA20 + + + + PWAA00 + + + + PWAA65 + + + + PWBA88 + + + + PWDA00 + + + + PWDA65 + + + + PWEA88 + + 00 + + + + PWEC88 + 12 - - - - PWEE88 - + + + + PWEE88 + 24 - - - - PWEG88 - + + + + PWEG88 + 36 - - - - PJAI88 - + + + + PYAA89 + + + + PJAA88 + + + + PJAI88 + 48 - - - - PPAE89 - + + + + PPAE89 + 24 - - - - PTWO33 - - - - - - PTWO34 - - - - - - PPAI89 - + + + + PPAI89 + 48 - - - - PPAM89 - + + + + PPAM89 + 96 - - - - PPBE89 - - 24 - - - - PPBI89 - + + + + PYBA89 + + + + PJBA88 + + + + PJBI88 + 48 - - - - PPBM89 - + + + + PPBE89 + + 24 + + + + PPBI89 + + 48 + + + + PPBM89 + 96 - - - - PGNE88 - + + + + PGNE88 + 24 - - - - PGNE98 - + + + + PGNE98 + 24 - - - - PPTG98 - + + + + PPTG98 + 144 - - - - PPTR98 - + + + + PPTR98 + 168 - - - - PYWQ46 - + + + + PYWQ46 + 144 - - - - PYWS98 - + + + + PYWS98 + 168 - - - - PEIV98 - + + + + PEIV98 + 1080 - - - - PEIW01 - + + + + PEIW01 + 2520 - - - - PEIW02 - + + + + PEIW02 + 3240 - - - - PEIW03 - + + + + PEIW03 + 3960 - - - - PEIW04 - + + + + PEIW04 + 4680 - - - - PEIW05 - + + + + PEIW05 + 5400 - - - - PEIW06 - + + + + PEIW06 + 6120 - - - - PEIW07 - + + + + PEIW07 + 6840 - - - - PEIW08 - + + + + PEIW08 + 7560 - - - - PEIW09 - + + + + PEIW09 + 8280 - - - - PEIW10 - + + + + PEIW10 + 9000 - - - - PEIW11 - + + + + PEIW11 + 9720 - - - - PEIW12 - + + + + PEIW12 + 10440 - - - - PEIW13 - + + + + PEIW13 + 11160 - - - - PTIV98 - + + + + PTIV98 + 1080 - - - - PTIW01 - + + + + PTIW01 + 2520 - - - - PTIW02 - + + + + PTIW02 + 3240 - - - - PTIW03 - + + + + PTIW03 + 3960 - - - - PTIW04 - + + + + PTIW04 + 4680 - - - - PTIW05 - + + + + PTIW05 + 5400 - - - - PTIW06 - + + + + PTIW06 + 6120 - - - - PTIW07 - + + + + PTIW07 + 6840 - - - - PTIW08 - + + + + PTIW08 + 7560 - - - - PTIW09 - + + + + PTIW09 + 8280 - - - - PTIW10 - + + + + PTIW10 + 9000 - - - - PTIW11 - + + + + PTIW11 + 9720 - - - - PTIW12 - + + + + PTIW12 + 10440 - - - - PTIW13 - + + + + PTIW13 + 11160 - - - - PMWE98 - + + + + PMWE98 + 12 - - - - PMWI98 - + + + + PMWI98 + 36 - - - - PTTU98 - - 264 - - - - PHTT50 - + + + + PETT00 + 264 - - - - PHTT51 - + + + + PTTU98 + 264 - - - - PENE00 - + + + + PHTT50 + + 264 + + + + PHTT51 + + 264 + + + + PENE00 + 24 - - - - PWNE00 - + + + + PWNE00 + 24 - - - - PGNE00 - + + + + PGNE00 + 24 - - - - PGNI00 - + + + + PGNI00 + 48 - - - - PHNT50 - + + + + PHNT50 + 180 - - - - PZNK00 - + + + + PZNK00 + 72 - - - - PGWK48 - + + + + PGWK48 + 72 - - - - PENJ88 - + + + + PENJ88 + 24 - - - - PSBB04 - + + + + PGNA00 + + + + PSBB04 + 24 - - - - PSBB08 - + + + + PSBB08 + 24 - - - - PSBB12 - + + + + PSBB12 + 24 - - - - PSBB25 - + + + + PSBB25 + 24 - - - - PSBC04 - + + + + PSBC04 + 48 - - - - PSBC08 - + + + + PSBC08 + 48 - - - - PSBC12 - + + + + PSBC12 + 48 - - - - PSBC25 - + + + + PSBC25 + 48 - - - - PSBD04 - + + + + PSBD04 + 72 - - - - PSBD08 - + + + + PSBD08 + 72 - - - - PSBD12 - + + + + PSBD12 + 72 - - - - PSBD25 - + + + + PSBD25 + 72 - - - - PSAO72 - + + + + PSAO72 + 72 - - - - PENV01 - + + + + PENV01 + 2520 - - - - PENV02 - + + + + PENV02 + 3240 - - - - PENV03 - + + + + PENV03 + 3960 - - - - PENV04 - + + + + PENV04 + 4680 - - - - PENV05 - + + + + PENV05 + 5400 - - - - PENV06 - + + + + PENV06 + 6120 - - - - PENV07 - + + + + PENV07 + 6840 - - - - PENV08 - + + + + PENV08 + 7560 - - - - PENV09 - + + + + PENV09 + 8280 - - - - PENV10 - + + + + PENV10 + 9000 - - - - PENV11 - + + + + PENV11 + 9720 - - - - PENV12 - + + + + PENV12 + 10440 - - - - PENV13 - + + + + PENV13 + 11160 - - - - PTNV01 - + + + + PTNV01 + 2520 - - - - PTNV02 - + + + + PTNV02 + 3240 - - - - PTNV03 - + + + + PTNV03 + 3960 - - - - PTNV04 - + + + + PTNV04 + 4680 - - - - PTNV05 - + + + + PTNV05 + 5400 - - - - PTNV06 - + + + + PTNV06 + 6120 - - - - PTNV07 - + + + + PTNV07 + 6840 - - - - PTNV08 - + + + + PTNV08 + 7560 - - - - PTNV09 - + + + + PTNV09 + 8280 - - - - PTNV10 - + + + + PTNV10 + 9000 - - - - PTNV11 - + + + + PTNV11 + 9720 - - - - PTNV12 - + + + + PTNV12 + 10440 - - - - PTNV13 - + + + + PTNV13 + 11160 - - - - PGNM98 - + + + + PGNM98 + 192 - - - - PGNO98 - + + + + PGNO98 + 192 - - - - PGWE46 - - - - - - PPAA89 - - - - - PYAA98 - - - - - PGNA00 - - - - + + + + PENA01 + + + + PGNW49 + + 96 + + + + PGNW50 + + 120 + + + + PGNW51 + + 144 + + + + PGNW52 + + 168 + + + + PGNW53 + + 192 + + + From c9955bce55a5190296328eea3225b046c9f57461 Mon Sep 17 00:00:00 2001 From: "Rici.Yu" Date: Thu, 16 Apr 2015 10:37:02 -0400 Subject: [PATCH 4/6] ASM #17390 - Fix string/int conversion issue preventing BOIVerify from launching Change-Id: I6c0a0ea22650a5b42b24b41e41e3ca0acabbf14b Former-commit-id: c6888b4aa86ed3425b5a016d2fbe5664763b4682 --- .../gfe/userPython/procedures/BOIVerify.py | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerify.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerify.py index a353bdd237..e215fbd3fd 100644 --- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerify.py +++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/procedures/BOIVerify.py @@ -56,7 +56,8 @@ # ------------ ---------- ----------- -------------------------- # 12/02/2014 RM #625 ryu Changed checkGroup() as suggested to display models # in multi-columns when a single column is insufficient. -# +# 04/16/2015 17390 ryu Replacing string.atoi with int for string/integer to integer conversion +# (ListBox.curselection() now returns ints instead of strings.) # ---------------------------------------------------------------------------- # MenuItems = ["Verify"] @@ -6629,7 +6630,7 @@ class Verif(BVDialog): outlist=[] itemnums=self.ForecasterListbox.curselection() try: - itemnums=map(string.atoi,itemnums) + itemnums=map(int,itemnums) except ValueError: pass for itemnum in itemnums: outlist.append(self.forecasterNumbers[itemnum]) @@ -6805,7 +6806,7 @@ class Verif(BVDialog): def getFromdayListbox(self): itemnums=self.FromdayListbox.curselection() try: - itemnums=map(string.atoi,itemnums) + itemnums=map(int,itemnums) except ValueError: pass itemnum=itemnums[0] outdate=self.gridDays[itemnum] @@ -6818,7 +6819,7 @@ class Verif(BVDialog): outlist=[] itemnums=self.DaylistListbox.curselection() try: - itemnums=map(string.atoi,itemnums) + itemnums=map(int,itemnums) except ValueError: pass for itemnum in itemnums: outlist.append(self.gridDays[itemnum]) @@ -7792,7 +7793,7 @@ class Verif(BVDialog): outlist=[] itemnums=listbox.curselection() try: - itemnums=map(string.atoi,itemnums) + itemnums=map(int,itemnums) except ValueError: pass for itemnum in itemnums: outlist.append(listbox.get(itemnum)) From 11cb7cd526016dedffc02a0512e4e45daacf36b4 Mon Sep 17 00:00:00 2001 From: "Yun.Teng" Date: Thu, 16 Apr 2015 17:57:45 +0100 Subject: [PATCH 5/6] ASM #17383 - Fixed error that time constraint being off Change-Id: I7b00a4b0d1bd7822cd3f751264badfa62afc3bcb Former-commit-id: d0e8d057f765d95c65ef121e784152d05bd1187c --- .../utility/edex_static/base/config/gfe/serverConfig.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py index 01c0f01b6e..9371ad7da6 100644 --- a/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py +++ b/edexOsgi/com.raytheon.edex.plugin.gfe/utility/edex_static/base/config/gfe/serverConfig.py @@ -48,6 +48,8 @@ # 01/08/2015 #15035 lshi add site WNJ # 12/03/2014 #3866 rferrel Added GFS20 # 03/30/2015 #17206 yteng Changed some parameters that are not rate parameters +# 04/15/2015 #17383 yteng Change localTC to fix error that time constraints +# being off ######################################################################## #---------------------------------------------------------------------------- @@ -978,8 +980,8 @@ def localTC(start,repeat,duration,dst): timezone = SITES[GFESUITE_SITEID][3] import dateutil.tz, datetime tz = dateutil.tz.gettz(timezone) - dt = datetime.datetime.utcnow() - delta = tz.utcoffset(dt) + tz.dst(dt) + local = datetime.datetime.now(tz) + delta = tz.utcoffset(local) - tz.dst(local) offset = delta.days*86400 + delta.seconds start = start - offset if dst == 1: From 3b590509961b9c9771e34593420ad51a7b729ba6 Mon Sep 17 00:00:00 2001 From: "Rici.Yu" Date: Thu, 16 Apr 2015 13:24:29 -0400 Subject: [PATCH 6/6] ASM #14946 - fix issue when timezone is not defined for any zone in a segment Change-Id: I252f78cb9f5bf1cf556788c79fe14ad338b546aa Former-commit-id: ef4c5307d5693abd834f4210e081fb8e3a21f90b --- .../textUtilities/headline/FormatterRunner.py | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py index 4d4b3f22d8..e87d3503f4 100644 --- a/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py +++ b/cave/com.raytheon.viz.gfe/localization/gfe/userPython/textUtilities/headline/FormatterRunner.py @@ -38,7 +38,8 @@ from java.io import File # ------------ ---------- ----------- -------------------------- # 05/29/08 njensen Initial Creation. # 12/10/14 #14946 ryu Add getTimeZones() function. -# +# 04/16/15 #14946 ryu Fix getTimeZones to return the office TZ if timezone +# is not set for any zone in a segment. # # @@ -440,19 +441,18 @@ def getTimeZones(zones, officeTZ): timezones = [] if zones is not None: for zone in JUtil.javaStringListToPylist(zones): - area_dict = AreaDictionary.AreaDictionary.get(zone) - if area_dict is None: - continue - tzs = area_dict.get("ugcTimeZone") - if tzs is not None: - if type(tzs) is str: - tzs = [tzs] - for tz in tzs: - if tz not in timezones: - timezones.append(tz) + zdict = AreaDictionary.AreaDictionary.get(zone, {}) + tzs = zdict.get("ugcTimeZone", []) + if type(tzs) is str: + tzs = [tzs] + for tz in tzs: + if tz not in timezones: + timezones.append(tz) if officeTZ in timezones and officeTZ != timezones[0]: timezones.remove(officeTZ) timezones.insert(0, officeTZ) + if len(timezones) == 0: + timezones.append(officeTZ) return JUtil.pylistToJavaStringList(timezones) def reloadModule(moduleName):