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

12.9.1-3 baseline

Browse source 
Former-commit-id: 8e8d15d59bddec475b41e963da4ad0ad5b2c7e86
This commit is contained in:
Steve Harris 2012-08-15 14:26:10 -05:00
parent d1d877d319
commit 36d80b1f60
10 changed files with 37 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MnT12hr.xml
View file

@ -18,4 +18,9 @@
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<DerivedParameter abbreviation="MnT12hr" name="12-hr Minimum Temperature" unit="K"/>
<DerivedParameter abbreviation="MnT12hr" name="12-hr Minimum Temperature" unit="K">
<Method name="Alias" levels="Surface"
models="MOSGuide" displayName="Minimum Temperature">
<Field abbreviation="MnT12hr" level="2FHAG"/>
</Method>
</DerivedParameter>

7
cave/com.raytheon.uf.viz.derivparam/localization/derivedParameters/definitions/MxT12hr.xml
View file

@ -18,4 +18,9 @@
See_the_AWIPS_II_Master_Rights_File_("Master_Rights_File.pdf")_for
further_licensing_information.
-->
<DerivedParameter abbreviation="MxT12hr" name="12-hr Maximum Temperature" unit="K"/>
<DerivedParameter abbreviation="MxT12hr" name="12-hr Maximum Temperature" unit="K">
<Method name="Alias" levels="Surface"
models="MOSGuide" displayName="Maximum Temperature">
<Field abbreviation="MxT12hr" level="2FHAG"/>
</Method>
</DerivedParameter>

7
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/GageTableDlg.java
View file

