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

Merge branch 'ohd_14.3.1' of ssh://collaborate3.nws.noaa.gov:29418/AWIPS2_Dev_Baseline into master_14.3.1

Browse source 
Former-commit-id: c44811098f [formerly cb7a266271] [formerly c44811098f [formerly cb7a266271] [formerly 97fc11f099 [formerly dcfe2369455e6b7f27039418b090c9c577400a63]]]
Former-commit-id: 97fc11f099
Former-commit-id: 050fb83ec8 [formerly e8e2549284]
Former-commit-id: 8f0d1e9dc5
This commit is contained in:
Brian.Dyke 2014-09-17 14:39:56 -04:00
commit 484ebfd9c9
8 changed files with 145 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
cave/com.raytheon.viz.hydro/src/com/raytheon/viz/hydro/colorscalemgr/ColorScaleMgrAction.java
View file

@ -49,7 +49,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* 6/27/06 lvenable Initial Creation.
* 04/07/2010 4671 mpduff Have the map update upon closure of the dialog.
* 07/02/2013 2088 rferrel Changes for non-blocking ColorScaleMgrDlg.
*
* 9/4/2014 14448 cgobs Make HydroView redisplay after save of color settings in ColorScaleMgr
* </pre>
*
* @author lvenable
@ -97,6 +97,25 @@ public class ColorScaleMgrAction extends AbstractHandler {
}
}
});
colorScaleDlg.setSaveCallback(new ColorScaleMgrDlg.ISaveCallback() {
public void execute() {
HydroDisplayManager displayManager = HydroDisplayManager
.getInstance();
boolean dataChanged = true;
displayManager.setColorChanged(dataChanged);
// redraw the main display
displayManager.setDataChanged(dataChanged);
StationDisplay sd = StationDisplay.getInstance();
sd.redraw();
}
});
colorScaleDlg.open();
} else {
colorScaleDlg.bringToTop();

27
cave/com.raytheon.viz.hydrocommon/src/com/raytheon/viz/hydrocommon/colorscalemgr/ColorScaleMgrDlg.java
View file

@ -73,7 +73,8 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* disappearing after save
* 01 Jul 2013 2088 rferrel Changes for non-blocking dialogs.
* 06 Sep 2013 #2342 lvenable Fixed color memory leaks and a null point exception.
* </pre>
* 04 Sep 2014 14448 cgobs Make MPE redisplay after save of color settings in ColorScaleMgr
* </pre>
*
* @author lvenable
* @version 1.0
@ -96,6 +97,19 @@ public class ColorScaleMgrDlg extends CaveSWTDialog {
*/
private ColorChooserDlg colorDlg;
/**
* callback to be execute upon saving of a color set
* generally used to update the display with the newly-saved color set
*/
private ISaveCallback saveCallback;
public interface ISaveCallback {
public void execute();
}
/**
* User's name.
*/
@ -915,6 +929,7 @@ public class ColorScaleMgrDlg extends CaveSWTDialog {
}
};
/**
* Update the color label on the display
*
@ -2016,9 +2031,17 @@ public class ColorScaleMgrDlg extends CaveSWTDialog {
updateDurationCombo();
updateColorValueLabelBar();
if (this.saveCallback != null) {
this.saveCallback.execute();
}
setReturnValue(true);
}
public void setSaveCallback(ISaveCallback iSaveCallback)
{
this.saveCallback = iSaveCallback;
}
/**
* dataType has changed, update dialog

16
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/GroupEditPrecipStns.java
View file

@ -36,7 +36,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* ------------ ---------- ----------- --------------------------
* Jun 17, 2009 snaples Initial creation
* May 06, 2011 #8994 jpiatt Added set precipitation value as zero
*
* Sep 04, 2014 283 cgobs Fixed possible selection of filtered-out gages
* </pre>
*
* @author snaples
@ -80,11 +80,25 @@ public class GroupEditPrecipStns {
continue;
}
//precip filter
if (DailyQcUtils.pdata[DailyQcUtils.pcpn_day].stn[i].frain[time_pos].data < QcPrecipOptionsDialog
.getPointFilterValue()) {
continue;
}
//reverse precip filter
if (DailyQcUtils.pdata[DailyQcUtils.pcpn_day].stn[i].frain[time_pos].data > QcPrecipOptionsDialog
.getPointFilterReverseValue()) {
continue;
}
//elevation filter
if (DailyQcUtils.precip_stations.get(i).elev < DailyQcUtils.elevation_filter_value)
{
continue;
}
/* Retrieve the latitude and longitude of this station. */
lat = DailyQcUtils.precip_stations.get(i).lat;
lon = DailyQcUtils.precip_stations.get(i).lon;

47
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/actions/MPEColorScaleMgrAction.java
View file

@ -48,6 +48,7 @@ import com.raytheon.viz.ui.dialogs.ICloseCallback;
* Jan 16, 2014 #2691 lvenable Fixed null pointer exception that occurs when closing
* the MPE perspective while the ColorScaleMgrDlg is
* visible.
* 04 Sep 2014 14448 cgobs Make MPE redisplay after save of color settings in ColorScaleMgr
* </pre>
*
* @author mschenke
@ -103,10 +104,54 @@ public class MPEColorScaleMgrAction extends AbstractHandler {
DisplayFieldData dt = MPEDisplayManager.getCurrent()
.getDisplayFieldType();
MPEDisplayManager.getCurrent().displayFieldData(dt);
int displayedAccumHrs = mdm.getDisplayedAccumHrs();
mdm.displayFieldData(dt,displayedAccumHrs );
}
}
});
//anonymous class declaration for the purposes of a callback execute upon save to database
colorScaleDlg.setSaveCallback(new ColorScaleMgrDlg.ISaveCallback() {
public void execute() {
MPEDisplayManager mdm = MPEDisplayManager.getCurrent();
// If the MPE Display Manager is null then return as no
// action is needed.
if (mdm == null) {
return;
}
MPEFieldResource displayedFieldResource = mdm
.getDisplayedFieldResource();
if (displayedFieldResource != null) {
MPEFieldResourceData resourceData = displayedFieldResource
.getResourceData();
displayedFieldResource
.getCapability(ColorMapCapability.class)
.setColorMapParameters(
MPEDisplayManager.createColorMap(
resourceData.getCvUseString(),
resourceData
.getDurationInHours(),
resourceData.getDataUnits(),
resourceData.getDisplayUnits()));
DisplayFieldData dt = MPEDisplayManager.getCurrent()
.getDisplayFieldType();
int displayedAccumHrs = mdm.getDisplayedAccumHrs();
mdm.displayFieldData(dt, displayedAccumHrs);
}
}
});
colorScaleDlg.open();
} else {
colorScaleDlg.bringToTop();

4
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/dialogs/gagetable/GageTableDataManager.java
View file

@ -62,6 +62,7 @@ import com.vividsolutions.jts.geom.Coordinate;
* May 20, 2013 15962 lbousaidi Added a new routine getRadarIdsTrue()
* for Radar Sites dialog.
* Mar 05, 2014 17114 lbousaidi display PC data in gage table.
* Sep 04, 2014 16699 cgobs Fixed 14.3.1 issue with reading MPE field data.
* </pre>
*
* @author mpduff
@ -1136,10 +1137,9 @@ public class GageTableDataManager {
double returnValue = -999.0;
try {
String cv_use = dataType.getCv_use();
String dirname = appsDefaults.getToken(dataType.getDirToken());
String fname = FileUtil.join(dirname,
cv_use + sdf.format(displayManager.getCurrentEditDate()) + "z");
dataType.getFileNamePrefix() + sdf.format(displayManager.getCurrentEditDate()) + "z");
Rectangle extent = dataManager.getHRAPExtent();

7
nativeLib/rary.ohd.pproc/src/MPEFieldGen/TEXT/main_mpe_fieldgen.c
View file

@ -776,8 +776,11 @@ void main_mpe_fieldgen_for_calls_from_editor(int num_args, char ** args)
break;
case lsatpre :
ptrMPEParams->polarizationType = SinglePol ;
runLSatpre ( ptrRunDate,
sprintf( message , "STATUS: BEFORE calling MPEFieldGen_runLSatpre in main \n") ;
printMessage( message, logFile );
ptrMPEParams->polarizationType = SinglePol ;
MPEFieldGen_runLSatpre ( ptrRunDate,
ptrGeoData,
ptrMPEParams,
gageSize, iug, ivg, zg,

7
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/component-deploy.xml
View file

@ -1,7 +0,0 @@
<project basedir="." default="deploy" name="gov.noaa.nws.ohd.edex.plugin.hydrodualpol">
<available file="../build.edex" property="build.dir.location" value="../build.edex"/>
<available file="../../../../../build.edex" property="build.dir.location" value="../../../../../build.edex"/>
<import file="${build.dir.location}/basebuilds/component_deploy_base.xml" />
</project>

41
ohd/gov.noaa.nws.ohd.edex.plugin.hydrodualpol/src/gov/noaa/nws/ohd/edex/plugin/hydrodualpol/DSAProductProcessor.java
View file

@ -281,15 +281,37 @@ public class DSAProductProcessor {
// parse string 1
//statusHandler.handle(Priority.INFO, "\n" + "orig string 1 = " + productText[0]);
String productText0 = productText[0].replace("ADAP(", "");
//statusHandler.handle(Priority.INFO, "\n" + "new string 1 = " + productText0);
String productText0 = productText[0];
//"+" indicates that consecutive delimiters be treated as one
String [] valuesFromString1 = productText0.split("[ )]+");
//for (int i = 0; i < valuesFromString1.length; i++)
//{
// statusHandler.handle(Priority.INFO,valuesFromString1[i]);
//}
//String [] valuesFromString1 = productText0.split("[ )]+"); -- original parse
String [] valuesFromString1 = new String [10];
// remove "ADAP(" and ")" from string leaving "36" as the first substring
valuesFromString1[0] = productText0.substring(0,8).replace("ADAP(", "").replace(")","");
/* parse out remaining substrings from first string
valuesFromString1[1] = productText0.substring(8,16);
valuesFromString1[2] = productText0.substring(16,24);
valuesFromString1[3] = productText0.substring(24,32);
valuesFromString1[4] = productText0.substring(32,40);
valuesFromString1[5] = productText0.substring(40,48);
valuesFromString1[6] = productText0.substring(48,56);
valuesFromString1[7] = productText0.substring(56,64);
valuesFromString1[8] = productText0.substring(64,72);
valuesFromString1[9] = productText0.substring(72,80);
*/
for (int i = 1; i < 10; i++)
{
valuesFromString1[i] = productText0.substring((i*8),((i+1)*8));
}
for (int i = 0; i < valuesFromString1.length; i++)
{
statusHandler.handle(Priority.INFO,valuesFromString1[i]);
}
// parse string 2
//statusHandler.handle(Priority.INFO, "\n" + "string 2 = " + productText[1]);
@ -334,8 +356,9 @@ public class DSAProductProcessor {
private void processDSAAdaptParameters(String radid, String obstime, String [] stringArray1, String [] stringArray2, String [] stringArray3, String [] stringArray4)
{
//statusHandler.handle(Priority.INFO, " In function processDSAAdaptParameters");
/*
statusHandler.handle(Priority.INFO, " In function processDSAAdaptParameters");
for (int i = 0; i < stringArray1.length; i++)
{
statusHandler.handle(Priority.INFO,stringArray1[i]);