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

Merge branch 'ohd_14.4.1' of ssh://vlab.ncep.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.4.1

Browse source 
Former-commit-id: 6b10ca7348 [formerly 6589cd8d6e [formerly 29adda74b3] [formerly 6b10ca7348 [formerly 3496ae3b3063b553e7a891d0a62fa489b1bedb9e]]]
Former-commit-id: 6589cd8d6e [formerly 29adda74b3]
Former-commit-id: 6589cd8d6e
Former-commit-id: 990e8b7d0c
This commit is contained in:
Fay.Liang 2015-03-18 15:09:16 -04:00
commit 1fa1580e57
3 changed files with 35 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/polygon/DrawPolygonDlg.java
View file

@ -65,7 +65,7 @@ import com.raytheon.viz.ui.dialogs.CaveSWTDialog;
* Feb 2, 2014 16201 snaples Added saved data flag support * Feb 2, 2014 16201 snaples Added saved data flag support
* Apr 28, 2014 16707 snaples Added code to save and set location of dialog box when moved. * Apr 28, 2014 16707 snaples Added code to save and set location of dialog box when moved.
* Jan 12, 2015 16993 snaples Restored code for Substitute Field Combo box. * Jan 12, 2015 16993 snaples Restored code for Substitute Field Combo box.
* * Feb 26, 2015 17209 cgobs Ensured that there is an initial selection of Substitution field, prevents empty selection.
* *
* </pre> * </pre>
* *
@ -387,16 +387,22 @@ public class DrawPolygonDlg extends CaveSWTDialog {
// spaceLabel.setText("***** "); // spaceLabel.setText("***** ");
int selectedFieldIndex = 0; int selectedFieldIndex = 0;
boolean found = false;
//find the index of the selected field //find the index of the selected field
for (selectedFieldIndex = 0; selectedFieldIndex < displayFieldDataArray.length; selectedFieldIndex++) for (selectedFieldIndex = 0; selectedFieldIndex < displayFieldDataArray.length; selectedFieldIndex++)
{ {
if (displayFieldDataArray[selectedFieldIndex] == subType) if (displayFieldDataArray[selectedFieldIndex] == subType)
{ {
found = true;
break; break;
} }
} }
if (!found)
{
selectedFieldIndex = 0;
}
//create and initialize the display field type name array //create and initialize the display field type name array
displayTypeNameArray = new String[displayFieldDataArray.length]; displayTypeNameArray = new String[displayFieldDataArray.length];
@ -411,27 +417,42 @@ public class DrawPolygonDlg extends CaveSWTDialog {
fieldTypeCombo.setTextLimit(35); fieldTypeCombo.setTextLimit(35);
fieldTypeCombo.setLayoutData(gd); fieldTypeCombo.setLayoutData(gd);
fieldTypeCombo.setItems(displayTypeNameArray); fieldTypeCombo.setItems(displayTypeNameArray);
fieldTypeCombo.select(selectedFieldIndex); // fieldTypeCombo.select(selectedFieldIndex);
fieldTypeCombo.addSelectionListener(new SelectionAdapter() { fieldTypeCombo.addSelectionListener(new SelectionAdapter() {
@Override @Override
public void widgetSelected(SelectionEvent event) { public void widgetSelected(SelectionEvent event) {
String selectedFieldString = fieldTypeCombo.getText();
setSubstitutionField();
// String selectedFieldString = fieldTypeCombo.getText();
// System.out.println("DrawPolygon.createFieldCombo(): selectedFieldString = " + // System.out.println("DrawPolygon.createFieldCombo(): selectedFieldString = " +
// selectedFieldString); // selectedFieldString);
subType = DisplayFieldData.fromDisplayNameString(selectedFieldString); // subType = DisplayFieldData.fromDisplayNameString(selectedFieldString);
// if (subType != null) // if (subType != null)
// { // {
// System.out.println("DrawPolygon.createFieldCombo(): subType = " + // System.out.println("DrawPolygon.createFieldCombo(): subType = " +
// subType.toString()); // subType.toString());
// } // }
} }
}); });
//select the substitution field
fieldTypeCombo.select(selectedFieldIndex);
setSubstitutionField();
} }
private void setSubstitutionField()
{
String selectedFieldString = fieldTypeCombo.getText();
subType = DisplayFieldData.fromDisplayNameString(selectedFieldString);
}
/** /**

2
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/BestEstimate1HrQpeDlg.java
View file

@ -160,7 +160,7 @@ public class BestEstimate1HrQpeDlg extends BasePostAnalysisDlg {
applyGridAdjustments(adjustedGrid, biasRatioGrid, disaggGrid); applyGridAdjustments(adjustedGrid, biasRatioGrid, disaggGrid);
float[] dataArray = paMgr.convertToSingleArray(adjustedGrid, false, true); float[] dataArray = paMgr.convertToSingleArray(adjustedGrid, false, true);
short[] shortArray= paMgr.convertToShortArray(dataArray, 100.0f); short[] shortArray= paMgr.convertToShortArray(dataArray, 1.0f);
XmrgFile file = new XmrgFile(); XmrgFile file = new XmrgFile();

5
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/postanalysis/PostAnalysisManager.java
View file

@ -43,7 +43,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* December 2013 DCS 167 C. Gobs Initial version * December 2013 DCS 167 C. Gobs Initial version
* * February 2015 C. Gobs Fixed issue with parsing unexpected file name formats in xmrg directory
* </pre> * </pre>
* *
* *
@ -156,6 +156,7 @@ public class PostAnalysisManager
try try
{ {
shiftedDate = utcSdf2.parse(timeString); shiftedDate = utcSdf2.parse(timeString);
longTime = shiftedDate.getTime();
} }
catch(ParseException e) catch(ParseException e)
{ {
@ -164,7 +165,7 @@ public class PostAnalysisManager
} }
longTime = shiftedDate.getTime();
return longTime; return longTime;
} }