@ -586,8 +586,6 @@ public class GageTableDlg extends JFrame {
int columnCount = table.getModel().getColumnCount();
// List<GageTableColumn> columnList = null;
// columnList = dataManager.getColumnDataList();
ColumnHeaderToolTips tips = new ColumnHeaderToolTips();
for (int i = 0; i < columnCount; i++) {
@ -636,7 +634,6 @@ public class GageTableDlg extends JFrame {
Vector<Vector<String>> data = model.getDataVector();
Collections.sort(data, new ColumnSorter(colIndex, ascending));
model.setDataVector(data);
// model.fireTableStructureChanged();
}
/**
@ -766,8 +763,7 @@ public class GageTableDlg extends JFrame {
GageTableSettings settings = null;
if (f.exists()) {
// settings = JAXB.unmarshal(path, GageTableSettings.class);
settings = JAXB.unmarshal(f, GageTableSettings.class);
settings = JAXB.unmarshal(f, GageTableSettings.class);
} else {
settings = getDefaultSettings();
}
@ -817,7 +813,6 @@ public class GageTableDlg extends JFrame {
dataManager.setColumnDataList(columnDataList);
dataManager.setColumnWidthMap(columnWidthMap);
} catch (Exception e) {
e.printStackTrace();
System.out.println("MPE Settings file not found");
}
}

4
cave/com.raytheon.viz.mpe/src/com/raytheon/viz/mpe/core/MpeFieldGenJob.java
View file

@ -79,8 +79,8 @@ public class MpeFieldGenJob extends Job {
protected IStatus run(IProgressMonitor monitor) {
final Integer[] mpeExitValue = new Integer[1];
String httpAddress = VizApp.getHttpServer();
String args = ENDPOINT_NAME + fieldGenArg;
String httpAddress = VizApp.getHttpServer() + ENDPOINT_NAME;
String args = fieldGenArg;
byte[] ba = args.getBytes();
try {

4
cave/com.raytheon.viz.texteditor/src/com/raytheon/viz/texteditor/qc/IQCCheck.java
View file

@ -32,6 +32,8 @@ import java.util.regex.Pattern;
* ------------ ---------- ----------- --------------------------
* Initial creation
* Aug 25, 2011 10719 rferrel Removed the no longer common ugcPtrn.
* Aug 6, 2012 15219 Qinglu Lin For tmlPtrn, changed d{1,3}DEG to d{3}DEG.
* </pre>
*
* @version 1.0
@ -72,7 +74,7 @@ public interface IQCCheck {
.compile("\\s{1,}\\d{3,4}\\s\\d{3,5}(|(\\s\\d{3,4}\\s\\d{3,5}){1,})");
public static final Pattern tmlPtrn = Pattern
.compile("TIME...MOT...LOC \\d{3,4}Z\\s\\d{1,3}DEG\\s\\d{1,3}KT((\\s\\d{3,4}\\s\\d{3,5}){1,})");
.compile("TIME...MOT...LOC \\d{3,4}Z\\s\\d{3}DEG\\s\\d{1,3}KT((\\s\\d{3,4}\\s\\d{3,5}){1,})");
public static final Pattern subTMLPtrn = Pattern
.compile("(\\d{3,5}\\s){1,}");

4
cave/com.raytheon.viz.volumebrowser/localization/menus/xml/fieldsMenus.xml
View file

@ -529,9 +529,9 @@
</contribute>
<contribute xsi:type="toolbarSubMenu" menuText="MDL MOS">
<contribute xsi:type="menuItem" menuText="Max Temp" key="MxT"
<contribute xsi:type="menuItem" menuText="Max Temp" key="MxT12hr"
indentText="false" />
<contribute xsi:type="menuItem" menuText="Min Temp" key="MnT"
<contribute xsi:type="menuItem" menuText="Min Temp" key="MnT12hr"
indentText="false" />
<contribute xsi:type="menuItem" menuText="POP 6hr" key="POP6hr"
indentText="false" />

9
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarnGenMathTool.java
View file

@ -68,14 +68,7 @@ public class WarnGenMathTool extends MathTool {
* if it's less than 100
*/
public static String roundAndPad(double direction) {
int num = (int)Math.rint(direction);
if (num < 10)
return String.format ("00%s",num);
else
if (num < 100)
return String.format ("0%s",num);
else
return String.format ("%s",num);
return String.format("%03d",Math.round(direction));
}
}

3
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/util/WarningTextHandler.java
View file

@ -64,6 +64,7 @@ import com.raytheon.viz.warngen.gis.AffectedAreasComparator;
* d)NullointException/locking does not work for special marine warning
* and locking beyond first paragragh.
* Jul 17, 2012 14989 Qinglu Lin Removed locks, <L> and </L>, for county names in pathcast line.
* Aug 6, 2012 15219 Qinglu Lin For tmlPtrn, changed d{1,3}DEG to d{3}DEG.
*
* </pre>
*
@ -156,7 +157,7 @@ public class WarningTextHandler {
.compile("^((?!TIME...MOT... LOC))\\s{1,}\\d{3,4}\\s\\d{3,5}(|(\\s\\d{3,4}\\s\\d{3,5}){1,})");
private static final Pattern tmlPtrn = Pattern
.compile("TIME...MOT...LOC \\d{3,4}Z\\s\\d{1,3}DEG\\s\\d{1,3}KT((\\s\\d{3,4}\\s\\d{3,5}){1,})");
.compile("TIME...MOT...LOC \\d{3,4}Z\\s\\d{3}DEG\\s\\d{1,3}KT((\\s\\d{3,4}\\s\\d{3,5}){1,})");
private static final Pattern subTMLPtrn = Pattern
.compile("(\\d{3,5}\\s){1,}");

13
edexOsgi/com.raytheon.edex.plugin.grib/utility/common_static/base/grid/models/gribModels_NCEP-7.xml
View file

@ -1219,6 +1219,19 @@
<dt>1</dt>
</model>
<model>
<title>Aviation</title>
<name>Aviation</name>
<center>7</center>
<subcenter>8</subcenter>
<grid>130</grid>
<process>
<id>105</id>
</process>
<paramInfo></paramInfo>
<dt>1</dt>
</model>
<model>
<title>AK-NamDNG5</title>
<name>AK-NamDNG5</name>

2
rpms/awips2.core/Installer.version/component.spec
View file

@ -99,7 +99,7 @@ function updateCAVEVersion()
export PATH=/awips2/java/bin:${PATH}
export JAVA_HOME="/awips2/java/jre"
./cave -application org.eclipse.ant.core.antRunner -nosplash \
su awips -c './cave -application org.eclipse.ant.core.antRunner -nosplash' \
> /dev/null 2>&1
rm -f ${BUILD_XML}