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

Merge branch 'master_14.3.1' into asm_14.3.1

Browse source 
Former-commit-id: 1ac5b6af5d [formerly 34931f4cc5 [formerly cca25d0e29324cc883f177597e0975279b07c8ca]]
Former-commit-id: 34931f4cc5
Former-commit-id: a40f672610
This commit is contained in:
Brian.Dyke 2014-10-27 15:51:57 -04:00
commit 75ca44e7de
2 changed files with 37 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1940,9 +1940,10 @@ public class NsharpResourceHandler {
return; return;
} }
if (!fromArchive) { if (!fromArchive) {
// start FixMark:nearByStnCompSnd d2dlite // For those sounding report with forecast time, e.g. model/pfc sounding
if (!(sndType.contentEquals("NCUAIR") || sndType if (timeLine.contains("V")) { //fix D2D loading issue. 10/8/2014
.contentEquals("BUFRUA"))) { // if (!(sndType.contentEquals("NCUAIR") || sndType
// .contentEquals("BUFRUA"))) {
// Chin's NOTE: // Chin's NOTE:
// Can Not use reference time directly from the stnInfo, // Can Not use reference time directly from the stnInfo,
// Timestamp refTime = stnInfo.getReftime() // Timestamp refTime = stnInfo.getReftime()

51
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/view/NsharpPaletteWindow.java
View file

@ -16,7 +16,7 @@
* 01/08/2014 Chin Chen Only initializing inventory when in NCP * 01/08/2014 Chin Chen Only initializing inventory when in NCP
* 01/13/2014 Chin Chen TTR829- when interpolation, edit graph is allowed * 01/13/2014 Chin Chen TTR829- when interpolation, edit graph is allowed
* 01/22/2014 Chin Chen DR17003 issue: NSHARP sounding display throws errors when swapping into main pane when show text is turned on. * 01/22/2014 Chin Chen DR17003 issue: NSHARP sounding display throws errors when swapping into main pane when show text is turned on.
* * 10/20/2014 Chin Chen DR16864, D2D does not use unload button. Check to make sure not D2D instance before access unload button.
* </pre> * </pre>
* *
* @author Chin Chen * @author Chin Chen
@ -150,7 +150,7 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
private boolean spcGpCreated = false; private boolean spcGpCreated = false;
private boolean awcGpCreated = false; private boolean imD2d = false; // fixMark:NcInventory
public static NsharpPaletteWindow getInstance() { public static NsharpPaletteWindow getInstance() {
if (VizPerspectiveListener.getCurrentPerspectiveManager() != null) { if (VizPerspectiveListener.getCurrentPerspectiveManager() != null) {
@ -220,7 +220,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false); graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} else if (compareStnIsOn) { } else if (compareStnIsOn) {
compareStnBtn.setText(COMP_STN_ON); compareStnBtn.setText(COMP_STN_ON);
graphEditBtn.setEnabled(false); graphEditBtn.setEnabled(false);
@ -231,7 +232,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false); graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} else if (compareSndIsOn) { } else if (compareSndIsOn) {
compareSndBtn.setText(COMP_SND_ON); compareSndBtn.setText(COMP_SND_ON);
graphEditBtn.setEnabled(false); graphEditBtn.setEnabled(false);
@ -242,7 +244,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false); graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} else if (compareTmIsOn) { } else if (compareTmIsOn) {
compareTmBtn.setText(COMP_TM_ON); compareTmBtn.setText(COMP_TM_ON);
compareSndBtn.setEnabled(false); compareSndBtn.setEnabled(false);
@ -253,7 +256,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false); graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} else if (editGraphOn) { } else if (editGraphOn) {
graphEditBtn.setText(EDIT_GRAPH_ON); graphEditBtn.setText(EDIT_GRAPH_ON);
dataEditBtn.setEnabled(false); dataEditBtn.setEnabled(false);
@ -264,7 +268,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
graphModeBtnTurb.setEnabled(false); graphModeBtnTurb.setEnabled(false);
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false); // FixMark:nearByStnCompSnd
} }
} else if (currentGraphMode == NsharpConstants.GRAPH_TURB) { } else if (currentGraphMode == NsharpConstants.GRAPH_TURB) {
@ -377,7 +382,7 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
public NsharpPaletteWindow() { public NsharpPaletteWindow() {
super(); super();
instance = this; instance = this;
boolean imD2d = false; // fixMark:NcInventory //boolean imD2d = false; // fixMark:NcInventory
if (VizPerspectiveListener.getCurrentPerspectiveManager() != null) { if (VizPerspectiveListener.getCurrentPerspectiveManager() != null) {
if (VizPerspectiveListener.getCurrentPerspectiveManager() if (VizPerspectiveListener.getCurrentPerspectiveManager()
.getPerspectiveId().equals(D2D5Pane.ID_PERSPECTIVE)) { .getPerspectiveId().equals(D2D5Pane.ID_PERSPECTIVE)) {
@ -945,7 +950,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
cfgBtn.setEnabled(false); cfgBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} else { } else {
overlayIsOn = false; overlayIsOn = false;
overlayBtn.setText(OVLY_OFF); overlayBtn.setText(OVLY_OFF);
@ -958,7 +964,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(true); graphModeBtnIcing.setEnabled(true);
interpBtn.setEnabled(true); interpBtn.setEnabled(true);
cfgBtn.setEnabled(true); cfgBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
} }
NsharpResourceHandler rsc = getRscHandler(); NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) { if (rsc != null) {
@ -1001,7 +1008,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
cfgBtn.setEnabled(false); cfgBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} else { } else {
compareStnIsOn = false; compareStnIsOn = false;
compareStnBtn.setText(COMP_STN_OFF); compareStnBtn.setText(COMP_STN_OFF);
@ -1014,7 +1022,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(true); graphModeBtnIcing.setEnabled(true);
interpBtn.setEnabled(true); interpBtn.setEnabled(true);
cfgBtn.setEnabled(true); cfgBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
} }
NsharpResourceHandler rsc = getRscHandler(); NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) { if (rsc != null) {
@ -1059,7 +1068,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
cfgBtn.setEnabled(false); cfgBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} else { } else {
compareTmIsOn = false; compareTmIsOn = false;
compareTmBtn.setText(COMP_TM_OFF); compareTmBtn.setText(COMP_TM_OFF);
@ -1072,7 +1082,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(true); graphModeBtnIcing.setEnabled(true);
interpBtn.setEnabled(true); interpBtn.setEnabled(true);
cfgBtn.setEnabled(true); cfgBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
} }
NsharpResourceHandler rsc = getRscHandler(); NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) { if (rsc != null) {
@ -1115,7 +1126,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(false); graphModeBtnIcing.setEnabled(false);
interpBtn.setEnabled(false); interpBtn.setEnabled(false);
cfgBtn.setEnabled(false); cfgBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} else { } else {
compareSndIsOn = false; compareSndIsOn = false;
compareSndBtn.setText(COMP_SND_OFF); compareSndBtn.setText(COMP_SND_OFF);
@ -1128,7 +1140,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
graphModeBtnIcing.setEnabled(true); graphModeBtnIcing.setEnabled(true);
interpBtn.setEnabled(true); interpBtn.setEnabled(true);
cfgBtn.setEnabled(true); cfgBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
} }
NsharpResourceHandler rsc = getRscHandler(); NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) { if (rsc != null) {
@ -1187,7 +1200,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
compareSndBtn.setEnabled(true); compareSndBtn.setEnabled(true);
compareStnBtn.setEnabled(true); compareStnBtn.setEnabled(true);
overlayBtn.setEnabled(true); overlayBtn.setEnabled(true);
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(true);// FixMark:nearByStnCompSnd
} }
} else { } else {
editGraphOn = true; editGraphOn = true;
@ -1200,7 +1214,8 @@ public class NsharpPaletteWindow extends ViewPart implements SelectionListener,
compareSndBtn.setEnabled(false); compareSndBtn.setEnabled(false);
compareStnBtn.setEnabled(false); compareStnBtn.setEnabled(false);
overlayBtn.setEnabled(false); overlayBtn.setEnabled(false);
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd if (!imD2d)
unloadBtn.setEnabled(false);// FixMark:nearByStnCompSnd
} }
NsharpResourceHandler rsc = getRscHandler(); NsharpResourceHandler rsc = getRscHandler();
if (rsc != null) { if (rsc != null) {