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

Merge branch 'ss_builds' (13.2.1-7) into development

Browse source 
Former-commit-id: de437bb4fc [formerly 62e4a9045e32eaaf1a52ff06d86f82d2693021bd]
Former-commit-id: cc2757790c
This commit is contained in:
Steve Harris 2013-02-12 15:29:47 -06:00
commit 760be15f59
2 changed files with 49 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cave/com.raytheon.viz.warngen/src/com/raytheon/viz/warngen/gui/WarngenDialog.java
View file

@ -130,6 +130,9 @@ import com.vividsolutions.jts.geom.Polygon;
* Dec 20, 2012 DR 15537 Qinglu Lin Changed the assigned value to trackEditable from false * Dec 20, 2012 DR 15537 Qinglu Lin Changed the assigned value to trackEditable from false
* to true in boxSelected(). * to true in boxSelected().
* Jan 24, 2013 DR 15723 Qinglu Lin Invoked WarngenLayer's initRemovedGids(). * Jan 24, 2013 DR 15723 Qinglu Lin Invoked WarngenLayer's initRemovedGids().
* Feb 7, 2013 DR 15799 Qinglu Lin Added setPolygonLocked(false) to conSelected(), newSelected(); added
* setPolygonLocked(true) below conSelected() is called in corSelected(),
* and removed it from updateListSelected().
* *
* </pre> * </pre>
* *
@ -1529,7 +1532,6 @@ public class WarngenDialog extends CaveSWTDialog implements
*/ */
public void updateListSelected() { public void updateListSelected() {
warngenLayer.setOldWarningPolygon(null); warngenLayer.setOldWarningPolygon(null);
setPolygonLocked(false);
if (updateListCbo.getSelectionIndex() >= 0) { if (updateListCbo.getSelectionIndex() >= 0) {
AbstractWarningRecord oldWarning = null; AbstractWarningRecord oldWarning = null;
FollowupData data = (FollowupData) updateListCbo FollowupData data = (FollowupData) updateListCbo
@ -1840,7 +1842,8 @@ public class WarngenDialog extends CaveSWTDialog implements
* @param selected * @param selected
*/ */
private AbstractWarningRecord conSelected(FollowupData data) { private AbstractWarningRecord conSelected(FollowupData data) {
CurrentWarnings cw = CurrentWarnings.getInstance(warngenLayer setPolygonLocked(false);
CurrentWarnings cw = CurrentWarnings.getInstance(warngenLayer
.getLocalizedSite()); .getLocalizedSite());
AbstractWarningRecord newWarn = null; AbstractWarningRecord newWarn = null;
if (WarningAction.COR == WarningAction.valueOf(data.getAct())) { if (WarningAction.COR == WarningAction.valueOf(data.getAct())) {
@ -1888,6 +1891,7 @@ public class WarngenDialog extends CaveSWTDialog implements
// Special case - allows for Correction of Followups // Special case - allows for Correction of Followups
if (!allowsNewProduct) { if (!allowsNewProduct) {
newWarn = conSelected(data); newWarn = conSelected(data);
setPolygonLocked(true);
} else { } else {
CurrentWarnings cw = CurrentWarnings.getInstance(warngenLayer CurrentWarnings cw = CurrentWarnings.getInstance(warngenLayer
.getLocalizedSite()); .getLocalizedSite());
@ -1997,6 +2001,7 @@ public class WarngenDialog extends CaveSWTDialog implements
* @param selected * @param selected
*/ */
private AbstractWarningRecord newSelected(FollowupData data) { private AbstractWarningRecord newSelected(FollowupData data) {
setPolygonLocked(false);
AbstractWarningRecord newWarn = CurrentWarnings.getInstance( AbstractWarningRecord newWarn = CurrentWarnings.getInstance(
warngenLayer.getLocalizedSite()).getNewestByTracking( warngenLayer.getLocalizedSite()).getNewestByTracking(
data.getEtn(), data.getPhen() + "." + data.getSig()); data.getEtn(), data.getPhen() + "." + data.getSig());

74
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpResourceHandler.java
View file

@ -1564,11 +1564,11 @@ public class NsharpResourceHandler {
addElementToTableAndLists(elmDesc,stnId,timeLine,stnInfo); addElementToTableAndLists(elmDesc,stnId,timeLine,stnInfo);
} }
if(displayNewData){ if(displayNewData){
//Set default parcel trace data //Set default parcel trace data
currentParcel = NsharpNativeConstants.PARCELTYPE_MOST_UNSTABLE; currentParcel = NsharpNativeConstants.PARCELTYPE_MOST_UNSTABLE;
currentParcelLayerPressure = NsharpNativeConstants.MU_LAYER; currentParcelLayerPressure = NsharpNativeConstants.MU_LAYER;
setCurrentSoundingLayerInfo(); setCurrentSoundingLayerInfo();
resetData(); resetData();
} }
else { else {
//Not display new data. Reset current "parameter"s after adding data to map/lists //Not display new data. Reset current "parameter"s after adding data to map/lists
@ -1580,11 +1580,21 @@ public class NsharpResourceHandler {
//set total time line group and stn id list page number //set total time line group and stn id list page number
int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight; int numTimeLinePerPage = (cnYOrig-dtNextPageEnd)/charHeight;
//System.out.println("numTimeLinePerPage="+numTimeLinePerPage); //fix bug, when numTimeLinePerPage ==0 case
totalTimeLinePage = timeLineStateList.size()/numTimeLinePerPage + 1; //NEW CODE if(numTimeLinePerPage <= 0) {
curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage + 1; //NEW CODE numTimeLinePerPage = 1;
totalStnIdPage = stnStateList.size()/numTimeLinePerPage + 1; //NEW CODE totalTimeLinePage = timeLineStateList.size();
curStnIdPage= currentStnStateListIndex/numTimeLinePerPage + 1; //NEW CODE curTimeLinePage = currentTimeLineStateListIndex;
totalStnIdPage = stnStateList.size();
curStnIdPage= currentStnStateListIndex;
}
else{
totalTimeLinePage = timeLineStateList.size()/numTimeLinePerPage + 1;
curTimeLinePage = currentTimeLineStateListIndex/numTimeLinePerPage + 1;
totalStnIdPage = stnStateList.size()/numTimeLinePerPage + 1;
curStnIdPage= currentStnStateListIndex/numTimeLinePerPage + 1;
}
/* Chin: TBD: do we need these code? /* Chin: TBD: do we need these code?
NsharpSkewTPaneDisplay renderableDisplay = (NsharpSkewTPaneDisplay) skewtPaneRsc.getDescriptor().getRenderableDisplay(); NsharpSkewTPaneDisplay renderableDisplay = (NsharpSkewTPaneDisplay) skewtPaneRsc.getDescriptor().getRenderableDisplay();
@ -1650,9 +1660,9 @@ public class NsharpResourceHandler {
if( totalStnIdPage == 1) if( totalStnIdPage == 1)
return; return;
if((c.x - (dtXOrig+dtWidth)) < (dtWidth/2)){ if((c.x - (dtXOrig+dtWidth)) < (dtWidth/2)){
curStnIdPage++; curStnIdPage++;
if(curStnIdPage>totalStnIdPage) if(curStnIdPage>totalStnIdPage)
curStnIdPage=1; curStnIdPage=1;
} else { } else {
curStnIdPage--; curStnIdPage--;
if(curStnIdPage <=0) if(curStnIdPage <=0)
@ -1695,9 +1705,9 @@ public class NsharpResourceHandler {
if( totalTimeLinePage == 1) if( totalTimeLinePage == 1)
return; return;
if((c.x - dtXOrig) < (dtWidth/2)){ if((c.x - dtXOrig) < (dtWidth/2)){
curTimeLinePage++; curTimeLinePage++;
if(curTimeLinePage>totalTimeLinePage) if(curTimeLinePage>totalTimeLinePage)
curTimeLinePage=1; curTimeLinePage=1;
} else { } else {
curTimeLinePage--; curTimeLinePage--;
if(curTimeLinePage <=0) if(curTimeLinePage <=0)
@ -1709,7 +1719,7 @@ public class NsharpResourceHandler {
index =((int)(c.y - dtNextPageEnd))/ charHeight + index =((int)(c.y - dtNextPageEnd))/ charHeight +
(curTimeLinePage-1)* numTimeLinePerPage ; (curTimeLinePage-1)* numTimeLinePerPage ;
if( index < timeLineStateList.size() ){ if( index < timeLineStateList.size() && index >=0 ){
switch(timeLineStateList.get(index).getTimeState()){ switch(timeLineStateList.get(index).getTimeState()){
case INACTIVE: case INACTIVE:
timeLineStateList.get(index).setTimeState( NsharpConstants.State.ACTIVE); timeLineStateList.get(index).setTimeState( NsharpConstants.State.ACTIVE);
@ -2177,28 +2187,28 @@ public class NsharpResourceHandler {
NsharpAbstractPaneResource absPaneRsc = (NsharpAbstractPaneResource)rscP.getResource(); NsharpAbstractPaneResource absPaneRsc = (NsharpAbstractPaneResource)rscP.getResource();
if (absPaneRsc instanceof NsharpSkewTPaneResource){ if (absPaneRsc instanceof NsharpSkewTPaneResource){
skewtPaneRsc = (NsharpSkewTPaneResource)absPaneRsc ; skewtPaneRsc = (NsharpSkewTPaneResource)absPaneRsc ;
skewtPaneRsc.setLinePropertyMap(linePropertyMap); skewtPaneRsc.setLinePropertyMap(linePropertyMap);
skewtPaneRsc.setGraphConfigProperty(graphConfigProperty); skewtPaneRsc.setGraphConfigProperty(graphConfigProperty);
skewtPaneRsc.setNsharpNative(nsharpNative); skewtPaneRsc.setNsharpNative(nsharpNative);
} }
else if (absPaneRsc instanceof NsharpDataPaneResource){ else if (absPaneRsc instanceof NsharpDataPaneResource){
dataPaneRsc = (NsharpDataPaneResource)absPaneRsc; dataPaneRsc = (NsharpDataPaneResource)absPaneRsc;
dataPaneRsc.setLinePropertyMap(linePropertyMap); dataPaneRsc.setLinePropertyMap(linePropertyMap);
dataPaneRsc.setGraphConfigProperty(graphConfigProperty); dataPaneRsc.setGraphConfigProperty(graphConfigProperty);
dataPaneRsc.setNsharpNative(nsharpNative); dataPaneRsc.setNsharpNative(nsharpNative);
dataPaneRsc.setPageDisplayOrderNumberArray(pageDisplayOrderNumberArray); dataPaneRsc.setPageDisplayOrderNumberArray(pageDisplayOrderNumberArray);
} }
else if (absPaneRsc instanceof NsharpHodoPaneResource){ else if (absPaneRsc instanceof NsharpHodoPaneResource){
hodoPaneRsc = (NsharpHodoPaneResource)absPaneRsc; hodoPaneRsc = (NsharpHodoPaneResource)absPaneRsc;
hodoPaneRsc.setLinePropertyMap(linePropertyMap); hodoPaneRsc.setLinePropertyMap(linePropertyMap);
hodoPaneRsc.setGraphConfigProperty(graphConfigProperty); hodoPaneRsc.setGraphConfigProperty(graphConfigProperty);
hodoPaneRsc.setNsharpNative(nsharpNative); hodoPaneRsc.setNsharpNative(nsharpNative);
} }
else if (absPaneRsc instanceof NsharpWitoPaneResource && else if (absPaneRsc instanceof NsharpWitoPaneResource &&
(paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)|| (paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)||
paneConfigurationName.equals(NsharpConstants.PANE_DEF_CFG_1_STR)|| paneConfigurationName.equals(NsharpConstants.PANE_DEF_CFG_1_STR)||
paneConfigurationName.equals(NsharpConstants.PANE_DEF_CFG_2_STR))){ paneConfigurationName.equals(NsharpConstants.PANE_DEF_CFG_2_STR))){
witoPaneRsc = (NsharpWitoPaneResource)absPaneRsc; witoPaneRsc = (NsharpWitoPaneResource)absPaneRsc;
witoPaneRsc.setLinePropertyMap(linePropertyMap); witoPaneRsc.setLinePropertyMap(linePropertyMap);
witoPaneRsc.setGraphConfigProperty(graphConfigProperty); witoPaneRsc.setGraphConfigProperty(graphConfigProperty);
@ -2214,7 +2224,7 @@ public class NsharpResourceHandler {
insetPaneRsc.setLinePropertyMap(linePropertyMap); insetPaneRsc.setLinePropertyMap(linePropertyMap);
insetPaneRsc.setGraphConfigProperty(graphConfigProperty); insetPaneRsc.setGraphConfigProperty(graphConfigProperty);
insetPaneRsc.setNsharpNative(nsharpNative); insetPaneRsc.setNsharpNative(nsharpNative);
} }
else if (absPaneRsc instanceof NsharpSpcGraphsPaneResource && paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){ else if (absPaneRsc instanceof NsharpSpcGraphsPaneResource && paneConfigurationName.equals(NsharpConstants.PANE_SPCWS_CFG_STR)){
spcGraphsPaneRsc = (NsharpSpcGraphsPaneResource)absPaneRsc; spcGraphsPaneRsc = (NsharpSpcGraphsPaneResource)absPaneRsc;
@ -2231,7 +2241,7 @@ public class NsharpResourceHandler {
} }
else if (absPaneRsc instanceof NsharpTimeStnPaneResource && else if (absPaneRsc instanceof NsharpTimeStnPaneResource &&
(paneConfigurationName.equals(NsharpConstants.PANE_SIMPLE_D2D_CFG_STR)|| (paneConfigurationName.equals(NsharpConstants.PANE_SIMPLE_D2D_CFG_STR)||
paneConfigurationName.equals(NsharpConstants.PANE_DEF_CFG_1_STR)|| paneConfigurationName.equals(NsharpConstants.PANE_DEF_CFG_1_STR)||
paneConfigurationName.equals(NsharpConstants.PANE_DEF_CFG_2_STR))){ paneConfigurationName.equals(NsharpConstants.PANE_DEF_CFG_2_STR))){
timeStnPaneRsc = (NsharpTimeStnPaneResource)absPaneRsc ; timeStnPaneRsc = (NsharpTimeStnPaneResource)absPaneRsc ;
timeStnPaneRsc.setLinePropertyMap(linePropertyMap); timeStnPaneRsc.setLinePropertyMap(linePropertyMap);