From d5ca25bb18f99eb5191885bdd4223f6d62754216 Mon Sep 17 00:00:00 2001 From: "Rici.Yu" Date: Tue, 17 Mar 2015 11:23:55 -0400 Subject: [PATCH 1/4] ASM #17217 - GFE: default to smart formatter types Change-Id: Ib831998a7293e61a5b606d03ef19f47b09f2e0d5 Former-commit-id: 70e5e249415f6196e37da195967988a71e2e4484 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a] Former-commit-id: dc489dabe28a7a6097cdad8ab3e8e9d956b99229 --- .../raytheon/viz/gfe/dialogs/NewTextProductDialog.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java index fc484e6f12..2c6e799b11 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java @@ -53,6 +53,7 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog; * ------------ ---------- ----------- -------------------------- * Sept 25, 2008 1562 askripsky Initial creation. * Nov 12, 2012 1298 rferrel Changes for non-blocking dialog. + * Mar 17, 2015 17217 ryu Set smart product as the default type. * * * @author askripsky @@ -267,13 +268,13 @@ public class NewTextProductDialog extends CaveJFACEDialog { buttonComp.setLayout(new GridLayout()); buttonComp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true)); - tableTypeButton = new Button(buttonComp, SWT.RADIO); - tableTypeButton.setText("Table"); smartTypeButton = new Button(buttonComp, SWT.RADIO); smartTypeButton.setText("Smart"); + tableTypeButton = new Button(buttonComp, SWT.RADIO); + tableTypeButton.setText("Table"); - // Default to table type - tableTypeButton.setSelection(true); + // Default to smart type + smartTypeButton.setSelection(true); } private void initNameSelection() { From 9918c8e476064f53952f8d43f62b0e63af13eb7c Mon Sep 17 00:00:00 2001 From: "Sean.Webb" Date: Tue, 17 Mar 2015 11:31:56 -0400 Subject: [PATCH 2/4] ASM #17181 - Updated pqact.conf.template for MRMS, HRRR and ESTOFS Change-Id: Ifd691a453dd201c04a297aa54068a9557b1b03e6 Former-commit-id: 506090817b5935ace1463a8faec28f6b73c23bbc [formerly f3164dc891d77c84d12e745a7ece5bd7eddfa0ee] Former-commit-id: ada3710b7e5ed3cd84470226b49d132501f881bc --- .../patch/etc/pqact.conf.template | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 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 8b6e1dda1a..5f27c20d21 100644 --- a/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template +++ b/rpms/awips2.core/Installer.ldm/patch/etc/pqact.conf.template @@ -786,18 +786,13 @@ NGRID ^(E[HS-V][A-DG-KST][B-T]01) (KWBW) (..)(..)(..) FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/RTOFS/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H # ESTOFS - Pattern provided by Joshua.Watson. -#NGRID ^(E[EHC][IP][A-Z]88) (KWBM) (..)(..)(..)[^!]*!(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 - -# ESTOFS workaround until Unidata grib tables are updated -NGRID ^(E[EHC][IP][A-Z]88) (KWBM) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/ESTOFS/GRID255/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H +NGRID ^(E[EHC][IP][A-Z]88) (KWBM) (..)(..)(..)[^!]*!(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 # HRRR - Pattern provided by Joshua.Watson. -#NGRID ^(Y.C[A-MZ][05789][0-9]) (KWBY) (..)(..)(..)[^!]*!(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 +NGRID ^(Y.C[A-MZ][05789][0-9]) (KWBY) (..)(..)(..)[^!]*!(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 -# HRRR Workaround until noaaport ingest grib tables are updated. -NGRID ^(Y.C[A-MZ][05789][0-9]) (KWBY) (..)(..)(..) - FILE -overwrite -log -close -edex /data_store/grib2/(\3:yyyy)(\3:mm)\3/\4/HRRR/GRID184/\1_\2_\3\4\5_(seq).grib2.%Y%m%d%H -# +# MRMS +NGRID ^(YAU[CDLMPQS][0-2][0-9]) (KWNR) (..)(..)(..)[^!]*!(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 From 26ae2cded50e87d71d0eab7d8ea94d083477def1 Mon Sep 17 00:00:00 2001 From: "Rici.Yu" Date: Wed, 18 Mar 2015 10:30:38 -0400 Subject: [PATCH 3/4] ASM #17217 - Add fullStationID entry for table products Change-Id: I6f68b499ce67a2c6b6bb9dad833b76e3c37d6847 Former-commit-id: 6a7fbec942cdf175f60ff403cfaade5604621b32 [formerly a987fe4493e4e58618271fffb37a708185ed4139] Former-commit-id: 72af59fcb63058811395910cb63c431fce20d615 --- cave/com.raytheon.viz.gfe/scriptTemplates/textProductTable.vm | 1 + 1 file changed, 1 insertion(+) diff --git a/cave/com.raytheon.viz.gfe/scriptTemplates/textProductTable.vm b/cave/com.raytheon.viz.gfe/scriptTemplates/textProductTable.vm index e5b414de0c..a3e29cd00a 100644 --- a/cave/com.raytheon.viz.gfe/scriptTemplates/textProductTable.vm +++ b/cave/com.raytheon.viz.gfe/scriptTemplates/textProductTable.vm @@ -55,6 +55,7 @@ Definition = { ## General Set-Up + "fullStationID": "KXXX", "type": "table", "displayName": "${itemName}", # for Product Generation Menu # if displayName == None or "None", this product will NOT From f31cdc692565895e42d4f0c50487432ac6fac5d8 Mon Sep 17 00:00:00 2001 From: Paul Grell Date: Wed, 18 Mar 2015 09:36:12 -0500 Subject: [PATCH 4/4] Revert "ASM #17217 - GFE: default to smart formatter types" This reverts commit d5ca25bb18f99eb5191885bdd4223f6d62754216 [formerly dc489dabe28a7a6097cdad8ab3e8e9d956b99229] [formerly 70e5e249415f6196e37da195967988a71e2e4484 [formerly 81aea3167f21670d7b41eec5458a1f7d36edb36a]]. As requested by Matt Howard email, reverting to remove from build 14.4.1-19 Change-Id: I8517fa02f22089d1d8433007e85ffa5a38274294 Former-commit-id: b1d84d29647bb6e313245691c41dd5e3bda039bf [formerly 111f2d19b08ded3e5ab05406f475da8245af851f] Former-commit-id: 2495ce971f6d7a334e9767722e01317a3c6fc1d9 --- .../raytheon/viz/gfe/dialogs/NewTextProductDialog.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java index 2c6e799b11..fc484e6f12 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/dialogs/NewTextProductDialog.java @@ -53,7 +53,6 @@ import com.raytheon.viz.ui.dialogs.CaveJFACEDialog; * ------------ ---------- ----------- -------------------------- * Sept 25, 2008 1562 askripsky Initial creation. * Nov 12, 2012 1298 rferrel Changes for non-blocking dialog. - * Mar 17, 2015 17217 ryu Set smart product as the default type. * * * @author askripsky @@ -268,13 +267,13 @@ public class NewTextProductDialog extends CaveJFACEDialog { buttonComp.setLayout(new GridLayout()); buttonComp.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, true)); - smartTypeButton = new Button(buttonComp, SWT.RADIO); - smartTypeButton.setText("Smart"); tableTypeButton = new Button(buttonComp, SWT.RADIO); tableTypeButton.setText("Table"); + smartTypeButton = new Button(buttonComp, SWT.RADIO); + smartTypeButton.setText("Smart"); - // Default to smart type - smartTypeButton.setSelection(true); + // Default to table type + tableTypeButton.setSelection(true); } private void initNameSelection() {