diff --git a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java index 08367a66cc..e1bcae41f9 100644 --- a/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java +++ b/cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/ui/zoneselector/ZoneSelectorResource.java @@ -36,6 +36,7 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.jobs.Job; import org.eclipse.swt.graphics.RGB; import org.geotools.coverage.grid.GeneralGridEnvelope; +import org.geotools.coverage.grid.GeneralGridGeometry; import org.geotools.coverage.grid.GridGeometry2D; import org.geotools.geometry.GeneralEnvelope; import org.geotools.geometry.jts.JTS; @@ -72,6 +73,7 @@ import com.raytheon.uf.viz.core.rsc.capabilities.LabelableCapability; import com.raytheon.uf.viz.core.rsc.capabilities.OutlineCapability; import com.raytheon.uf.viz.core.rsc.capabilities.ShadeableCapability; import com.raytheon.viz.core.rsc.jts.JTSCompiler; +import com.raytheon.viz.core.rsc.jts.JTSCompiler.JTSGeometryData; import com.raytheon.viz.core.rsc.jts.JTSCompiler.PointStyle; import com.raytheon.viz.gfe.Activator; import com.raytheon.viz.gfe.rsc.GFEFonts; @@ -106,6 +108,7 @@ import com.vividsolutions.jts.io.WKBReader; * assignments. * Aug 21, 2014 #3459 randerso Restructured Map resource class hierarchy * Sep 04, 2014 #3365 ccody Changes for removing Data_Delivery dependencies + * Apr 06, 2015 #17340 randerso Eliminated clipping to GFE domain, code cleanup * * * @@ -259,8 +262,6 @@ public class ZoneSelectorResource extends DbMapResource { .getRowColumnValue(i, "editarea"); if (zoneName == null) { continue; - // TODO: what do we do with this? - // zoneName = ""; } if ((limitZones != null) @@ -268,9 +269,6 @@ public class ZoneSelectorResource extends DbMapResource { continue; } - String wfo = (String) mappedResult - .getRowColumnValue(i, "wfo"); - Geometry existingGeom = resultingGeoms .get(zoneName); if (existingGeom != null) { @@ -281,12 +279,18 @@ public class ZoneSelectorResource extends DbMapResource { numPoints += g.getNumPoints(); resultingGeoms.put(zoneName, g); - if ((myWfo != null) && myWfo.equals(wfo)) { - if (existingGeom != null) { - wfoPoints -= existingGeom.getNumPoints(); + if (myWfo != null) { + String wfo = (String) mappedResult + .getRowColumnValue(i, "wfo"); + + if (myWfo.equals(wfo)) { + if (existingGeom != null) { + wfoPoints -= existingGeom + .getNumPoints(); + } + wfoPoints += g.getNumPoints(); + wfoGeoms.add(g); } - wfoPoints += g.getNumPoints(); - wfoGeoms.add(g); } ZoneInfo info = req.rsc.getZoneInfo(zoneName); @@ -326,7 +330,7 @@ public class ZoneSelectorResource extends DbMapResource { newOutlineShape.allocate(numPoints); JTSCompiler outlineCompiler = new JTSCompiler(null, - newOutlineShape, req.descriptor, PointStyle.CROSS); + newOutlineShape, req.descriptor); int i = 0; result.shapeList = new IShadedShape[resultingGeoms.size()]; @@ -824,18 +828,7 @@ public class ZoneSelectorResource extends DbMapResource { } } - protected String buildQuery(PixelExtent extent, double simpLev) - throws VizException { - - Envelope env = null; - try { - Envelope e = descriptor.pixelToWorld(extent, descriptor.getCRS()); - ReferencedEnvelope ref = new ReferencedEnvelope(e, - descriptor.getCRS()); - env = ref.transform(MapUtil.LATLON_PROJECTION, true); - } catch (Exception e) { - throw new VizException("Error transforming extent", e); - } + protected String buildQuery(PixelExtent extent, double simpLev) { DecimalFormat df = new DecimalFormat("0.######"); String suffix = "_" @@ -861,16 +854,11 @@ public class ZoneSelectorResource extends DbMapResource { query.append(" FROM "); query.append(resourceData.getTable()); - // add the geospatial constraint - query.append(" WHERE "); - query.append(getGeospatialConstraint(geometryField, env)); - - // add any additional constraints - if (resourceData.getConstraints() != null) { - for (String constraint : resourceData.getConstraints()) { - query.append(" AND "); - query.append(constraint); - } + // add any constraints + String[] constraints = resourceData.getConstraints(); + if ((constraints != null) && (constraints.length > 0)) { + query.append(" WHERE ").append( + StringUtils.join(constraints, " AND ")); } query.append(';'); @@ -899,12 +887,19 @@ public class ZoneSelectorResource extends DbMapResource { private IShadedShape computeShape(IGraphicsTarget target, IMapDescriptor descriptor, Geometry g, RGB color) { + IShadedShape newShadedShape = target.createShadedShape(false, - descriptor.getGridGeometry(), true); + new GeneralGridGeometry(descriptor.getGridGeometry()), true); +// new GeneralGridGeometry(descriptor.getGridGeometry())); JTSCompiler shapeCompiler = new JTSCompiler(newShadedShape, null, - descriptor, PointStyle.CROSS); + descriptor); + JTSGeometryData geomData = shapeCompiler.createGeometryData(); + geomData.setWorldWrapCorrect(true); + geomData.setPointStyle(PointStyle.CROSS); + try { - shapeCompiler.handle(g, color); + geomData.setGeometryColor(color); + shapeCompiler.handle(g, geomData); } catch (VizException e) { statusHandler.handle(Priority.PROBLEM, "Error computing shaded shape", e); @@ -969,17 +964,11 @@ public class ZoneSelectorResource extends DbMapResource { query.append(" FROM "); query.append(resourceData.getTable()); - // add the geospatial constraint - query.append(" WHERE "); - query.append(getGeospatialConstraint( - resourceData.getGeomField(), null)); - - // add any additional constraints - if (resourceData.getConstraints() != null) { - for (String constraint : resourceData.getConstraints()) { - query.append(" AND "); - query.append(constraint); - } + // add any constraints + String[] constraints = resourceData.getConstraints(); + if ((constraints != null) && (constraints.length > 0)) { + query.append(" WHERE ").append( + StringUtils.join(constraints, " AND ")); } query.append(';'); @@ -1052,17 +1041,11 @@ public class ZoneSelectorResource extends DbMapResource { query.append(" FROM "); query.append(resourceData.getTable()); - // add the geospatial constraint - query.append(" WHERE "); - query.append(getGeospatialConstraint( - resourceData.getGeomField(), null)); - - // add any additional constraints - if (resourceData.getConstraints() != null) { - for (String constraint : resourceData.getConstraints()) { - query.append(" AND "); - query.append(constraint); - } + // add any constraints + String[] constraints = resourceData.getConstraints(); + if ((constraints != null) && (constraints.length > 0)) { + query.append(" WHERE ").append( + StringUtils.join(constraints, " AND ")); } query.append(';'); diff --git a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java index af9ec81475..314c1cb124 100644 --- a/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java +++ b/cave/com.raytheon.viz.hydrobase/src/com/raytheon/viz/hydrobase/dialogs/AddModifyLocationDlg.java @@ -86,10 +86,11 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback; * Changes for non-blocking CoopAgencyOfficeDlg. * Changes for non-blocking CopyNewLocationDlg. * Changes for non-blocking CountyStateDlg. - * 08 Jan 2015 15695, 15488 djingtao fix the save/update text field with apostrophe, repleace the single + * 08 Jan 2015 15695, 15488 djingtao fix the save/update text field with apostrophe, repleace the single * apostrophe to two single apostrophe before save/update to database. - * 02 Feb 2015 13372 djingtao change the GMT time to local time for "revise" field - * + * 02 Feb 2015 13372 djingtao change the GMT time to local time for "revise" field + * 08 April 2015 17338 djingtao "Apostrophe" entered into HB text fields are not written to IHFS database + * remove the changes in 15695/15488, move the apostrophe fix into a more central position * * * @@ -1810,7 +1811,7 @@ public class AddModifyLocationDlg extends CaveSWTDialog implements /* Check if text fields in dataToSave include single apostrophe, if it do, replace to two single apostrophe */ - AppsDefaults ad = AppsDefaults.getInstance(); +/* AppsDefaults ad = AppsDefaults.getInstance(); boolean debug = ad.getBoolean(HydroConstants.DEBUG_HYDRO_DB_TOKEN, false); Class c = dataToSave.getClass(); @@ -1838,7 +1839,7 @@ public class AddModifyLocationDlg extends CaveSWTDialog implements } catch (IllegalAccessException e) { e.printStackTrace(); } - } + }*/ // Save to DB via DataManager try { diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/cresthistory/CrestHistoryDataManager.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/cresthistory/CrestHistoryDataManager.java index 2a93ba37b9..8f56fa31b4 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/cresthistory/CrestHistoryDataManager.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/cresthistory/CrestHistoryDataManager.java @@ -30,9 +30,10 @@ package com.raytheon.viz.hydrocommon.cresthistory; * ------------ ---------- ----------- -------------------------- * Dec 11, 2008 1628 dhladky initial * Nov 04, 2010 5518 lbousaid added all/above/bellow flag to - * getRiverCrestData + * getRiverCrestData * Jan 09, 2015 16698 JingtaoD Crest History failed validation dialog pops up when OK button clicked - * + * April 08 2015 17338 JingtaoD "Apostrophe" entered into Hydrobase text fields in dialog window are not + * written to the IHFS database * * * @author dhladky @@ -48,6 +49,7 @@ import com.raytheon.uf.viz.core.exception.VizException; import com.raytheon.viz.hydrocommon.HydroConstants; import com.raytheon.viz.hydrocommon.data.RiverDataPoint; import com.raytheon.viz.hydrocommon.datamanager.RiverDataManager; +import com.raytheon.viz.hydrocommon.datamanager.HydroDBDataManager; public class CrestHistoryDataManager { private static final transient IUFStatusHandler statusHandler = UFStatus @@ -107,6 +109,9 @@ public class CrestHistoryDataManager { System.out.println("Query: " + deleteCrest); } + // check if dataQuery contains any apostrophe, if does, replace it to two single appostrophe + deleteCrest = HydroDBDataManager.getInstance().checkAppostrophe(deleteCrest); + DirectDbQuery.executeStatement(deleteCrest, HydroConstants.IHFS, QueryLanguage.SQL); } catch (VizException ve) { @@ -151,6 +156,9 @@ public class CrestHistoryDataManager { ad.getToken(HydroConstants.DB_NAME)); System.out.println("Query: " + query); } + // check if dataQuery contains any apostrophe, if does, replace it to two single appostrophe + query = HydroDBDataManager.getInstance().checkAppostrophe(query); + DirectDbQuery.executeStatement(query, HydroConstants.IHFS, QueryLanguage.SQL); } catch (VizException e) { e.printStackTrace(); @@ -206,6 +214,9 @@ public class CrestHistoryDataManager { } try { + // check if dataQuery contains any apostrophe, if does, replace it to two single appostrophe + insertCrest = HydroDBDataManager.getInstance().checkAppostrophe(insertCrest); + DirectDbQuery.executeStatement(insertCrest, HydroConstants.IHFS, QueryLanguage.SQL); } catch (VizException e) { @@ -273,8 +284,11 @@ public class CrestHistoryDataManager { ad.getToken(HydroConstants.DB_NAME)); System.out.println("Query: " + query.toString()); } - - DirectDbQuery.executeStatement(query.toString(), HydroConstants.IHFS, QueryLanguage.SQL); + + // check if dataQuery contains any apostrophe, if does, replace it to two single appostrophe + String newquery = HydroDBDataManager.getInstance().checkAppostrophe(query.toString()); + + DirectDbQuery.executeStatement(newquery, HydroConstants.IHFS, QueryLanguage.SQL); } catch (VizException e) { errMsg = "Error updating data in database"; e.printStackTrace(); diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java index 4c6cff3cb7..abfb6011ee 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/data/RiverStatData.java @@ -38,7 +38,7 @@ import com.raytheon.viz.hydrocommon.HydroConstants; * Jan 3, 2013 15520 lbousaidi added a dollar-quoted string to getUpdate and * getInsert statements to always write literally * the string content. - + * April 8, 2015 17338 jingtaoD "Apostrophes" entered into HB text fields are not written to IHFS database * * * @@ -769,7 +769,7 @@ public class RiverStatData extends HydroDBData implements IHydroDBData { String rval = "INSERT INTO riverstat ( " + columns + " ) VALUES ( %s, %s, %s, %s, %s, %s, %s," - + " %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, $$%s$$,%s," + + " %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, $$%s$$, %s," + " %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s )"; rval = String.format(rval, getDBString(lid), getDBString(primaryPE), diff --git a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/HydroDataManager.java b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/HydroDataManager.java index d1e34c5a69..20b84070a9 100644 --- a/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/HydroDataManager.java +++ b/cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/datamanager/HydroDataManager.java @@ -19,6 +19,7 @@ **/ package com.raytheon.viz.hydrocommon.datamanager; +import java.lang.reflect.Field; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.HashMap; @@ -43,7 +44,7 @@ import com.raytheon.viz.hydrocommon.data.RatingShift; * ------------ ---------- ----------- -------------------------- * Oct 22, 2008 1636 askripsky Initial Creation * Sep 09, 2009 2259 mpduff Added rating shift data - * + * April 8, 2015 17338 jingtaoD add checkAppostrophe method * * * @author askripsky @@ -110,7 +111,10 @@ public abstract class HydroDataManager { System.out.println("Query: " + dataQuery); } QueryResult data = null; - + + // check if dataQuery contains any apostrophe, if does, replace it to two single appostrophe + dataQuery = checkAppostrophe(dataQuery); + data = DirectDbQuery.executeMappedQuery(dataQuery, HydroConstants.IHFS, QueryLanguage.SQL); @@ -123,6 +127,7 @@ public abstract class HydroDataManager { * @throws VizException */ public void runStatement(String dataQuery) throws VizException { + AppsDefaults ad = AppsDefaults.getInstance(); boolean debug = ad.getBoolean(HydroConstants.DEBUG_HYDRO_DB_TOKEN, false); if (debug) { @@ -131,8 +136,89 @@ public abstract class HydroDataManager { ad.getToken(HydroConstants.DB_NAME)); System.out.println("Query: " + dataQuery); } + + // check if dataQuery contains any apostrophe, if does, replace it to two single appostrophe + dataQuery = checkAppostrophe(dataQuery); + DirectDbQuery.executeStatement(dataQuery, HydroConstants.IHFS, - QueryLanguage.SQL); + QueryLanguage.SQL); + + } + + public String checkAppostrophe (String dataQuery) { + /* Check if text fields include single apostrophe, if it does, replace to + two single apostrophe since it is treated as special char in Postgres */ + String newDataQuery = ""; + + String[] dataElement = dataQuery.split(", "); + for (int j = 0; j < dataElement.length; j++) + { + String elem = dataElement[j]; + String newSubData = ""; + String[] subdataElement = elem.split("="); + + for (int i = 0; i < subdataElement.length; i++) + { + String subelem = subdataElement[i]; + String likeStr=""; + + // handle the where clause contains "like '%'" + if (subelem.toUpperCase().contains("WHERE") && + subelem.toUpperCase().contains("LIKE")) + { + int likeindex = subelem.toUpperCase().indexOf("LIKE"); + likeStr = subelem.substring(likeindex , subelem.length()); + subelem = subelem.substring(0, likeindex); + } + + String endStr = ""; + String beginStr = ""; + String checkStr; + int startappostraphe, endappostraphe; + + if (subelem.contains("'")) + { + if (subelem.startsWith("$$") && subelem.endsWith("$$")) + { + startappostraphe = subelem.indexOf("$$"); + endappostraphe = subelem.lastIndexOf("$$"); + checkStr = subelem.substring(startappostraphe+2, endappostraphe); + if (checkStr.contains("'")) + { + checkStr = checkStr.replace("'", "''"); + subelem = "'" + checkStr +"'"; + } + } + else + { + startappostraphe = subelem.indexOf("'"); + endappostraphe = subelem.lastIndexOf("'"); + checkStr = subelem.substring(startappostraphe+1, endappostraphe); + if (checkStr.contains("'")) + { + if (startappostraphe > 0) + beginStr = subelem.substring(0, startappostraphe); + if (endappostraphe + 1 < subelem.length()) + endStr = subelem.substring(endappostraphe + 1, subelem.length()); + + checkStr = checkStr.replace("'", "''"); + subelem = beginStr + "'" + checkStr +"'" + endStr; + } + } + } + + if (i == subdataElement.length -1 ) + newSubData = newSubData + subelem + likeStr; + else + newSubData = newSubData + subelem + "="; + } + if (j == dataElement.length - 1) + newDataQuery = newDataQuery + newSubData; + else + newDataQuery = newDataQuery + newSubData + ", "; + } + + return newDataQuery; } /** diff --git a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java index 01ef20e0f5..0a2780723b 100644 --- a/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java +++ b/cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/dialogs/TextEditorDialog.java @@ -344,12 +344,10 @@ import com.raytheon.viz.ui.dialogs.SWTMessageBox; * 11Sep2014 3580 mapeters Replaced SerializationTuil usage with JAXBManager, * removed IQueryTransport usage (no longer exists). * 20Oct2014 3685 randerso Made conversion to upper case conditional on product id -<<<<<<< HEAD * 15Feb2015 4001 dgilling Ensure all fields are set in SendPracticeProductRequest. -======= * 05Mar2015 RM 15025 kshrestha Fix to maintain the headers that they are saved with * 10Mar2015 RM 14866 kshrestha Disable QC GUI pop up for TextWS ->>>>>>> 9c7d466213eaac3a46fddf416967d00e3446bfee + * 6Apr2015 RM14968 mgamazaychikov Fix formatting for pathcast section * * * @@ -7933,6 +7931,7 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, */ private void rewrapInternal(int lineNumber) { boolean inLocations = false; + boolean inPathcast = false; String padding = ""; // get contents of line String line = textEditor.getLine(lineNumber); @@ -7951,6 +7950,11 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, inLocations = true; } + // is this the pathcast paragragh? + if (paragraphStart.startsWith("* THIS") && paragraphStart.endsWith("WILL BE NEAR...")) { + inPathcast = true; + } + if (paragraphStart.matches(METAR_PARAGRAPH)) { padding = " "; } else if (checkParagraphPadding(paragraphStart)) { @@ -7960,8 +7964,8 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, padding = " "; } - if (inLocations && (paragraphStartLineNumber == lineNumber)) { - // Keep LOCATIONS first line short & don't paste more to it. + if ((inLocations || inPathcast) && (paragraphStartLineNumber == lineNumber)) { + // Keep LOCATIONS and PATHCAST first line short & don't paste more to it. if (line.indexOf("...") == line.lastIndexOf("...")) { return; } @@ -8041,7 +8045,13 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, && (allText.charAt(eol + 1) == '\n')) { deleteLen = 2; } else if (allText.charAt(eol) == '\n') { - deleteLen = 1; + if (allText.charAt(eol-1) == '.' && allText.charAt(eol-2) != '.') { + // do not extend this line. + return; + } + else { + deleteLen = 1; + } } else { return; } @@ -8186,6 +8196,10 @@ public class TextEditorDialog extends CaveSWTDialog implements VerifyListener, } } textEditor.replaceTextRange(position, 0, replacement.toString()); + // remove and extra space + if (textEditor.getText(position -1, position - 1).equals(" ")) { + textEditor.replaceTextRange(position-1, 1, ""); + } ++endWrapLine; } } diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/500Height.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/500Height.xml index e64f5931eb..9bb66d031c 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/500Height.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/500Height.xml @@ -104,46 +104,6 @@ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -168,11 +128,6 @@ - @@ -310,47 +265,6 @@ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -397,8 +311,6 @@ displayType="CONTOUR" loadWithoutData="false"> - PLAN_VIEW @@ -426,46 +338,7 @@ - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - + @@ -508,6 +381,45 @@ + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml index 7367463aab..e29508ab23 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFamily.xml @@ -4,7 +4,7 @@ - + @@ -38,9 +38,11 @@ - + - + + + PLAN_VIEW @@ -72,7 +74,7 @@ - + @@ -103,7 +105,7 @@ - + @@ -137,7 +139,7 @@ - + @@ -171,7 +173,7 @@ - + @@ -205,7 +207,7 @@ - + @@ -239,9 +241,10 @@ - + - + + PLAN_VIEW @@ -251,7 +254,7 @@ - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml index f017b6068c..f7216f77fa 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultFourPanel.xml @@ -89,14 +89,11 @@ - + - - - @@ -104,7 +101,10 @@ - + + + + @@ -115,7 +115,7 @@ - + PLAN_VIEW @@ -184,7 +184,7 @@ - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultMesoFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultMesoFamily.xml new file mode 100644 index 0000000000..28af21061d --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultMesoFamily.xml @@ -0,0 +1,208 @@ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStdEnv.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStdEnv.xml index 1ad3b2728b..aecf26a165 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStdEnv.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStdEnv.xml @@ -7,7 +7,7 @@ PLAN_VIEW - + @@ -38,7 +38,7 @@ PLAN_VIEW - + @@ -69,7 +69,7 @@ PLAN_VIEW - + @@ -100,7 +100,7 @@ PLAN_VIEW - + @@ -131,7 +131,7 @@ PLAN_VIEW - + @@ -162,7 +162,7 @@ PLAN_VIEW - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStormScaleFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStormScaleFamily.xml new file mode 100755 index 0000000000..d4b4bfd4f6 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultStormScaleFamily.xml @@ -0,0 +1,245 @@ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml index 544ddff7db..7b61317277 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/DefaultSurface.xml @@ -24,10 +24,46 @@ - + - + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + @@ -41,7 +77,7 @@ PLAN_VIEW - + @@ -59,16 +95,16 @@ - + - + - + @@ -111,7 +147,7 @@ PLAN_VIEW - + @@ -164,17 +200,18 @@ - + - + + - + @@ -187,7 +224,7 @@ - + @@ -199,17 +236,17 @@ - + - + - + @@ -219,6 +256,40 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + @@ -245,12 +316,9 @@ - - - - - - + + + PLAN_VIEW @@ -281,6 +349,112 @@ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml index 1772bd4f49..7c1ef90699 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ECMWFHiRes.xml @@ -25,25 +25,32 @@ - - + displayType="CONTOUR" > + + + + + - + - + - + @@ -52,45 +59,58 @@ - - - + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + displayType="CONTOUR"> + + + + + + - + @@ -100,53 +120,65 @@ - - + displayType="CONTOUR"> + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + displayType="CONTOUR"> + + + + + + - + - + - + @@ -156,72 +188,85 @@ - - + displayType="CONTOUR"> + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + displayType="CONTOUR"> + + + - - - - - - - - - - - - - + + + + + + + + + + + + + - - + displayType="CONTOUR"> + + + + + + - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeavyRainFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeavyRainFamily.xml new file mode 100755 index 0000000000..14865ee08f --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/HeavyRainFamily.xml @@ -0,0 +1,728 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MSLPress.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MSLPress.xml deleted file mode 100644 index 17d15d58df..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/MSLPress.xml +++ /dev/null @@ -1,416 +0,0 @@ - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml index ac3186ce95..9f3fbaa8fd 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyA.xml @@ -21,7 +21,7 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + @@ -33,7 +33,7 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + @@ -54,35 +54,9 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -115,47 +89,11 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -188,7 +126,7 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + @@ -219,9 +157,9 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + - + @@ -233,7 +171,40 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + @@ -252,42 +223,10 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -299,7 +238,7 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + @@ -323,9 +262,9 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + - + @@ -358,13 +297,13 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + PLAN_VIEW - + @@ -390,15 +329,15 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + - + PLAN_VIEW - + @@ -425,7 +364,7 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - + @@ -456,84 +395,6 @@ ModFamA| |N|Conv: NonSupercell Tor Family| |OTHER | | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml index 6589a91894..b8a33acaf2 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyB.xml @@ -1,65 +1,38 @@ - + + - - - - - + + + + + PLAN_VIEW - + - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - + @@ -74,85 +47,50 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ - + - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -161,6 +99,42 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + @@ -182,116 +156,16 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ - - + + - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + PLAN_VIEW - + @@ -306,8 +180,8 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ - - + + @@ -317,108 +191,10 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -430,7 +206,7 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ - + @@ -439,20 +215,22 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ - - + + + + + - - + - + @@ -464,7 +242,7 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ - + @@ -473,114 +251,268 @@ ModFamB| |N|Conv: Storm Init Family| |OTHER | | \ + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + - + - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyC.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyC.xml index ab4de75eff..4f97f43d99 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyC.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyC.xml @@ -25,7 +25,7 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + @@ -37,7 +37,7 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + @@ -61,13 +61,13 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + PLAN_VIEW - + @@ -94,13 +94,13 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + PLAN_VIEW - + @@ -112,16 +112,16 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + - + - + @@ -130,7 +130,7 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + @@ -161,35 +161,9 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -223,47 +197,11 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -298,7 +236,7 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + @@ -335,7 +273,7 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + @@ -369,10 +307,9 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - - + - + @@ -384,32 +321,32 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + - + - - + + - + - - + + - + @@ -421,56 +358,19 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - + @@ -480,10 +380,46 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -519,7 +455,7 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + @@ -555,7 +491,7 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + @@ -579,97 +515,25 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - + - + - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + PLAN_VIEW - + @@ -696,10 +560,12 @@ ModFamC| |N|Conv: Hail Family| |OTHER | | \ - - - ${frameCount} - - - - + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD-MandatoryLevels.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD-MandatoryLevels.xml new file mode 100755 index 0000000000..b2a144b6cf --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD-MandatoryLevels.xml @@ -0,0 +1,677 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml index 82af335064..46601c2c03 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyD.xml @@ -44,7 +44,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - + @@ -99,7 +99,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ PLAN_VIEW - + @@ -134,7 +134,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ PLAN_VIEW - + @@ -164,44 +164,15 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - + PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - + + + + @@ -225,341 +196,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -631,39 +268,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -698,103 +303,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -905,8 +414,10 @@ ModFamD| |N|Winter: Family| |OTHER | | \ + + - + @@ -940,105 +451,8 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - + - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -1072,9 +486,8 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - - - + + @@ -1083,7 +496,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ PLAN_VIEW - + @@ -1110,70 +523,6 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - @@ -1208,55 +557,18 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - PLAN_VIEW - - - - + + + + + PLAN_VIEW + + + + @@ -1272,42 +584,16 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - + - + - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - @@ -1343,81 +629,17 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - + - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - + + + + + PLAN_VIEW + + + + @@ -1442,70 +664,7 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - + @@ -1541,47 +700,10 @@ ModFamD| |N|Winter: Family| |OTHER | | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - ${frameCount} - - - + ${frameCount} + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml index 7464274f08..3606173091 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyE.xml @@ -20,15 +20,15 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - - - - - PLAN_VIEW - - - - + + + + + PLAN_VIEW + + + + @@ -44,7 +44,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -77,7 +77,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -89,6 +89,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ + PLAN_VIEW @@ -111,7 +112,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -152,7 +153,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -185,7 +186,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -196,7 +197,8 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + + PLAN_VIEW @@ -218,7 +220,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -237,6 +239,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ + PLAN_VIEW @@ -259,7 +262,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -377,6 +380,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ + PLAN_VIEW @@ -387,7 +391,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -420,7 +424,7 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ - + @@ -444,11 +448,12 @@ ModFamE| |N|Winter: PV/Trop Family| |OTHER | | \ + PLAN_VIEW - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml index 0bdaad187d..3cb2bf9678 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyF.xml @@ -119,7 +119,7 @@ - + @@ -273,7 +273,7 @@ - + @@ -405,7 +405,7 @@ - + @@ -559,7 +559,7 @@ - + @@ -691,7 +691,7 @@ - + @@ -845,7 +845,7 @@ - + @@ -977,7 +977,7 @@ - + @@ -1131,7 +1131,7 @@ - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml index 14ecfd1bfd..52f4d88796 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyH.xml @@ -37,7 +37,7 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - + @@ -49,7 +49,7 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - + @@ -70,13 +70,13 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - + PLAN_VIEW - + @@ -100,10 +100,9 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - - + - + @@ -112,6 +111,71 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + @@ -134,70 +198,9 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - + - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -209,16 +212,19 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - + + + + - + @@ -227,12 +233,11 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - - + - + @@ -249,12 +254,15 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | + + + - + @@ -264,103 +272,11 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -390,606 +306,9 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -1018,100 +337,304 @@ ModFamH | | N|Conv: QLCS/Wind Family| | OTHER| | - + - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + PLAN_VIEW - + + + + - + - + - + - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyI.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyI.xml index 03d0fba0c1..1a33c5e16d 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyI.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyI.xml @@ -11,6 +11,21 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ |100.|DivFn,900MB|1.|QPV2,900MB-800MB|21.|DivFn,900MB|0.|T,900MB-800MB|11.|EPVt2,900MB-800MB --> + + + + + + + + + + + + + + + @@ -19,7 +34,6 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - @@ -38,6 +52,9 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ + + + @@ -73,7 +90,7 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + @@ -83,17 +100,18 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + - + + PLAN_VIEW @@ -104,11 +122,14 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + + + @@ -123,8 +144,7 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - - + @@ -138,7 +158,44 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + @@ -197,16 +254,53 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} - + - + + - @@ -277,10 +371,11 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + PLAN_VIEW @@ -291,7 +386,40 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + @@ -311,11 +439,11 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + - + PLAN_VIEW @@ -325,7 +453,7 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + @@ -384,16 +512,53 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} - - - + + + + - @@ -412,6 +577,9 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ + + + @@ -464,10 +632,11 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + PLAN_VIEW @@ -478,11 +647,50 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + @@ -498,11 +706,11 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + - + PLAN_VIEW @@ -512,7 +720,7 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + @@ -571,14 +779,51 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} - - - - + + + + @@ -598,6 +843,9 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ + + + @@ -650,10 +898,11 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + PLAN_VIEW @@ -664,15 +913,19 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + + + + @@ -682,8 +935,7 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - - + @@ -697,7 +949,44 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + @@ -746,6 +1035,7 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ + @@ -755,6 +1045,43 @@ ModFamI| |N|Winter: Big3 Fn Family| |OTHER | | \ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml index 9bd3b15ea5..0483fb5af6 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyJ.xml @@ -42,7 +42,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + @@ -72,7 +72,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + @@ -128,6 +128,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ + PLAN_VIEW @@ -190,11 +191,10 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - - + - + @@ -205,6 +205,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ + PLAN_VIEW @@ -225,10 +226,10 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + - + @@ -257,7 +258,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + @@ -309,10 +310,50 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW @@ -323,7 +364,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + @@ -346,11 +387,12 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + + PLAN_VIEW - + @@ -375,16 +417,16 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - - + + - + PLAN_VIEW - + @@ -487,6 +529,7 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ + PLAN_VIEW @@ -507,10 +550,10 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + - + @@ -541,10 +584,10 @@ ModFamJ| |N|Winter: Snow Growth Family| |OTHER | | \ - + - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL-MandatoryLevels.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL-MandatoryLevels.xml new file mode 100755 index 0000000000..3b3d7557b3 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL-MandatoryLevels.xml @@ -0,0 +1,1086 @@ + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml index 5a68a6157c..62b9bfbca7 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyL.xml @@ -21,12 +21,13 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + - + + PLAN_VIEW @@ -57,13 +58,13 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + - - + + PLAN_VIEW - + @@ -90,10 +91,10 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + - + PLAN_VIEW @@ -123,10 +124,10 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + - + PLAN_VIEW @@ -155,7 +156,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + @@ -381,7 +382,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + @@ -450,7 +451,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + @@ -504,7 +505,8 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + + PLAN_VIEW @@ -533,7 +535,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + @@ -567,7 +569,8 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + + - + NOT SURE + - + - + --> - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + NOT SURE + @@ -666,234 +637,61 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - + --> ${frameCount} - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - ${frameCount} - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + + PLAN_VIEW @@ -909,7 +707,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + @@ -918,49 +716,51 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + + - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + PLAN_VIEW @@ -1011,7 +811,7 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + @@ -1050,10 +850,10 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ - + - + @@ -1094,6 +894,185 @@ ModFamL| |N|Winter: PType Family| |OTHER | | \ + + ${frameCount} + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml index 8a847ff9f7..68db124952 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyM.xml @@ -1,25 +1,42 @@ - + - + - + + - + PLAN_VIEW - + @@ -37,17 +54,18 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ + - + - + @@ -67,26 +85,28 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + + - + - + + PLAN_VIEW @@ -97,7 +117,7 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + @@ -109,17 +129,17 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ + - + - - + @@ -133,29 +153,67 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + - + + - + - + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -175,30 +233,69 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + + - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} - + - + + @@ -224,17 +321,18 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ + - + - + @@ -254,26 +352,28 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + + - + - + + PLAN_VIEW @@ -284,7 +384,7 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + @@ -296,17 +396,17 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ + - + - - - + + @@ -320,29 +420,67 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + - + + - + - + - + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -362,30 +500,69 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + + - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} - - - + + + - + + @@ -411,17 +588,18 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ + - + - + - + @@ -441,26 +619,28 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + + - + - + - + + PLAN_VIEW @@ -471,7 +651,7 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + @@ -483,17 +663,17 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ + - + - - + @@ -507,29 +687,67 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + - + + - + - + - + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -549,30 +767,68 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + + - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} - - - - + + + - + + @@ -598,17 +854,18 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ + - + - + - + @@ -628,26 +885,31 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + + + + + - + - + - + + PLAN_VIEW @@ -658,7 +920,7 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + @@ -670,17 +932,17 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ + - + - - - + + @@ -694,27 +956,65 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + - + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + - + - + @@ -736,24 +1036,62 @@ ModFamM| |N|Winter: Big3 Qn Family| |OTHER | | \ - + + - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyU.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyU.xml index a8b7de6ee7..61717c3904 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyU.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyU.xml @@ -40,7 +40,7 @@ ModFamU| |N|Briefing Family| |OTHER | | \ - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml index f907b5f8a8..d8350c41e1 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyV.xml @@ -27,15 +27,85 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + PLAN_VIEW - + @@ -65,7 +135,7 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - + @@ -95,145 +165,44 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + PLAN_VIEW - + + + + - + - - - - + - + + + + - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - + @@ -264,9 +233,195 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -298,29 +453,29 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - - - + + + - + PLAN_VIEW - + - + - + @@ -334,38 +489,11 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - + - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -398,47 +526,47 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -472,38 +600,46 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -521,7 +657,7 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - + @@ -535,48 +671,11 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + @@ -588,55 +687,16 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - + - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - + @@ -645,354 +705,45 @@ ModFamV | | N|Conv: Severe Type Family| | OTHER| | \ - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyW.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyW.xml index ec2f37ca3f..fbfcef923c 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyW.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyW.xml @@ -41,7 +41,7 @@ - + @@ -65,13 +65,13 @@ - + PLAN_VIEW - + @@ -129,34 +129,7 @@ - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - + @@ -176,22 +149,95 @@ - + - + - - - + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -205,19 +251,19 @@ - + - + - + @@ -226,37 +272,7 @@ - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - + @@ -281,41 +297,6 @@ - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - @@ -325,10 +306,7 @@ - - - - + @@ -364,111 +342,9 @@ - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -500,11 +376,45 @@ - - - + + - + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -522,7 +432,7 @@ - + @@ -536,36 +446,42 @@ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -585,7 +501,7 @@ - + @@ -600,72 +516,7 @@ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - + @@ -685,7 +536,7 @@ - + @@ -700,47 +551,10 @@ - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - + @@ -752,19 +566,16 @@ - + - - - - + @@ -772,11 +583,10 @@ - - - + + - + @@ -788,7 +598,7 @@ - + @@ -797,7 +607,7 @@ - + @@ -805,316 +615,9 @@ - + - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - + @@ -1133,14 +636,11 @@ - - - - + @@ -1149,7 +649,7 @@ - + @@ -1163,19 +663,16 @@ - + - - - - + @@ -1183,110 +680,7 @@ - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyX.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyX.xml index b3f9a3011d..db67d31555 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyX.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyX.xml @@ -1,10 +1,598 @@ + + - - - - - - + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -16,479 +604,30 @@ - + - + - + - + - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -505,65 +644,27 @@ - - - + + + - - + - + + - - + - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -580,26 +681,93 @@ - - - - + - + - - - - ${frameCount} - - - - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyY.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyY.xml index b1948592a0..5e4bea99e1 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyY.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyY.xml @@ -1,27 +1,28 @@ - - + + - - + - + PLAN_VIEW - + @@ -33,7 +34,7 @@ - + @@ -48,16 +49,16 @@ - - + + - + PLAN_VIEW - + @@ -68,9 +69,6 @@ - - - @@ -84,10 +82,9 @@ - - + - + @@ -105,7 +102,7 @@ - + @@ -120,237 +117,82 @@ - - - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -367,25 +209,25 @@ - - - + - - - - - + + + + + + - + + - + @@ -397,74 +239,40 @@ - + - - - + - - - - - + + + + + + + + + - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - + + ${frameCount} - - - - - - + + + + + - + @@ -485,19 +293,22 @@ - + + + + + - - + - + @@ -518,19 +329,23 @@ - + + + + + - - - + + + - + @@ -563,16 +378,15 @@ - - + - + PLAN_VIEW - + @@ -587,126 +401,67 @@ - + + + + - + ${frameCount} - - - - - - + + + + + - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -715,6 +470,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + @@ -727,7 +522,7 @@ - + @@ -737,15 +532,17 @@ - + + + - + PLAN_VIEW - + @@ -756,11 +553,14 @@ + + + - + @@ -768,20 +568,19 @@ - - + + ${frameCount} - - - - - - - - - + + + + + + + + @@ -793,7 +592,7 @@ - + @@ -801,53 +600,63 @@ - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - + + - + - + - - + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -864,11 +673,13 @@ + + + - @@ -877,82 +688,7 @@ - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml index 9f7f9995c9..6f5c9ef50a 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/ModelFamilyYY.xml @@ -1,48 +1,52 @@ - - + - - - - - - + + + + + PLAN_VIEW - + - + + + + @@ -56,10 +60,44 @@ - - - + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -68,6 +106,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + @@ -89,477 +163,78 @@ - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -580,19 +255,94 @@ - + + + + + - - + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -626,9 +376,45 @@ - + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -645,6 +431,9 @@ + + + @@ -658,10 +447,9 @@ - - + - + @@ -678,11 +466,14 @@ + + + - + @@ -690,11 +481,10 @@ - - - + + - + @@ -715,119 +505,61 @@ - + + + + - - - + - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + @@ -848,7 +580,7 @@ - + @@ -857,10 +589,10 @@ - - - - + + + + @@ -872,7 +604,7 @@ - + @@ -880,90 +612,23 @@ - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - - - + - - + - - + + ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/NonSupercellModelFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/NonSupercellModelFamily.xml new file mode 100755 index 0000000000..ac3186ce95 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/NonSupercellModelFamily.xml @@ -0,0 +1,542 @@ + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + ${frameCount} + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml index 20449dce3b..011679b78a 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/UKMET.xml @@ -44,7 +44,7 @@ PLAN_VIEW - + @@ -72,56 +72,26 @@ - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - PLAN_VIEW - - - - - - - - - - - - + + + + + + + + + + + + + + + - + @@ -130,12 +100,11 @@ - + - - - - + + + @@ -204,37 +173,6 @@ - - - - - - PLAN_VIEW - - - - - - - - - - - - - - - - - - - - - - - - - ${frameCount} diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFamily.xml new file mode 100755 index 0000000000..7c5d1e712e --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFamily.xml @@ -0,0 +1,1235 @@ + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 29 + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFnFourPanelFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFnFourPanelFamily.xml new file mode 100755 index 0000000000..26cefc378a --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterFnFourPanelFamily.xml @@ -0,0 +1,1424 @@ + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 12 + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 12 + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 12 + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 12 + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterPTypeFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterPTypeFamily.xml new file mode 100755 index 0000000000..8c96a80c66 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/bundles/volume/WinterPTypeFamily.xml @@ -0,0 +1,1764 @@ + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 29 + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 29 + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 29 + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + +PLAN_VIEW + + + + + + + + + + + + +World +mapdata.world
+name not in ('CANADA', 'MEXICO', 'UNITED STATES') +the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +State Boundaries +mapdata.states
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Canada +mapdata.canada
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +Mexico +mapdata.mexico
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + +County Boundaries +mapdata.county
+the_geom + + + + +PLAN_VIEW + + + + + + + + + + + + +two lakes +mapdata.lake
+name in ('Great Salt Lake', 'Lake Winnepeg') +the_geom + + + State/County Boundaries + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLAN_VIEW + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 2147483647 + 29 + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ConvectModelFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ConvectModelFamilies.xml new file mode 100644 index 0000000000..946fe9399d --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ConvectModelFamilies.xml @@ -0,0 +1,631 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml deleted file mode 100644 index 3f95520bfb..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/ModelFamilies.xml +++ /dev/null @@ -1,921 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterFamily.xml new file mode 100755 index 0000000000..d0b145fce4 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterFamily.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterFnFourPanelFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterFnFourPanelFamily.xml new file mode 100755 index 0000000000..e603987541 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterFnFourPanelFamily.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterModelFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterModelFamilies.xml new file mode 100755 index 0000000000..43abcbd0ce --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/WinterModelFamilies.xml @@ -0,0 +1,373 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml index c219f9722e..160eeeed34 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFamilies.xml @@ -32,49 +32,71 @@ - - - - - - + + + + + + + menuText="GFS20" id="gfs20" useReferenceTime="true"> + + + + + - + - + - + + - + + - + + + + + @@ -93,6 +115,12 @@ + + @@ -104,6 +132,12 @@ + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml index 423a23da3b..a8cddafbee 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseFourPanelFamilies.xml @@ -19,9 +19,21 @@ further_licensing_information. --> + - + @@ -30,13 +42,13 @@ - + menuText="GFS20" id="gfs204panel" useReferenceTime="true"> + - + + menuText="GFS" id="gfs1deg4panel" useReferenceTime="true"> diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml index 1f42037ec5..37fb4369b9 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseStdEnvPackage.xml @@ -19,9 +19,6 @@ further_licensing_information. --> - - @@ -39,8 +36,8 @@ - + menuText="GFS20" id="gfs20stdenv" useReferenceTime="true"> + @@ -49,5 +46,5 @@ - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml index 2e68e932cc..ba8626cc99 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseSurfaceFamilies.xml @@ -20,54 +20,87 @@ --> - + menuText="ECMWF-HiRes" id="ecmwf" useReferenceTime="true"> + + + + + + + + - - - - - + + - + + - - - - + menuText="HRRR" id="HRRR" useReferenceTime="true"> + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/hailFamily.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/hailFamily.xml new file mode 100755 index 0000000000..ce35f06de5 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/hailFamily.xml @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml index fc2ce238cd..6d2701b27d 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/index.xml @@ -20,10 +20,7 @@ --> - - + @@ -32,22 +29,67 @@ + + + + + + + + + - - - - + --> + + + + + - - + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planViewTimeSeries.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planViewTimeSeries.xml index a8f846e4de..07a029a4fa 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planViewTimeSeries.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planViewTimeSeries.xml @@ -19,46 +19,80 @@ further_licensing_information. --> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/hgtPres.xml" /> - - + + + + + + + + + + + + + + + + + - - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/vort.xml" /> + + + + + + + + + - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/winter.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/tstorms.xml" /> - + - + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/basic.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/basic.xml deleted file mode 100644 index 64022c9f44..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/basic.xml +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived.xml deleted file mode 100644 index 736ccac597..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived.xml +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/geostrophic.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/geostrophic.xml deleted file mode 100644 index b6f2ea2925..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/geostrophic.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/temperature.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/temperature.xml deleted file mode 100644 index de65b4704b..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/temperature.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/vorticity.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/vorticity.xml deleted file mode 100644 index f0c9868f49..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/vorticity.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble.xml index 4f2a5acbb0..f11fd34982 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble.xml @@ -23,8 +23,13 @@ + + + + - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/GFS.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/GFS.xml index 5d38e628d5..266d8820d9 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/GFS.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/GFS.xml @@ -19,60 +19,75 @@ further_licensing_information. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFProbabilities.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREF.xml similarity index 53% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFProbabilities.xml rename to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREF.xml index 2f998fbad8..9b1190139a 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFProbabilities.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREF.xml @@ -19,63 +19,49 @@ further_licensing_information. --> - + + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/hgtPres.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/moist.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/precip.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/ptype.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/snowfall.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/temp.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/tstorms.xml" /> - - + + - - - - - - - - - - - - + fileName="menus/volumebrowser/fields/planview-timeseries/ensemble/sref/wind.xml" /> + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFMeans.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFMeans.xml deleted file mode 100644 index c80b316d4f..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFMeans.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFSpreads.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFSpreads.xml deleted file mode 100644 index 45e639d708..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/SREFSpreads.xml +++ /dev/null @@ -1,49 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml new file mode 100644 index 0000000000..9683559dc6 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/aviation.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceVisibility.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/hgtPres.xml similarity index 72% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceVisibility.xml rename to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/hgtPres.xml index 36fca091f9..1335d4abd1 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceVisibility.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/hgtPres.xml @@ -19,8 +19,10 @@ further_licensing_information. --> - - + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/QG.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/moist.xml similarity index 62% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/QG.xml rename to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/moist.xml index 5b96a1ea4e..c4a1059e62 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/QG.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/moist.xml @@ -19,16 +19,12 @@ further_licensing_information. --> - - - - - - + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/precip.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/precip.xml new file mode 100644 index 0000000000..615cf2d093 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/precip.xml @@ -0,0 +1,64 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/ptype.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/ptype.xml new file mode 100644 index 0000000000..dfe949cca8 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/ptype.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/snowfall.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/snowfall.xml new file mode 100644 index 0000000000..3168e9f1dc --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/snowfall.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/temperature.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/temp.xml similarity index 78% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/temperature.xml rename to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/temp.xml index e2b2452633..5c08db8163 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/temperature.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/temp.xml @@ -19,6 +19,9 @@ further_licensing_information. --> - + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/tstorms.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/tstorms.xml new file mode 100644 index 0000000000..5bd4485748 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/tstorms.xml @@ -0,0 +1,36 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefmeans/QPF.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/wind.xml similarity index 55% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefmeans/QPF.xml rename to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/wind.xml index f22d7052cd..47ab618bdb 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefmeans/QPF.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/sref/wind.xml @@ -19,12 +19,14 @@ further_licensing_information. --> - - - - + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefmeans/categoricalPrecip.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefmeans/categoricalPrecip.xml deleted file mode 100644 index a69efd4bb4..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefmeans/categoricalPrecip.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/12hrQPF.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/12hrQPF.xml deleted file mode 100644 index 87deeea757..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/12hrQPF.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/12hrSnowfall.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/12hrSnowfall.xml deleted file mode 100644 index 34cf6d722b..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/12hrSnowfall.xml +++ /dev/null @@ -1,42 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/24hrQPF.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/24hrQPF.xml deleted file mode 100644 index aaeaa33228..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/24hrQPF.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/3hrQPF.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/3hrQPF.xml deleted file mode 100644 index 5de340482b..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/3hrQPF.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/6hrQPF.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/6hrQPF.xml deleted file mode 100644 index 6bd8944c67..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/6hrQPF.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/categoricalPrecip.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/categoricalPrecip.xml deleted file mode 100644 index bd03a07f8f..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/categoricalPrecip.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/cloudCeilingHeight.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/cloudCeilingHeight.xml deleted file mode 100644 index 8cc2c19a9d..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/cloudCeilingHeight.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/parcelLiftedIndex.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/parcelLiftedIndex.xml deleted file mode 100644 index f058677855..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/parcelLiftedIndex.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceBasedCAPE.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceBasedCAPE.xml deleted file mode 100644 index 5dcadc31bc..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceBasedCAPE.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceWindSpeed.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceWindSpeed.xml deleted file mode 100644 index 2a5417a18d..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefprobabilities/surfaceWindSpeed.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefspreads/QPF.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefspreads/QPF.xml deleted file mode 100644 index f8fe703c50..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefspreads/QPF.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefspreads/categoricalPrecip.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefspreads/categoricalPrecip.xml deleted file mode 100644 index 407d68a921..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/ensemble/srefspreads/categoricalPrecip.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/forcing.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/forcing.xml new file mode 100644 index 0000000000..029408f34c --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/forcing.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/hgtPres.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/hgtPres.xml new file mode 100644 index 0000000000..2d9389a9bf --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/hgtPres.xml @@ -0,0 +1,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/isent.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/isent.xml new file mode 100644 index 0000000000..a9f16b0d97 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/isent.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml similarity index 57% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml rename to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml index 3079a3a629..3e8be73eda 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2D.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/misc.xml @@ -18,39 +18,19 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - - - + + + + fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml" /> - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/ECMWFHiRes.xml" /> - - - - - - - - - - - - - - - - + + @@ -59,33 +39,33 @@ - - + + - + + + + + - - + + + fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/NAMDNG5km.xml" /> - - + + - - - - - - + + @@ -95,13 +75,37 @@ fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/PHISHAboveGround.xml" /> - + - - + fileName="menus/volumebrowser/fields/planview-timeseries/sfc2d/TPCGuidance.xml" /> + + - + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/moist.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/moist.xml new file mode 100644 index 0000000000..6053ba0e1d --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/moist.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml deleted file mode 100644 index 3f1614cd89..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other/baumgardt.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other/baumgardt.xml deleted file mode 100644 index 784aa644a6..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other/baumgardt.xml +++ /dev/null @@ -1,340 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/precip.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/precip.xml new file mode 100644 index 0000000000..414183dd7b --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/precip.xml @@ -0,0 +1,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/radar.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/radar.xml index 33f16676a6..455ab67540 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/radar.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/radar.xml @@ -19,54 +19,24 @@ further_licensing_information. --> - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/MSLPress.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/MSLPress.xml deleted file mode 100644 index 3841c9d2a2..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/MSLPress.xml +++ /dev/null @@ -1,44 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/frontogenesis.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml similarity index 55% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/frontogenesis.xml rename to cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml index c20548c358..5040f304ef 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/frontogenesis.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/aviation.xml @@ -19,18 +19,12 @@ further_licensing_information. --> - - - - - - - + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/precip.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/precip.xml deleted file mode 100644 index a4c0703371..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/sfc2d/precip.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/stability.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/stability.xml new file mode 100644 index 0000000000..be650d2cc5 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/stability.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/temp.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/temp.xml new file mode 100644 index 0000000000..181f9732ad --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/temp.xml @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/tstorms.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/tstorms.xml new file mode 100644 index 0000000000..b212db3d57 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/tstorms.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/vort.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/vort.xml new file mode 100644 index 0000000000..4a96f5300b --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/vort.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml index d823a5f351..553e54bc65 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/wind.xml @@ -19,44 +19,37 @@ further_licensing_information. --> - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/winter.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/winter.xml new file mode 100644 index 0000000000..b882f6dccb --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/winter.xml @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planViewTime-timeSeries.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planViewTime-timeSeries.xml index 243c2bda71..8fccb44fe2 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planViewTime-timeSeries.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planViewTime-timeSeries.xml @@ -44,7 +44,7 @@ - + @@ -55,9 +55,5 @@ fileName="menus/volumebrowser/planes/planviewtime-timeseries/misc.xml" /> - - - - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/hgt.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/hgt.xml index 790b931d89..47a8fe6e89 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/hgt.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/hgt.xml @@ -20,7 +20,7 @@ --> + key="54ftAgl" indentText="false" /> - + + + + + - + - + - + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/hgt/kftAGL.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/hgt/kftAGL.xml index bae1685314..fa7c84e838 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/hgt/kftAGL.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/hgt/kftAGL.xml @@ -19,10 +19,24 @@ further_licensing_information. --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/lyrs.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/lyrs.xml deleted file mode 100644 index 440202aa40..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/lyrs.xml +++ /dev/null @@ -1,100 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/lyrs/thinLayers.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/lyrs/thinLayers.xml deleted file mode 100644 index 2f8bcc1dbb..0000000000 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/lyrs/thinLayers.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml index 265ffe28c8..35455f938a 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/misc.xml @@ -19,30 +19,59 @@ further_licensing_information. --> - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + key="ML" indentText="false" /> + + + + + + + + + - - - - - - - - - - - - - + key="SIG0.8-0.5" indentText="false" /> - + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/pres.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/pres.xml index 02e68e5078..1d054e34b2 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/pres.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/pres.xml @@ -61,4 +61,8 @@ + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/pres/StandardLayers.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/pres/StandardLayers.xml new file mode 100644 index 0000000000..cfc0686988 --- /dev/null +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/pres/StandardLayers.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/temp.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/temp.xml index 014fa46244..f67886d911 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/temp.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/temp.xml @@ -19,46 +19,56 @@ further_licensing_information. --> - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/theta.xml b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/theta.xml index 75da54a56b..6640ec5112 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/theta.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/planes/planviewtime-timeseries/theta.xml @@ -19,62 +19,90 @@ further_licensing_information. --> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml index 52a44abae8..85c22d4927 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml +++ b/cave/com.raytheon.viz.volumebrowser/localization/volumebrowser/LevelMappingFile.xml @@ -19,10 +19,14 @@ further_licensing_information. --> - - - + + + + + + @@ -32,10 +36,10 @@ - + - + @@ -64,7 +68,7 @@ - + @@ -85,10 +89,10 @@ - + - + @@ -100,7 +104,7 @@ - + @@ -371,32 +375,85 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -482,6 +539,30 @@ + + + + + + + + + + + + + + + + + + + + + + + + @@ -606,30 +687,39 @@ - + - - + - - - - - + + + + + + + + + + + @@ -678,7 +768,7 @@ - + @@ -722,104 +812,108 @@ - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - + + + - - - - - @@ -1202,14 +1296,14 @@ - + - + @@ -1334,12 +1428,20 @@ - - - + + + + + + + + + @@ -1348,6 +1450,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1366,10 +1642,6 @@ - - - diff --git a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java index a924f347e2..ed6c4f7d6e 100644 --- a/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java +++ b/cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenLayer.java @@ -235,6 +235,7 @@ import com.vividsolutions.jts.io.WKTReader; * 11/03/2014 3353 rferrel Ignore GeoSpatialData notification when this is the instance layer will do an update. * 02/09/2015 3954 dlovely Only draw "W" if the county is displayed. * 02/25/2014 3353 rjpeter Fix synchronized use case, updated to not create dialog before init is finished. + * 04/24/2015 ASM #17394 D. Friedman Fix geometries that become invalid in local coordinate space. * * * @author mschenke @@ -1363,6 +1364,44 @@ public class WarngenLayer extends AbstractStormTrackResource { gData.localToLatLon = gData.latLonToLocal.inverse(); for (GeospatialData gd : gData.features) { Geometry local = JTS.transform(gd.geometry, gData.latLonToLocal); + if (! local.isValid()) { + TopologyException topologyException = null; + try { + CountyUserData userData = (CountyUserData) local.getUserData(); + local = local.buffer(0.0); + GeometryUtil.setUserData(local, userData); + } catch (TopologyException e) { + topologyException = e; + } + // Try to generate user-readable area name... + String ident = null; + try { + String name = (String) gd.attributes.get("NAME"); + if (name == null) { + name = (String) gd.attributes.get("COUNTYNAME"); + } + if (name != null) { + ident = String.format("%s (gid=%s)", name, gd.attributes.get(WarngenLayer.GID)); + } + } catch (RuntimeException e) { + // ignore + } + // ...Fall back to displaying attributes map. + if (ident == null) { + ident = gd.attributes.toString(); + } + Priority priority; + String format; + if (local.isValid()) { + format = "Geometry for area %s was invalid. It has been repaired."; + priority = Priority.INFO; + } else { + format = "Geometry for %s is invalid and cannot be repaired. Hatching this area may not be possible."; + priority = Priority.WARN; + } + statusHandler.handle(priority, String.format(format, ident), + topologyException); + } gd.attributes.put(AREA, local.getArea()); gd.attributes.put(GeospatialDataList.LOCAL_GEOM, local); gd.attributes.put(GeospatialDataList.LOCAL_PREP_GEOM, diff --git a/edexOsgi/build.edex/opt/db/ddl/maps/importMarkersInfo.sh b/edexOsgi/build.edex/opt/db/ddl/maps/importMarkersInfo.sh index c0467cd852..866e4355e9 100755 --- a/edexOsgi/build.edex/opt/db/ddl/maps/importMarkersInfo.sh +++ b/edexOsgi/build.edex/opt/db/ddl/maps/importMarkersInfo.sh @@ -72,7 +72,7 @@ ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} -c " USING gist (the_geom); " -sed -e "s/'/''/g;s/^[[:digit:]]*//;s/[[:blank:]]*\\([-\.[:digit:]]*\)[[:blank:]]\{1,\}\([-\.[:digit:]]*\)[[:blank:]]\{1,\}\([-\.[:digit:]]*\)[[:blank:]]\{1,\}p[[:blank:]]*\\([[:digit:]]*\)[[:blank:]]*\\([^|]*\)|\([[:digit:]]*\).*/INSERT INTO \"${SCHEMA}\".\"${TABLE}\"(id,name,warngenlev,the_geom) VALUES(\4,'\5',\6,GeomFromText('POINT(\3 \2)',4326));/" $FILEPATH | \ +sed -n "s/'/''/g;s/^[[:digit:]]|[[:blank:]][:digit:]*//;s/[[:blank:]]*\\([-\.[:digit:]]*\)[[:blank:]]\{1,\}\([-\.[:digit:]]*\)[[:blank:]]\{1,\}\([-\.[:digit:]]*\)[[:blank:]]\{1,\}p[[:blank:]]*\\([[:digit:]]*\)[[:blank:]]*\\([^|]*\)|\([[:digit:]]*\).*/INSERT INTO "${SCHEMA}"\."${TABLE}"(id,name,warngenlev,the_geom) VALUES(\4,'\5',\6,GeomFromText('POINT(\3 \2)',4326));/p" $FILEPATH | \ ${PSQLBINDIR}psql -d maps -U ${PGUSER} -q -p ${PGPORT} ${PGBINDIR}vacuumdb -d maps -t ${SCHEMA}.${TABLE} -U ${PGUSER} -p ${PGPORT} -qz diff --git a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java index 616f39c708..4dc678f730 100644 --- a/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java +++ b/edexOsgi/com.raytheon.edex.plugin.obs/src/com/raytheon/edex/plugin/obs/metar/MetarDecoder.java @@ -85,6 +85,7 @@ import com.vividsolutions.jts.geom.impl.CoordinateArraySequence; * May 14, 2014 2536 bclement moved WMO Header to common, removed TimeTools usage * Jul 23, 2014 3410 bclement location changed to floats * Oct 02, 2014 3693 mapeters Added Pattern constants. + * Apr 22, 2015 DR 16923 MPorricelli Modified cleanMessage to eliminate extra spaces * * * @@ -988,7 +989,8 @@ public class MetarDecoder extends AbstractDecoder { } /** - * Get rid of any control characters prior to parsing data. + * Get rid of any control characters and extraneous spaces + * prior to parsing data. * * @param message * @return @@ -998,14 +1000,17 @@ public class MetarDecoder extends AbstractDecoder { char lastChar = 0; for (int i = 0; i < message.length(); i++) { char c = message.charAt(i); - if (c < ' ') { - if (lastChar != c) { - sb.append(' '); + // if current char is a control char or space and prev char is + // not a space, then add a space to string + if (c <= ' ') { + if (lastChar != ' ') { + sb.append(' '); + lastChar = ' '; } } else { sb.append(c); + lastChar = c; } - lastChar = c; } return sb.toString(); } diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Reflectivity PType.cmap b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Reflectivity PType.cmap new file mode 100755 index 0000000000..28524a6388 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/colormaps/Grid/Reflectivity PType.cmap @@ -0,0 +1,259 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/50dbzZ.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/50dbzZ.xml index cb4ea0e783..3ebf24a47f 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/50dbzZ.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/50dbzZ.xml @@ -27,15 +27,15 @@ AWIPS II NEW FILE - 50dbzZ.xml --> - + - + - + - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/BlkShr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/BlkShr.xml index 0b69b32192..6ca875f9d2 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/BlkShr.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/BlkShr.xml @@ -23,4 +23,8 @@ + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CXR.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CXR.xml index 1929eb06db..bd7ec7ed04 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CXR.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CXR.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CapeStk.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CapeStk.xml index 060e9bd08c..a6c4995987 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CapeStk.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CapeStk.xml @@ -23,25 +23,25 @@ to Union to avoid pulling in extra levels, specifically levels defined at kft heights. --> - + - + - + - + @@ -49,7 +49,7 @@ - + @@ -58,7 +58,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -97,7 +97,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -132,6 +132,94 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CritT1.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CritT1.xml index 61b8bec853..25258b8ba1 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CritT1.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/CritT1.xml @@ -20,7 +20,7 @@ NEW FILE - CritT1.xml --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/EPVt2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/EPVt2.xml index 8a685375c5..1c6bd8c1f8 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/EPVt2.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/EPVt2.xml @@ -15,16 +15,11 @@ NEW FILE - EPVt2.xml --> + - + + - - - - - - - - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Fzra2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Fzra2.xml index 1fdfe96612..ddfc6b8c27 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Fzra2.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Fzra2.xml @@ -25,17 +25,36 @@ FIELD: |1554.| FIELD: |1.e37| FIELD: |Fzra1| +FZRA thickness criteria: +1000-850 mb thickness 1300m or less +850-700 mb thickness 1553m or greater --> - + + + + + + + + + + + + - + - + - + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICI.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICI.xml index d80ab278ee..0deacb94fc 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICI.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICI.xml @@ -18,4 +18,8 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICNG.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICNG.xml index 2df7fd6c62..053127b98b 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICNG.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICNG.xml @@ -18,4 +18,12 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICPRB.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICPRB.xml index b40fe78ee3..fa51159c4e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICPRB.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/ICPRB.xml @@ -18,4 +18,8 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/LM5.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/LM5.xml index fc6fbe6d7c..c4ae1431ae 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/LM5.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/LM5.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other/baumgardt/thom.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MCon2.xml old mode 100644 new mode 100755 similarity index 67% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other/baumgardt/thom.xml rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MCon2.xml index 321e20c3df..f705f8b08c --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/other/baumgardt/thom.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MCon2.xml @@ -1,4 +1,4 @@ - + - - - - - \ No newline at end of file + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/moisture.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxDVV.xml similarity index 66% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/moisture.xml rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxDVV.xml index 538636d959..3f8224ed0b 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volumebrowser/fields/planview-timeseries/derived/moisture.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxDVV.xml @@ -1,4 +1,4 @@ - + - - - - - \ No newline at end of file + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxGRPL1hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxGRPL1hr.xml new file mode 100644 index 0000000000..52a36e9924 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxGRPL1hr.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxREF1hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxREF1hr.xml new file mode 100644 index 0000000000..e1721165a3 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxREF1hr.xml @@ -0,0 +1,28 @@ + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxUPHL1hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxUPHL1hr.xml new file mode 100644 index 0000000000..4747bed362 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxUPHL1hr.xml @@ -0,0 +1,28 @@ + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxUVV.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxUVV.xml new file mode 100644 index 0000000000..4a0d92ec82 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxUVV.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWGS1hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWGS1hr.xml new file mode 100644 index 0000000000..806ceb2897 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWGS1hr.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWind1hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWind1hr.xml new file mode 100755 index 0000000000..dbc0c71b39 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MaxWind1hr.xml @@ -0,0 +1,26 @@ + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Mix2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Mix2.xml index aa0063dd22..ef3fe36fc6 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Mix2.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Mix2.xml @@ -28,21 +28,40 @@ FIELD: |1554.| FIELD: |1.e37| FIELD: |0.| +Mix thickness criteria: +1000-850 mb thickness 1300m or less +850-700 mb thickness 1541-1553m --> - + + + + + + + + + + + + - + - - - + + + - + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MnT.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MnT.xml index bf1ef036d9..575f77b1b8 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MnT.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MnT.xml @@ -1,28 +1,12 @@ - - + - - - - - - + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MxT.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MxT.xml index 218a3cbb18..38fc423ff6 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MxT.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/MxT.xml @@ -25,4 +25,7 @@ + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/PW.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/PW.xml index d3c89b9e86..c03b2967b6 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/PW.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/PW.xml @@ -31,4 +31,7 @@ + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/PW2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/PW2.xml new file mode 100755 index 0000000000..d98499d0e6 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/PW2.xml @@ -0,0 +1,25 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RM5.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RM5.xml index 1f0503c5a2..87c4f6a3cf 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RM5.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RM5.xml @@ -18,9 +18,13 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RRtype.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RRtype.xml new file mode 100644 index 0000000000..eb074e23db --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/RRtype.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Rain3.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Rain3.xml index 40e4ae48cf..bbdf9d6392 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Rain3.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Rain3.xml @@ -25,9 +25,36 @@ FIELD: |2870.| FIELD: |1.e37| FIELD: |Rain2| +Rain thickness criteria: +1000-850 mb thickness 1291m or more +850-700 mb thickness 1552m or more +1000-700 mb thickness 2870m or more + --> - + + + + + + + + + + + + + + + + + + + + + + + @@ -36,6 +63,12 @@ FIELD: |Rain2| - + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SA24hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SA24hr.xml index d487eee9b7..2079acc0a9 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SA24hr.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SA24hr.xml @@ -23,4 +23,10 @@ + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SA6hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SA6hr.xml index 8cc3159d9e..700a1d06ba 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SA6hr.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SA6hr.xml @@ -19,14 +19,18 @@ further_licensing_information. --> - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SAmodel.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SAmodel.xml index 37c896e338..08bbbae8ee 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SAmodel.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SAmodel.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SArun.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SArun.xml index 75b4a2c807..231d3d508c 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SArun.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SArun.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDEN.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDEN.xml new file mode 100755 index 0000000000..79f2820f70 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDEN.xml @@ -0,0 +1,2 @@ + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENCLIMO.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENCLIMO.xml new file mode 100755 index 0000000000..4090b3c242 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENCLIMO.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENGFS.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENGFS.xml new file mode 100755 index 0000000000..c1803910d1 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENGFS.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENMEAN.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENMEAN.xml new file mode 100755 index 0000000000..12f3935f42 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENMEAN.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENNAM.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENNAM.xml new file mode 100755 index 0000000000..39324bbc34 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SDENNAM.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SNSQ.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SNSQ.xml new file mode 100755 index 0000000000..3313948615 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/SNSQ.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/STP.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/STP.xml new file mode 100644 index 0000000000..4b9f6039ef --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/STP.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Snow3.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Snow3.xml index c0cfc1fe6a..88f6593831 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Snow3.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Snow3.xml @@ -24,17 +24,49 @@ FIELD: |2851.| FIELD: |1.e37| FIELD: |0.| +Snow thickness criteria: +1000-850 mb thickness 1299m or less +850-700 mb thickness 1541m or less +1000-700 mb thickness 2850m or less + --> - + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TOTSN12hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TOTSN12hr.xml new file mode 100755 index 0000000000..c6e41bdf13 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TOTSN12hr.xml @@ -0,0 +1,26 @@ + + + + + + + + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP24hr_std.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP24hr_std.xml new file mode 100644 index 0000000000..d04bf518ab --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TP24hr_std.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPrun.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPrun.xml index 3c07a7ed88..4c6e0dad69 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPrun.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/TPrun.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Tdend.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Tdend.xml new file mode 100755 index 0000000000..7a0f576ac6 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Tdend.xml @@ -0,0 +1,32 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Tstk.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Tstk.xml index 6b5e4375b1..bdb7bc668e 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Tstk.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Tstk.xml @@ -27,7 +27,7 @@ AWIPS II NEW FILE - Tstk.xml --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Twstk.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Twstk.xml index 468e3a403d..e4b87cc89b 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Twstk.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/Twstk.xml @@ -23,7 +23,7 @@ AWIPS II NEW FILE - Twstk.xml --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/WEASD.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/WEASD.xml index 8e62e48e59..a7d2b2dac4 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/WEASD.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/WEASD.xml @@ -18,4 +18,4 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - \ No newline at end of file + \ No newline at end of file diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/WGSMX1hr.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/WGSMX1hr.xml new file mode 100755 index 0000000000..a4b250860a --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/WGSMX1hr.xml @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/dP.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/dP.xml new file mode 100755 index 0000000000..c9e593fccd --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/dP.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/geoWM.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/geoWM.xml index 277acf8720..e35ced9a57 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/geoWM.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/geoWM.xml @@ -18,7 +18,7 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/maxEPT.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/maxEPT.xml index 824c4c5773..3e2cbe0c8b 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/maxEPT.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/maxEPT.xml @@ -18,16 +18,19 @@ FIELD: |CONTOUR,IMAGE,OTHER| FIELD: |0-3kmAgl| FIELD: |EPT| - FIELD: |maxEPT,0-3kmAgl| + FIELD: |maxEPT,0-3kmAgl| - NEW FILE - maxEPT.xml + NEW FILE - maxEPT.xml --> - - - - - - + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/minEPT.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/minEPT.xml index 938a3b9e19..9da7acd318 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/minEPT.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/minEPT.xml @@ -22,14 +22,14 @@ AWIPS II NEW FILE - minEPT.xml --> - - + + - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/qpv1.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/qpv1.xml index 4899296e03..c2281864e4 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/qpv1.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/qpv1.xml @@ -30,7 +30,7 @@ NEW FILE - QPV1.xml --> - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/qpv2.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/qpv2.xml index 50ce5bd47a..ac314944f3 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/qpv2.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/qpv2.xml @@ -27,15 +27,15 @@ NEW FILE - QPV2.xml --> - + - + - + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_CLIMO.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_CLIMO.xml new file mode 100755 index 0000000000..330d57eef7 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_CLIMO.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_GFS.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_GFS.xml new file mode 100755 index 0000000000..0885937db7 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_GFS.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_MEAN.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_MEAN.xml new file mode 100755 index 0000000000..9be6dbba18 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_MEAN.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_NAM.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_NAM.xml new file mode 100755 index 0000000000..0f4dde1682 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/s2H2O_NAM.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatCrocus.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatCrocus.xml new file mode 100755 index 0000000000..7d0b958a87 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatCrocus.xml @@ -0,0 +1,51 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseComparisonFamilies.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatEMCSREF.xml similarity index 59% rename from cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseComparisonFamilies.xml rename to edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatEMCSREF.xml index 9cae976ee2..17c6f4ec53 100644 --- a/cave/com.raytheon.viz.volumebrowser/localization/menus/volume/baseComparisonFamilies.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatEMCSREF.xml @@ -18,13 +18,18 @@ See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for further_licensing_information. --> - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPC.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPC.xml new file mode 100755 index 0000000000..58b2fa482b --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPC.xml @@ -0,0 +1,28 @@ + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPCdeep.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPCdeep.xml new file mode 100755 index 0000000000..53b87bc04f --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPCdeep.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPCsurface.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPCsurface.xml new file mode 100755 index 0000000000..8279b161a4 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatSPCsurface.xml @@ -0,0 +1,46 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatWPC.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatWPC.xml new file mode 100644 index 0000000000..2c757e7b42 --- /dev/null +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/snoRatWPC.xml @@ -0,0 +1,9 @@ + + + + + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/stp1.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/stp1.xml index f312fa4f06..dbe7c7d2f6 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/stp1.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/derivedParameters/definitions/stp1.xml @@ -4,8 +4,8 @@ STP1 | | |Sig. Tornado Parameter (>1 Sig Tor) ||CONTOUR,IMAGE,OTHER|Layer|\ *Difference|2000.|MLLCL,ML --> - + + - diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml index 52b707a4d9..eb15de0a8a 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dArrowStyleRules.xml @@ -130,6 +130,7 @@ g*m/(kg*s) + 0.10 diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml index 482e3e3b39..18e6e44ba5 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/d2dContourStyleRules.xml @@ -4239,6 +4239,7 @@ in | .03937 | 0 | 4 | | |..|8000F0FF| | 16 | \ + ft @@ -4260,6 +4261,510 @@ in | .03937 | 0 | 4 | | |..|8000F0FF| | 16 | \ + + + + + zAGL + + + ft + + 1000 + + + + + + Tdend + + + C + + -12 -13 -14 -15 -16 -17 -18 + + + + + + SnowT + + + C + + 0 -5 -15 + + + + + + QPV1 + + + K/(m^2/s)*1.0E16 + + -1 -2 -3 -5 -10 -20 -30 -50 -100 -200 + + + + + + QPV2 + + + K/hPa/s*1.0E-5 + + -1.0 -.50 -.25 0 .1 .25 + + + + + + + TW + + 0 + + + + C + + 5 + + + + + + + T + + 0 + + + + C + + 5 + + + + + + + Tmax + TwMax + + + C + + 5 + + + + + + CritT1 + + + C + + -12. -10. -8. -6. -4. + + + + + + 0mDiff + + + mb + + 50 + + + + + + + 50dbzZ + + + ft + + 1000 + + + + + + PBE + CAPE + cCape + muCape + dCape + + + J/kg + + 500 + + + + + + dCape + + + J/kg + + 200 + + + + + + loCape + + + J/kg + + 50 + + + + + + PBE2 + + + J/kg + + 1000 1500 2000 25000 3000 3500 4000 + + + + + + NBE2 + + + J/(kg*-1) + + 120 100 80 60 40 20 0 + + + + + + VGP + + + + + 0.20 + + + + + + Heli + HeliC + HeliD + + + + + 0 100 200 300 400 500 600 + + + + + + MLLCL + + + ft + + 500 1000 1500 2000 2500 3000 3500 4000 + + + + + + dPW6hr + dPW3hr + + + in + + .2 .4 .6 .8 1.0 1.2 + + + + + + dPW1hr + + + in + + .1 .2 .4 .6 + + + + + + Thom6 + SRMmM + SRMlM + SRMrM + CumShr + + + kts + + 5 + + + + + + BlkMag + + 06000 + + + + kts + + 20 25 30 35 40 45 50 55 60 65 70 75 80 + + + + + + BlkMag + + 03000 + + + + kts + + 15 20 25 30 35 40 45 50 + + + + + + CIN + cCin + + + J/kg + + 50 + + + + + + NBE + + + J/(kg*-1) + + 50 + + + + + + EHI + EHI01 + + + + + 0.5 1.0 1.5 2.0 2.5 3.0 3.5 4.0 + + + + + + gammaE + + + K/km + + 2 + + + + + + NST + STP + StrTP + + + + + .5 1.0 1.5 2.0 2.5 3.0 3.5 4.0 + + + + + + SuCP + SNSQ + BSII + + + + + .5 1 1.5 2 2.5 3 3.5 4 4.5 5 6 8 10 + + + + + + ESP + + + + + 25 + + + + + + SSP + + + + + 5000 + + + + + + 3VGP1SHR + + + + + 2 5 10 15 20 25 30 35 40 45 50 60 70 80 + + + + + + BdEPT06 + + + K + + 2 + + + + + + minEPT + maxEPT + + + K + + 5 + + + + + + RadarT + + + C + + 0 -20 + + + + + + + MMP + + + + + 10 + + + + + + WCD + + + m + + 3500 4000 4500 5000 + + + + + + PW2 + + + in + + 1.4 1.5 1.6 1.8 2.0 2.2 2.4 + + + + + + PW2 + Laps + + + in + + 1.4 1.5 1.6 1.8 2.0 2.2 2.4 + + + + + + MCon2 + + + (g/kg)/h*12 + + -200 -100 -50 -20 -10 -5 + + + + + + snoRatCrocus + snoRatSPC + snoRatEMCSREF + snoRatWPC + + + + 5 + + + + @@ -4272,4 +4777,4 @@ in | .03937 | 0 | 4 | | |..|8000F0FF| | 16 | \ ft - \ No newline at end of file + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml index dc65d21567..365cfa3b04 100644 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.grid/utility/common_static/base/styleRules/gridImageryStyleRules.xml @@ -1920,22 +1920,22 @@ * fGen K^2/m^2/1e15s |1e15| 0.0 | .5 | 35 |x|m| 29 | 5 | 1 2 5 10 20 --> - - - fGen - - - K^2/(m^2/s)*1.0E15 - - 0.5 - 35 - - Grid/gridded data - - 1 2 5 10 20 - - - + + + fGen + + + K^2/(m^2/s)*1.0E15 + + 0.5 + 35 + + Grid/gridded data + + 1 2 5 10 20 + + + - - - PFrnt - - - K/m/s*1.0E-10 - Grid/gridded data - - + + + PFrnt + + + + -100 + 100 + + K/m/s*1.0E-10 + Grid/gridded data + + 20 + + + + + + 50dbzZ + + + ft + + 0 + 50000 + + Grid/gridded data + + 10000 + + + + + + RRtype + + + dB + + 0 + 321 + + Grid/Reflectivity PType + false + + + + + + + + + + + + WCD + + + m + + 0 + 6000 + + Grid/gridded data + + 2000 + + + diff --git a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm index 6131322411..5ba18f8bf1 100755 --- a/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm +++ b/edexOsgi/com.raytheon.uf.common.dataplugin.warning/utility/common_static/base/warngen/VM_global_library.vm @@ -16,6 +16,8 @@ ##### Qinglu Lin 09-15-2014 ASM #15551. Overhauled inserttorwatches and insertsvrwatches, added until. ##### Qinglu Lin 10-06-2014 ASN #556. Updated secondBullet. ##### Evan Bookbinder 10-24-2014 Fixed UGC > 500 check for Indep Cities in svrl macros to ignore zone codes +##### Evan Bookbinder 3-30-2015 Fixed wording for Independent Cities not in VA +##### Fixed dupCounties.vm not working due a variable switch in HeadlineLocList and ZoneHeadlineLocList #################################################################################################### #* Mile Marker Test Code @@ -574,7 +576,7 @@ ${closestPoint.roundedDistance} ${units} #direction(${closestPoint.oppositeRound ### CHECK FOR DUPLICATE COUNTY NAMES WITHIN A CWA #parse("dupCounties.vm") #foreach (${area} in ${areas}) -#if(${list.contains($dupcounties, "${area.state_zone}")}) +#if(${list.contains($dupcounties, "${area.fips}")}) #set($useStates = true) #end #end @@ -825,10 +827,20 @@ ${prevState}## #if(${indepCityCount} == 1) ### COUNTIES + 1 INDEPENDENT CITY #if(${numCounties} > ${numIndepCity}) +### CHANGE EB 3/30/15 FOR INDEPENDENT CITY PHRASING +#if(${area.name.contains("City of")}) AND THE ${area.name}## +#else + AND ${area.name}## +#end +### END EB CHANGE ### NO COUNTIES AND ONE INDEPENDENT CITY #else +### CHANGE EB 3/30/15 FOR INDEPENDENT CITY PHRASING +#if(${area.name.contains("City of")}) THE ## +#end +### END EB CHANGE #if(${area.partOfArea}) #areaFormat(${area.partOfArea} ${useCentralCounty} ${useExtremeCounty} true)## #end @@ -836,14 +848,26 @@ ${area.name}## #end #else ## MULTIPLE INDEPENDENT CITIES...LAST ITEM IN THE LIST - AND THE ## +### CHANGE EB 3/30/15 FOR INDEPENDENT CITY PHRASING +#if(${area.name.contains("City of")}) + AND THE ${area.name}## +#else + AND ${area.name}## +#end +### END EB CHANGE #if(${area.partOfArea}) #areaFormat(${area.partOfArea} ${useCentralCounty} ${useExtremeCounty} true)## #end ${area.name}## #end #else +### CHANGE EB 3/30/15 FOR INDEPENDENT CITY PHRASING +#if(${area.name.contains("City of")}) ...THE ## +#else +...## +#end +### END EB CHANGE #if(${area.partOfArea}) #areaFormat(${area.partOfArea} ${useCentralCounty} ${useExtremeCounty} true)## #end @@ -870,7 +894,7 @@ ${area.name}## ### CHECK FOR DUPLICATE COUNTY NAMES WITHIN A CWA #parse("dupCounties.vm") #foreach (${area} in ${areas}) -#if(${list.contains($dupcounties, "${area.fips}")}) +#if(${list.contains($dupcounties, "${area.state_zone}")}) #set($useStates = true) #end #end @@ -1074,7 +1098,11 @@ THE ## ${area.name}... ##OUTPUT FOR INDEPENDENT CITIES #else +### CHANGE EB 3/30/15 FOR INDEPENDENT CITY PHRASING +#if(${area.name.contains("City of")}) THE ## +#end +### END EB CHANGE #if(${area.partOfArea}) #areaFormat(${area.partOfArea} true false true)## #end @@ -1166,14 +1194,21 @@ THE FOLLOWING COUNTIES AND PARISHES... ##OUTPUT FOR D.C. #elseif (${area.stateabbr} == "DC") - THE ## + THE ## #if(${area.partOfArea}) #set($partOfArea = "#areaFormat(${area.partOfArea} true false true)") #end ${partOfArea}${area.name}... ##OUTPUT FOR INDEPENDENT CITIES #else + +### CHANGE EB 3/30/15 FOR INDEPENDENT CITY PHRASING +#if(${area.name.contains("City of")}) THE ## +#else + ## +#end +### END EB CHANGE #if(${area.partOfArea}) #set($partOfArea = "#areaFormat(${area.partOfArea} true false true)") #end diff --git a/edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/VTECTable.py b/edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/VTECTable.py index 324d0156a2..846a5d9e70 100644 --- a/edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/VTECTable.py +++ b/edexOsgi/com.raytheon.uf.edex.activetable/utility/common_static/base/vtec/VTECTable.py @@ -335,9 +335,9 @@ VTECTable = { upgradeHazardsDict = { 'WC.W': ['WC.A', 'WC.Y'], 'WC.Y': ['WC.A'], -'BZ.W': ['ZR.Y', 'LE.Y', 'WW.Y', +'BZ.W': ['WS.W', 'LE.W', 'WW.Y','ZR.Y', 'LE.Y', 'WW.Y', 'BZ.A', 'WS.A', 'LE.A'], -'IS.W': ['ZR.Y', 'LE.Y', 'WW.Y', +'IS.W': ['WS.W', 'LE.W', 'ZR.Y', 'LE.Y', 'WW.Y', 'BZ.A', 'WS.A', 'LE.A'], 'LE.W': ['ZR.Y', 'LE.Y', 'WW.Y', 'BZ.A', 'WS.A', 'LE.A'], @@ -410,6 +410,8 @@ downgradeHazardsDict = { 'LE.Y': ['BZ.W', 'LE.W', 'IS.W', 'WS.W'], 'WW.Y': ['BZ.W', 'LE.W', 'IS.W', 'WS.W'], 'WC.Y': ['WC.W'], +'WS.W': ['BZ.W', 'IS.W'], +'LE.W': ['BZ.W', 'IS.W'], 'DU.Y': ['DS.W', 'HW.W'], 'LW.Y': ['DS.W', 'HW.W', 'WI.Y'], 'WI.Y': ['DS.W', 'HW.W'], diff --git a/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh b/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh index 4b3d02ebc3..0c08a2707f 100644 --- a/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh +++ b/rpms/awips2.core/Installer.ant/scripts/profile.d/awips2Ant.sh @@ -1,21 +1,16 @@ #!/bin/bash -# Is Ant Installed? -rpm -q awips2-ant > /dev/null 2>&1 -RC=$? -if [ ${RC} -ne 0 ]; then - return -fi +if [ -d /awips2/ant ]; then + # Determine Where Ant Has Been Installed. + ANT_INSTALL=/awips2/ant -# Determine Where Ant Has Been Installed. -ANT_INSTALL=/awips2/ant - -# Update The Environment. -export ANT_HOME="${ANT_INSTALL}" -# Determine If Ant Is Already Part Of The Path. -CHECK_PATH=`echo ${PATH} | grep ${ANT_INSTALL}` -if [ ! "${CHECK_PATH}" = "" ]; then - return + # Update The Environment. + export ANT_HOME="${ANT_INSTALL}" + # Determine If Ant Is Already Part Of The Path. + CHECK_PATH=`echo ${PATH} | grep ${ANT_INSTALL}` + if [ ! "${CHECK_PATH}" = "" ]; then + return + fi + # Ant Is Not In The Path; Add It To The Path. + export PATH="${ANT_INSTALL}/bin:${PATH}" fi -# Ant Is Not In The Path; Add It To The Path. -export PATH="${ANT_INSTALL}/bin:${PATH}" diff --git a/rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh b/rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh index 3d33971265..521a258b08 100644 --- a/rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh +++ b/rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.csh @@ -1,12 +1,8 @@ #!/bin/csh -# Ensure that awips2-cli is installed. -rpm -q awips2-cli >& /dev/null -set RC="$?" - #if installed, set the variable -if ( "${RC}" == "0" ) then - set CLI_INSTALL=`rpm -q --queryformat '%{INSTPREFIXES}' awips2-cli` +if ( -d /awips2/fxa ) then + set CLI_INSTALL=/awips2/fxa #if check CLI_INSTALL is set, set it in the path if ( "${CLI_INSTALL}" != "" ) then setenv PATH ${CLI_INSTALL}/bin:${PATH} diff --git a/rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh b/rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh index 6ec6bfa870..ea2eaedfb0 100644 --- a/rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh +++ b/rpms/awips2.core/Installer.cli/scripts/profile.d/awips2CLI.sh @@ -1,17 +1,8 @@ #!/bin/bash -# Ensure that awips2-cli is installed. -rpm -q awips2-cli > /dev/null 2>&1 -RC="$?" -if [ ! "${RC}" = "0" ]; then - # awips2-cli is not installed. - return -fi - # Determine where awips2-cli has been installed. -CLI_INSTALL=`rpm -q --queryformat '%{INSTPREFIXES}\n' awips2-cli` -if [ "${CLI_INSTALL}" = "" ]; then - return +if [ -d /awips2/fxa ]; then + CLI_INSTALL=/awips2/fxa + export PATH=${CLI_INSTALL}/bin:${PATH} fi -export PATH=${CLI_INSTALL}/bin:${PATH} diff --git a/rpms/awips2.core/Installer.java/build.sh b/rpms/awips2.core/Installer.java/build.sh index 61163ca904..f1da818413 100644 --- a/rpms/awips2.core/Installer.java/build.sh +++ b/rpms/awips2.core/Installer.java/build.sh @@ -21,6 +21,8 @@ function buildRPM() --define "_topdir ${AWIPSII_TOP_DIR}" \ --define "_build_root ${AWIPSII_BUILD_ROOT}" \ --define "_baseline_workspace ${WORKSPACE}" \ + --define '_component_version %(echo ${AWIPSII_VERSION})' \ + --define '_component_release %(echo ${AWIPSII_RELEASE})' \ --buildroot ${AWIPSII_BUILD_ROOT} \ ${SPECS} if [ $? -ne 0 ]; then diff --git a/rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh b/rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh index 4d076194ea..8692f2d769 100644 --- a/rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh +++ b/rpms/awips2.core/Installer.java/common/scripts/profile.d/awips2Java.sh @@ -1,19 +1,14 @@ #!/bin/bash -# Is Java Installed? -rpm -q awips2-java > /dev/null 2>&1 -RC=$? -if [ ${RC} -ne 0 ]; then - return +if [ -d /awips2/java ]; then + JAVA_INSTALL="/awips2/java" + # Update The Environment + export JAVA_HOME=${JAVA_INSTALL} + # Determine If Java Is Already Part Of The Path. + CHECK_PATH=`echo ${PATH} | grep ${JAVA_INSTALL}` + if [ ! "${CHECK_PATH}" = "" ]; then + return + fi + # Java Is Not In The Path; Add It To The Path. + export PATH=${JAVA_INSTALL}/bin:${PATH} fi - -JAVA_INSTALL="/awips2/java" -# Update The Environment -export JAVA_HOME=${JAVA_INSTALL} -# Determine If Java Is Already Part Of The Path. -CHECK_PATH=`echo ${PATH} | grep ${JAVA_INSTALL}` -if [ ! "${CHECK_PATH}" = "" ]; then - return -fi -# Java Is Not In The Path; Add It To The Path. -export PATH=${JAVA_INSTALL}/bin:${PATH} diff --git a/rpms/awips2.core/Installer.notification/scripts/profile.d/awips2Notification.sh b/rpms/awips2.core/Installer.notification/scripts/profile.d/awips2Notification.sh index 767b0a58bc..2fe73fd713 100644 --- a/rpms/awips2.core/Installer.notification/scripts/profile.d/awips2Notification.sh +++ b/rpms/awips2.core/Installer.notification/scripts/profile.d/awips2Notification.sh @@ -1,36 +1,32 @@ #!/bin/bash -# Is awips2-notification Installed? -rpm -q awips2-notification > /dev/null 2>&1 -if [ $? -ne 0 ]; then - return -fi +if [ -d /awips2/notification ]; then + # Determine Where awips2-notification Has Been Installed. + NOTIFICATION_INSTALL="/awips2/notification" + QPID_LIB_DIR="/awips2/qpid/lib" -# Determine Where awips2-notification Has Been Installed. -NOTIFICATION_INSTALL="/awips2/notification" -QPID_LIB_DIR="/awips2/qpid/lib" - -# Update The Environment. -# Determine if awips2-notification is Already On LD_LIBRARY_PATH -CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${NOTIFICATION_INSTALL}` -if [ "${CHECK_PATH}" = "" ]; then - # awips2-notification Is Not On LD_LIBRARY_PATH; Add It. - _lib_dir=${NOTIFICATION_INSTALL}/lib - if [ -d ${NOTIFICATION_INSTALL}/lib64 ]; then - _lib_dir=${NOTIFICATION_INSTALL}/lib64 + # Update The Environment. + # Determine if awips2-notification is Already On LD_LIBRARY_PATH + CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${NOTIFICATION_INSTALL}` + if [ "${CHECK_PATH}" = "" ]; then + # awips2-notification Is Not On LD_LIBRARY_PATH; Add It. + _lib_dir=${NOTIFICATION_INSTALL}/lib + if [ -d ${NOTIFICATION_INSTALL}/lib64 ]; then + _lib_dir=${NOTIFICATION_INSTALL}/lib64 + fi + export LD_LIBRARY_PATH=${_lib_dir}:${LD_LIBRARY_PATH} fi - export LD_LIBRARY_PATH=${_lib_dir}:${LD_LIBRARY_PATH} -fi -# Determine if the qpid lib directory is already on LD_LIBRARY_PATH -CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${QPID_LIB_DIR}` -if [ "${CHECK_PATH}" = "" ]; then - export LD_LIBRARY_PATH=${QPID_LIB_DIR}:$LD_LIBRARY_PATH -fi + # Determine if the qpid lib directory is already on LD_LIBRARY_PATH + CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${QPID_LIB_DIR}` + if [ "${CHECK_PATH}" = "" ]; then + export LD_LIBRARY_PATH=${QPID_LIB_DIR}:$LD_LIBRARY_PATH + fi -# Determine if awips2-notification Is Already Part Of The Path. -CHECK_PATH=`echo ${PATH} | grep ${NOTIFICATION_INSTALL}` -if [ "${CHECK_PATH}" = "" ]; then - # awips2-notification Is Not In The Path; Add It To The Path. - export PATH=${NOTIFICATION_INSTALL}/bin:${PATH} + # Determine if awips2-notification Is Already Part Of The Path. + CHECK_PATH=`echo ${PATH} | grep ${NOTIFICATION_INSTALL}` + if [ "${CHECK_PATH}" = "" ]; then + # awips2-notification Is Not In The Path; Add It To The Path. + export PATH=${NOTIFICATION_INSTALL}/bin:${PATH} + fi fi diff --git a/rpms/awips2.core/Installer.postgres/scripts/profile.d/awips2PSQL.sh b/rpms/awips2.core/Installer.postgres/scripts/profile.d/awips2PSQL.sh index 74b4883996..976d902fd3 100644 --- a/rpms/awips2.core/Installer.postgres/scripts/profile.d/awips2PSQL.sh +++ b/rpms/awips2.core/Installer.postgres/scripts/profile.d/awips2PSQL.sh @@ -1,26 +1,21 @@ #!/bin/bash -# Is awips2-psql Installed? -rpm -q awips2-psql > /dev/null 2>&1 -RC=$? -if [ ${RC} -ne 0 ]; then - return -fi +if [ -d /awips2/psql ]; then + # Determine Where awips2-psql Has Been Installed. + PSQL_INSTALL="/awips2/psql" -# Determine Where awips2-psql Has Been Installed. -PSQL_INSTALL="/awips2/psql" + # Update The Environment. + # Determine if awips2-psql is Already On LD_LIBRARY_PATH + CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${PSQL_INSTALL}` + if [ "${CHECK_PATH}" = "" ]; then + # awips2-psql Is Not On LD_LIBRARY_PATH; Add It. + export LD_LIBRARY_PATH=${PSQL_INSTALL}/lib:${LD_LIBRARY_PATH} + fi -# Update The Environment. -# Determine if awips2-psql is Already On LD_LIBRARY_PATH -CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${PSQL_INSTALL}` -if [ "${CHECK_PATH}" = "" ]; then - # awips2-psql Is Not On LD_LIBRARY_PATH; Add It. - export LD_LIBRARY_PATH=${PSQL_INSTALL}/lib:${LD_LIBRARY_PATH} -fi - -# Determine If awips2-psql Is Already Part Of The Path. -CHECK_PATH=`echo ${PATH} | grep ${PSQL_INSTALL}` -if [ "${CHECK_PATH}" = "" ]; then - # awips2-psql Is Not In The Path; Add It To The Path. - export PATH=${PSQL_INSTALL}/bin:${PATH} + # Determine If awips2-psql Is Already Part Of The Path. + CHECK_PATH=`echo ${PATH} | grep ${PSQL_INSTALL}` + if [ "${CHECK_PATH}" = "" ]; then + # awips2-psql Is Not In The Path; Add It To The Path. + export PATH=${PSQL_INSTALL}/bin:${PATH} + fi fi diff --git a/rpms/awips2.core/Installer.postgres/scripts/profile.d/awips2Postgres.sh b/rpms/awips2.core/Installer.postgres/scripts/profile.d/awips2Postgres.sh index fc56341760..3963297ffc 100644 --- a/rpms/awips2.core/Installer.postgres/scripts/profile.d/awips2Postgres.sh +++ b/rpms/awips2.core/Installer.postgres/scripts/profile.d/awips2Postgres.sh @@ -1,29 +1,24 @@ #!/bin/bash -# Is awips2-postgresql Installed? -rpm -q awips2-postgresql > /dev/null 2>&1 -RC=$? -if [ ${RC} -ne 0 ]; then - return -fi +if [ -d /awips2/postgresql ]; then + # Determine Where awips2-postgresql Has Been Installed. + POSTGRESQL_INSTALL="/awips2/postgresql" + if [ "${POSTGRESQL_INSTALL}" = "" ]; then + return + fi -# Determine Where awips2-postgresql Has Been Installed. -POSTGRESQL_INSTALL="/awips2/postgresql" -if [ "${POSTGRESQL_INSTALL}" = "" ]; then - return -fi + # Update The Environment. + # Determine if awips2-postgresql is Already On LD_LIBRARY_PATH + CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${POSTGRESQL_INSTALL}` + if [ "${CHECK_PATH}" = "" ]; then + # awips2-postgresql Is Not On LD_LIBRARY_PATH; Add It. + export LD_LIBRARY_PATH=${POSTGRESQL_INSTALL}/lib:${LD_LIBRARY_PATH} + fi -# Update The Environment. -# Determine if awips2-postgresql is Already On LD_LIBRARY_PATH -CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${POSTGRESQL_INSTALL}` -if [ "${CHECK_PATH}" = "" ]; then - # awips2-postgresql Is Not On LD_LIBRARY_PATH; Add It. - export LD_LIBRARY_PATH=${POSTGRESQL_INSTALL}/lib:${LD_LIBRARY_PATH} -fi - -# Determine if awips2-postgresql Is Already Part Of The Path. -CHECK_PATH=`echo ${PATH} | grep ${POSTGRESQL_INSTALL}` -if [ "${CHECK_PATH}" = "" ]; then - # awips2-postgresql Is Not In The Path; Add It To The Path. - export PATH=${POSTGRESQL_INSTALL}/bin:${PATH} + # Determine if awips2-postgresql Is Already Part Of The Path. + CHECK_PATH=`echo ${PATH} | grep ${POSTGRESQL_INSTALL}` + if [ "${CHECK_PATH}" = "" ]; then + # awips2-postgresql Is Not In The Path; Add It To The Path. + export PATH=${POSTGRESQL_INSTALL}/bin:${PATH} + fi fi diff --git a/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh b/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh index 8060e2ed8b..3d59842cba 100644 --- a/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh +++ b/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.csh @@ -1,6 +1,6 @@ #!/bin/csh -set HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{FILENAMES}' awips2-tools` +set HDF5_TOOLS_INSTALL=/awips2/tools if $?PATH then setenv PATH ${HDF5_TOOLS_INSTALL}/bin:$PATH diff --git a/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh b/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh index 7c8626dfe1..2cdcf74373 100644 --- a/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh +++ b/rpms/awips2.core/Installer.tools/scripts/profile.d/awips2HDF5Tools.sh @@ -1,29 +1,24 @@ #!/bin/bash -# Is awips2-tools Installed? -rpm -q awips2-tools > /dev/null 2>&1 -RC=$? -if [ ${RC} -ne 0 ]; then - return -fi +if [ -d /awips2/tools ]; then + # Determine Where awips2-tools Has Been Installed. + HDF5_TOOLS_INSTALL=/awips2/tools + if [ "${HDF5_TOOLS_INSTALL}" = "" ]; then + return + fi -# Determine Where awips2-tools Has Been Installed. -HDF5_TOOLS_INSTALL=`rpm -q --queryformat '%{FILENAMES}' awips2-tools` -if [ "${HDF5_TOOLS_INSTALL}" = "" ]; then - return -fi + # Update The Environment. + # Determine If awips2-tools Is Already Part Of The Path. + CHECK_PATH=`echo ${PATH} | grep ${HDF5_TOOLS_INSTALL}` + if [ "${CHECK_PATH}" = "" ]; then + # awips2-tools Is Not In The Path; Add It. + export PATH=${HDF5_TOOLS_INSTALL}/bin:${PATH} + fi -# Update The Environment. -# Determine If awips2-tools Is Already Part Of The Path. -CHECK_PATH=`echo ${PATH} | grep ${HDF5_TOOLS_INSTALL}` -if [ "${CHECK_PATH}" = "" ]; then - # awips2-tools Is Not In The Path; Add It. - export PATH=${HDF5_TOOLS_INSTALL}/bin:${PATH} -fi - -# Determine If awips2-tools Is On LD_LIBRARY_PATH. -CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${HDF5_TOOLS_INSTALL}` -if [ "${CHECK_PATH}" = "" ]; then - # awips2-tools Is Not On LD_LIBRARY_PATH; Add It. - export LD_LIBRARY_PATH=${HDF5_TOOLS_INSTALL}/lib:${LD_LIBRARY_PATH} + # Determine If awips2-tools Is On LD_LIBRARY_PATH. + CHECK_PATH=`echo ${LD_LIBRARY_PATH} | grep ${HDF5_TOOLS_INSTALL}` + if [ "${CHECK_PATH}" = "" ]; then + # awips2-tools Is Not On LD_LIBRARY_PATH; Add It. + export LD_LIBRARY_PATH=${HDF5_TOOLS_INSTALL}/lib:${LD_LIBRARY_PATH} + fi fi diff --git a/rpms/awips2.core/Installer.yajsw/component.spec b/rpms/awips2.core/Installer.yajsw/component.spec index b1a227a50b..99bb0fb18a 100644 --- a/rpms/awips2.core/Installer.yajsw/component.spec +++ b/rpms/awips2.core/Installer.yajsw/component.spec @@ -7,7 +7,7 @@ Name: awips2-yajsw Summary: AWIPS II yajsw Distribution Version: %{_yajsw_version} -Release: 2 +Release: %{_component_version}.%{_component_release}%{?dist} Group: AWIPSII BuildRoot: %{_build_root} BuildArch: noarch diff --git a/rpms/awips2.core/Installer.yajsw/scripts/profile.d/awips2Yajsw.sh b/rpms/awips2.core/Installer.yajsw/scripts/profile.d/awips2Yajsw.sh index b9d938a2d7..1b911bbd3f 100644 --- a/rpms/awips2.core/Installer.yajsw/scripts/profile.d/awips2Yajsw.sh +++ b/rpms/awips2.core/Installer.yajsw/scripts/profile.d/awips2Yajsw.sh @@ -1,11 +1,7 @@ #!/bin/bash -# Is Yajsw installed? -rpm -q awips2-yajsw > /dev/null 2>&1 -if [ $? -ne 0 ]; then - return -fi - -YAJSW_INSTALL="/awips2/yajsw" +if [ -d /awips2/yajsw ]; then + YAJSW_INSTALL="/awips2/yajsw" # Update The Environment -export YAJSW_HOME=${YAJSW_INSTALL} \ No newline at end of file + export YAJSW_HOME=${YAJSW_INSTALL} +fi diff --git a/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0 b/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0 index 799d28ef0f..79d7099b65 100644 --- a/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0 +++ b/rpms/awips2.edex/Installer.edex-datadelivery/datadelivery.patch0 @@ -1,5 +1,5 @@ -*** Installer.edex-component/component.spec 2015-02-03 16:00:27.487303049 -0600 ---- Installer.edex-datadelivery/component.spec 2015-02-03 17:49:00.775069314 -0600 +*** Installer.edex-component/component.spec 2015-04-08 09:08:06.552124581 -0400 +--- Installer.edex-datadelivery/component.spec 2015-04-08 09:24:36.369123969 -0400 *************** *** 6,13 **** %global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') @@ -108,7 +108,7 @@ ! exit 1 ! fi ! fi -! mv /etc/init.d/edexServiceList-datadelivery /etc/init.d/edexServiceList +! cp /etc/init.d/edexServiceList-datadelivery /etc/init.d/edexServiceList ! if [ $? -ne 0 ]; then ! exit 1 ! fi diff --git a/rpms/awips2.edex/Installer.edex/component.spec b/rpms/awips2.edex/Installer.edex/component.spec index 80af2ff928..219436573f 100644 --- a/rpms/awips2.edex/Installer.edex/component.spec +++ b/rpms/awips2.edex/Installer.edex/component.spec @@ -76,6 +76,11 @@ cp -v ${EDEX_BASE}/scripts/init.d/* \ if [ $? -ne 0 ]; then exit 1 fi +# rename the script to prevent naming conflicts during installation +pushd . > /dev/null 2>&1 +cd %{_build_root}/etc/init.d +mv edexServiceList edexServiceList-edex +popd > /dev/null 2>&1 # copy versions.sh. UTILITY="${INSTALLER_RPM}/utility" @@ -97,6 +102,19 @@ fi %pre %post +# replace the service list script with the edex service list script +if [ ! -f /etc/init.d/edexServiceList-datadelivery ]; then + if [ -f /etc/init.d/edexServiceList ]; then + mv /etc/init.d/edexServiceList /etc/init.d/edexServiceList.orig + if [ $? -ne 0 ]; then + exit 1 + fi + fi + cp /etc/init.d/edexServiceList-edex /etc/init.d/edexServiceList + if [ $? -ne 0 ]; then + exit 1 + fi +fi MACHINE_BIT=`uname -i` if [ "${MACHINE_BIT}" = "i386" ] then diff --git a/rpms/python.site-packages/Installer.h5py/component.spec b/rpms/python.site-packages/Installer.h5py/component.spec deleted file mode 100644 index ee361d6015..0000000000 --- a/rpms/python.site-packages/Installer.h5py/component.spec +++ /dev/null @@ -1,190 +0,0 @@ -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%define _build_arch %(uname -i) -%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" -%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# -# AWIPS II Python h5py Spec File -# -Name: awips2-python-h5py -Summary: AWIPS II Python h5py Distribution -Version: 1.3.0 -Release: %{_component_version}.%{_component_release}%{?dist} -Group: AWIPSII -BuildRoot: %{_build_root} -BuildArch: %{_build_arch} -URL: N/A -License: N/A -Distribution: N/A -Vendor: Raytheon -Packager: Bryan Kowal - -AutoReq: no -requires: awips2-python -requires: awips2-python-numpy -requires: libz.so.1 -provides: awips2-python-h5py - -%description -AWIPS II Python h5py Site-Package - -%prep -# Verify That The User Has Specified A BuildRoot. -if [ "%{_build_root}" = "" ] -then - echo "A Build Root has not been specified." - echo "Unable To Continue ... Terminating" - exit 1 -fi - -rm -rf %{_build_root} -if [ $? -ne 0 ]; then - exit 1 -fi -mkdir -p %{_build_root} -if [ $? -ne 0 ]; then - exit 1 -fi -mkdir -p %{_build_root}/awips2/python/lib -if [ $? -ne 0 ]; then - exit 1 -fi - -PRE_REQS_HDF5_TAR="" -if [ "%{_build_arch}" = "i386" ]; then - PRE_REQS_HDF5_TAR="hdf5-1.8.4-patch1-linux-shared.tar.gz" -else - if [ "%{_build_arch}" = "x86_64" ]; then - PRE_REQS_HDF5_TAR="hdf5-1.8.4-patch1-linux-x86_64-shared.tar.gz" - else - echo "ERROR: Unrecognized Architecture." - exit 1 - fi -fi - -if [ -d %{_python_build_loc} ]; then - rm -rf %{_python_build_loc} -fi -mkdir -p %{_python_build_loc} - -PRE_REQS_DIR="%{_baseline_workspace}/rpms/python.site-packages/deploy.builder/pre-reqs" -cp -v ${PRE_REQS_DIR}/${PRE_REQS_HDF5_TAR} \ - %{_python_build_loc} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi - -pushd . > /dev/null -cd %{_python_build_loc} -/bin/tar -xvf ${PRE_REQS_HDF5_TAR} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -rm -f ${PRE_REQS_HDF5_TAR} -popd > /dev/null - -%build -HDF5_PATH= -if [ "%{_build_arch}" = "i386" ]; then - HDF5_PATH="%{_python_build_loc}/hdf5-1.8.4-patch1-linux-shared" -else - HDF5_PATH="%{_python_build_loc}/hdf5-1.8.4-patch1-linux-x86_64-shared" -fi - -H5PY_SRC_DIR="%{_python_pkgs_dir}/h5py" -SZIP_SRC_DIR="%{_baseline_workspace}/rpms/python.site-packages/Installer.h5py/src" -SZIP_TAR="szip-2.1.tar" - -# Copy the h5py source. -cp -rv ${H5PY_SRC_DIR}/* \ - %{_python_build_loc} -if [ $? -ne 0 ]; then - exit 1 -fi -# Copy the szip source. -cp -rv ${SZIP_SRC_DIR}/${SZIP_TAR} \ - %{_python_build_loc} -if [ $? -ne 0 ]; then - exit 1 -fi -pushd . > /dev/null -# build h5py -cd %{_python_build_loc} -export LD_LIBRARY_PATH=/awips2/python/lib -/awips2/python/bin/python setup.py build \ - --hdf5=${HDF5_PATH} -if [ $? -ne 0 ]; then - exit 1 -fi -# build szip -/bin/tar -xf ${SZIP_TAR} -if [ $? -ne 0 ]; then - exit 1 -fi -cd szip-2.1 -./configure -if [ $? -ne 0 ]; then - exit 1 -fi -make -if [ $? -ne 0 ]; then - exit 1 -fi -cd .. -/bin/rm -f ${SZIP_TAR} -if [ $? -ne 0 ]; then - exit 1 -fi - -popd > /dev/null - -%install -HDF5_PATH= -if [ "%{_build_arch}" = "i386" ]; then - HDF5_PATH="%{_python_build_loc}/hdf5-1.8.4-patch1-linux-shared" -else - HDF5_PATH="%{_python_build_loc}/hdf5-1.8.4-patch1-linux-x86_64-shared" -fi - -pushd . > /dev/null -cd %{_python_build_loc} -export LD_LIBRARY_PATH=/awips2/python/lib -/awips2/python/bin/python setup.py install \ - --root=%{_build_root} \ - --prefix=/awips2/python -popd > /dev/null - -pushd . > /dev/null -cd %{_python_build_loc}/szip-2.1 -cp -P src/.libs/libsz.so* \ - %{_build_root}/awips2/python/lib -if [ $? -ne 0 ]; then - exit 1 -fi -cd .. -/bin/rm -rf szip-2.1 -if [ $? -ne 0 ]; then - exit 1 -fi -popd > /dev/null - -rm -rf ${HDF5_PATH} - -%pre - -%post - -%preun - -%postun - -%clean -rm -rf ${RPM_BUILD_ROOT} -rm -rf %{_python_build_loc} - -%files -%defattr(644,awips,fxalpha,755) -%dir /awips2/python/lib -/awips2/python/lib/* diff --git a/rpms/python.site-packages/Installer.numpy/component.spec b/rpms/python.site-packages/Installer.numpy/component.spec deleted file mode 100644 index 6a045a369c..0000000000 --- a/rpms/python.site-packages/Installer.numpy/component.spec +++ /dev/null @@ -1,134 +0,0 @@ -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%define _build_arch %(uname -i) -%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" -%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# -# AWIPS II Python numpy Spec File -# -Name: awips2-python-numpy -Summary: AWIPS II Python numpy Distribution -Version: 1.5.0 -Release: %{_component_version}.%{_component_release}%{?dist} -Group: AWIPSII -BuildRoot: %{_build_root} -BuildArch: %{_build_arch} -URL: N/A -License: N/A -Distribution: N/A -Vendor: Raytheon -Packager: Bryan Kowal - -AutoReq: no -requires: compat-libf2c-34(x86-64) >= 3.4.6-19.el6 -requires: libgfortran(x86-64) >= 4.4.7-3.el6 -requires: awips2-python -requires: awips2-python-nose -provides: awips2-python-numpy - -%description -AWIPS II Python numpy Site-Package - -%prep -# Verify That The User Has Specified A BuildRoot. -if [ "%{_build_root}" = "" ] -then - echo "A Build Root has not been specified." - echo "Unable To Continue ... Terminating" - exit 1 -fi - -rm -rf %{_build_root} -mkdir -p %{_build_root} -if [ -d %{_python_build_loc} ]; then - rm -rf %{_python_build_loc} -fi -mkdir -p %{_python_build_loc} - -%build -NUMPY_SRC_DIR="%{_python_pkgs_dir}/numpy" -NUMPY_TAR="numpy-1.5.0.tar.gz" -NUMPY_PATCH="numpy.patch1" -cp -v ${NUMPY_SRC_DIR}/${NUMPY_TAR} \ - %{_python_build_loc} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -cp -v %{_baseline_workspace}/rpms/python.site-packages/Installer.numpy/src/${NUMPY_PATCH} \ - %{_python_build_loc} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi - -pushd . > /dev/null -cd %{_python_build_loc} -tar -xvf ${NUMPY_TAR} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -rm -fv ${NUMPY_TAR} -if [ ! -d numpy-1.5.0 ]; then - file numpy-1.5.0 - exit 1 -fi -source /etc/profile.d/awips2Python.sh -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -cd numpy-1.5.0 -# Apply the patch -patch -p1 -i ../${NUMPY_PATCH} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -/awips2/python/bin/python setup.py clean -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -/awips2/python/bin/python setup.py build -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -popd > /dev/null - -%install -NUMPY_SRC_DIR="%{_python_pkgs_dir}/numpy" - -pushd . > /dev/null -cd %{_python_build_loc}/numpy-1.5.0 -export LD_LIBRARY_PATH=/awips2/python/lib -/awips2/python/bin/python setup.py install \ - --root=%{_build_root} \ - --prefix=/awips2/python -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -popd > /dev/null - -%pre - -%post - -%preun - -%postun - -%clean -rm -rf %{_build_root} -rm -rf %{_python_build_loc} - -%files -%defattr(644,awips,fxalpha,755) -%dir /awips2/python/lib/python2.7/site-packages -/awips2/python/lib/python2.7/site-packages/* -%defattr(755,awips,fxalpha,755) -%dir /awips2/python/bin -/awips2/python/bin/* diff --git a/rpms/python.site-packages/Installer.scientific/component.spec b/rpms/python.site-packages/Installer.scientific/component.spec deleted file mode 100644 index c0e9154d51..0000000000 --- a/rpms/python.site-packages/Installer.scientific/component.spec +++ /dev/null @@ -1,91 +0,0 @@ -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%define _build_arch %(uname -i) -%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" -%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# -# AWIPS II Python scientific Spec File -# -Name: awips2-python-scientific -Summary: AWIPS II Python scientific Distribution -Version: 2.8 -Release: %{_component_version}.%{_component_release}%{?dist} -Group: AWIPSII -BuildRoot: %{_build_root} -BuildArch: %{_build_arch} -URL: N/A -License: N/A -Distribution: N/A -Vendor: Raytheon -Packager: Bryan Kowal - -AutoReq: no -requires: awips2-python -provides: awips2-python-scientific - -%description -AWIPS II Python scientific Site-Package - -%prep -# Verify That The User Has Specified A BuildRoot. -if [ "%{_build_root}" = "" ] -then - echo "A Build Root has not been specified." - echo "Unable To Continue ... Terminating" - exit 1 -fi - -rm -rf %{_build_root} -mkdir -p %{_build_root} -if [ -d %{_python_build_loc} ]; then - rm -rf %{_python_build_loc} -fi -mkdir -p %{_python_build_loc} - -%build -SCIENTIFIC_SRC_DIR="%{_python_pkgs_dir}/scientific" - -cp -rv ${SCIENTIFIC_SRC_DIR}/* \ - %{_python_build_loc} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi - -pushd . > /dev/null -cd %{_python_build_loc} -export LD_LIBRARY_PATH=/awips2/python/lib -/awips2/python/bin/python setup.py build -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -popd > /dev/null - -%install - -pushd . > /dev/null -cd %{_python_build_loc} -export LD_LIBRARY_PATH=/awips2/python/lib -/awips2/python/bin/python setup.py install \ - --root=%{_build_root} \ - --prefix=/awips2/python -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -popd > /dev/null - -%clean -rm -rf %{_build_root} -rm -rf %{_python_build_loc} - -%files -%defattr(644,awips,fxalpha,755) -%dir /awips2/python/lib/python2.7/site-packages -/awips2/python/lib/python2.7/site-packages/* -%dir /awips2/python/include -/awips2/python/include/* -%defattr(755,awips,fxalpha,755) -%dir /awips2/python/bin -/awips2/python/bin/* diff --git a/rpms/python.site-packages/Installer.scipy/component.spec b/rpms/python.site-packages/Installer.scipy/component.spec deleted file mode 100644 index 35658b883e..0000000000 --- a/rpms/python.site-packages/Installer.scipy/component.spec +++ /dev/null @@ -1,104 +0,0 @@ -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%define _build_arch %(uname -i) -%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" -%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# -# AWIPS II Python scipy Spec File -# -Name: awips2-python-scipy -Summary: AWIPS II Python scipy Distribution -Version: 0.8.0 -Release: %{_component_version}.%{_component_release}%{?dist} -Group: AWIPSII -BuildRoot: %{_build_root} -BuildArch: %{_build_arch} -URL: N/A -License: N/A -Distribution: N/A -Vendor: Raytheon -Packager: Bryan Kowal - -AutoReq: no -requires: awips2-python -requires: awips2-python-numpy -provides: awips2-python-scipy - -%description -AWIPS II Python scipy Site-Package - -%prep -# Verify That The User Has Specified A BuildRoot. -if [ "%{_build_root}" = "" ] -then - echo "A Build Root has not been specified." - echo "Unable To Continue ... Terminating" - exit 1 -fi - -rm -rf %{_build_root} -mkdir -p %{_build_root} -if [ -d %{_python_build_loc} ]; then - rm -rf %{_python_build_loc} -fi -mkdir -p %{_python_build_loc} - -%build -SCIPY_SRC_DIR="%{_python_pkgs_dir}/scipy" - -cp -rv ${SCIPY_SRC_DIR}/* \ - %{_python_build_loc} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi - -export BLAS=/awips2/python/lib -export LAPACK=/awips2/python/lib -source /etc/profile.d/awips2Python.sh -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi - -pushd . > /dev/null -cd %{_python_build_loc} -export LD_LIBRARY_PATH=/awips2/python/lib -/awips2/python/bin/python setup.py build -RC=$? -if [ ${RC} -ne 0 ]; then - # Try to build a second time. It seems to work - # for some reason. - /awips2/python/bin/python setup.py build - RC=$? - if [ ${RC} -ne 0 ]; then - exit 1 - fi -fi -popd > /dev/null - -%install - -export BLAS=/awips2/python/lib -export LAPACK=/awips2/python/lib - -pushd . > /dev/null -cd %{_python_build_loc} -export LD_LIBRARY_PATH=/awips2/python/lib -/awips2/python/bin/python setup.py install \ - --root=%{_build_root} \ - --prefix=/awips2/python -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -popd > /dev/null - -%clean -rm -rf %{_build_root} -rm -rf %{_python_build_loc} - -%files -%defattr(644,awips,fxalpha,755) -%dir /awips2/python/lib/python2.7/site-packages -/awips2/python/lib/python2.7/site-packages/* diff --git a/rpms/python.site-packages/Installer.tables/component.spec b/rpms/python.site-packages/Installer.tables/component.spec deleted file mode 100644 index be855fa1f1..0000000000 --- a/rpms/python.site-packages/Installer.tables/component.spec +++ /dev/null @@ -1,150 +0,0 @@ -%global __os_install_post %(echo '%{__os_install_post}' | sed -e 's!/usr/lib[^[:space:]]*/brp-python-bytecompile[[:space:]].*$!!g') -%define _build_arch %(uname -i) -%define _python_pkgs_dir "%{_baseline_workspace}/pythonPackages" -%define _python_build_loc %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -# -# AWIPS II Python tables Spec File -# -Name: awips2-python-tables -Summary: AWIPS II Python tables Distribution -Version: 2.1.2 -Release: %{_component_version}.%{_component_release}%{?dist} -Group: AWIPSII -BuildRoot: %{_build_root} -BuildArch: %{_build_arch} -URL: N/A -License: N/A -Distribution: N/A -Vendor: Raytheon -Packager: Bryan Kowal - -AutoReq: no -requires: awips2-python -provides: awips2-python-numpy -provides: awips2-python-tables - -%description -AWIPS II Python tables Site-Package - 64-bit. - -%prep -# Verify That The User Has Specified A BuildRoot. -if [ "%{_build_root}" = "" ] -then - echo "A Build Root has not been specified." - echo "Unable To Continue ... Terminating" - exit 1 -fi - -rm -rf %{_build_root} -mkdir -p %{_build_root} -if [ -d %{_python_build_loc} ]; then - rm -rf %{_python_build_loc} -fi -mkdir -p %{_python_build_loc} - -PRE_REQS_HDF5_TAR="" -if [ "%{_build_arch}" = "i386" ]; then - PRE_REQS_HDF5_TAR="hdf5-1.8.4-patch1-linux-shared.tar.gz" -else - if [ "%{_build_arch}" = "x86_64" ]; then - PRE_REQS_HDF5_TAR="hdf5-1.8.4-patch1-linux-x86_64-shared.tar.gz" - else - echo "ERROR: Unrecognized Architecture." - exit 1 - fi -fi - -PRE_REQS_DIR="%{_baseline_workspace}/rpms/python.site-packages/deploy.builder/pre-reqs" -cp -v ${PRE_REQS_DIR}/${PRE_REQS_HDF5_TAR} \ - %{_python_build_loc} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi - -pushd . > /dev/null -cd %{_python_build_loc} -/bin/tar -xvf ${PRE_REQS_HDF5_TAR} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -rm -f ${PRE_REQS_HDF5_TAR} -popd > /dev/null - -%build -export HDF5_DIR= -if [ "%{_build_arch}" = "i386" ]; then - export HDF5_DIR="%{_python_build_loc}/hdf5-1.8.4-patch1-linux-shared" -else - export HDF5_DIR="%{_python_build_loc}/hdf5-1.8.4-patch1-linux-x86_64-shared" -fi - -TABLES_SRC_DIR="%{_python_pkgs_dir}/tables" -TABLES_TAR="tables-2.1.2.tar.gz" -cp -v ${TABLES_SRC_DIR}/${TABLES_TAR} \ - %{_python_build_loc} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi - -pushd . > /dev/null -cd %{_python_build_loc} -tar -xvf ${TABLES_TAR} -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -rm -fv ${TABLES_TAR} -if [ ! -d tables-2.1.2 ]; then - file tables-2.1.2 - exit 1 -fi -cd tables-2.1.2 -/awips2/python/bin/python setup.py build_ext --inplace -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -popd > /dev/null - -%install -export HDF5_DIR= -if [ "%{_build_arch}" = "i386" ]; then - export HDF5_DIR="%{_python_build_loc}/hdf5-1.8.4-patch1-linux-shared" -else - export HDF5_DIR="%{_python_build_loc}/hdf5-1.8.4-patch1-linux-x86_64-shared" -fi - -pushd . > /dev/null -cd %{_python_build_loc}/tables-2.1.2 -/awips2/python/bin/python setup.py install \ - --root=%{_build_root} \ - --prefix=/awips2/python -RC=$? -if [ ${RC} -ne 0 ]; then - exit 1 -fi -popd > /dev/null - -%pre - -%post - -%preun - -%postun - -%clean -rm -rf %{_build_root} -rm -rf %{_python_build_loc} - -%files -%defattr(644,awips,fxalpha,755) -%dir /awips2/python/lib/python2.7/site-packages -/awips2/python/lib/python2.7/site-packages/* -%defattr(755,awips,fxalpha,755) -%dir /awips2/python/bin -/awips2/python/bin/*