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

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

Browse source 
Former-commit-id: baae521302 [formerly c66947286c [formerly f1be2cce4596c1b9405757a8a2e11b8ab0e0eb22]]
Former-commit-id: c66947286c
Former-commit-id: 1d531e9903
This commit is contained in:
Fay.Liang 2014-12-15 12:45:17 -05:00
commit d9cd7d51ab
2 changed files with 21 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2627,7 +2627,10 @@ public class NsharpResourceHandler {
break; break;
} }
if (compareSndIsOn) {
handleUserPickNewTimeLine(currentTimeElementListIndex) ;
return;
}
curTimeLinePage = currentTimeElementListIndex / numTimeLinePerPage curTimeLinePage = currentTimeElementListIndex / numTimeLinePerPage
+ 1; + 1;
setCurSndProfileProp(); setCurSndProfileProp();
@ -2764,6 +2767,9 @@ public class NsharpResourceHandler {
// we should get out of here // we should get out of here
break; break;
} else if (compareSndIsOn) { } else if (compareSndIsOn) {
handleUserPickNewTimeLine(targetIndex) ;
return;
/* Chin TBD 12112014
boolean found = false; boolean found = false;
if (currentStnElementListIndex >= 0 if (currentStnElementListIndex >= 0
&& currentSndElementListIndex >= 0 && currentSndElementListIndex >= 0
@ -2789,6 +2795,7 @@ public class NsharpResourceHandler {
if (!found) { if (!found) {
currentSndElementListIndex = -1; currentSndElementListIndex = -1;
} else { } else {
int colorIndex = NsharpConstants.LINE_COMP1; int colorIndex = NsharpConstants.LINE_COMP1;
for (NsharpOperationElement elm : sndElementList) { for (NsharpOperationElement elm : sndElementList) {
if (elm.getActionState() == NsharpConstants.ActState.INACTIVE) if (elm.getActionState() == NsharpConstants.ActState.INACTIVE)
@ -2804,11 +2811,13 @@ public class NsharpResourceHandler {
if (colorIndex > NsharpConstants.LINE_COMP10) if (colorIndex > NsharpConstants.LINE_COMP10)
colorIndex = NsharpConstants.LINE_COMP1; colorIndex = NsharpConstants.LINE_COMP1;
} }
} }
// no matter we find current snd type for this stn or // no matter we find current snd type for this stn or
// not // not
// we should get out of here // we should get out of here
break; break;
*/
} else { } else {
break; break;
} }

21
ncep/gov.noaa.nws.ncep.ui.nsharp/src/gov/noaa/nws/ncep/ui/nsharp/display/rsc/NsharpSkewTPaneResource.java
View file

@ -14,6 +14,7 @@ package gov.noaa.nws.ncep.ui.nsharp.display.rsc;
* May 08, 2013 1847 bsteffen Allow painting with no Wind Data. * May 08, 2013 1847 bsteffen Allow painting with no Wind Data.
* 02/03/2014 1106 Chin Chen Need to be able to use clicking on the Src,Time, or StnId to select display * 02/03/2014 1106 Chin Chen Need to be able to use clicking on the Src,Time, or StnId to select display
* 08/04/2014 Chin Chen fixed effective level line drawing, height marker drawing * 08/04/2014 Chin Chen fixed effective level line drawing, height marker drawing
* 12/11/2014 DR16888 Chin Chen fixed issue that "Comp(Src) button not functioning properly in NSHARP display"
* *
* </pre> * </pre>
* *
@ -1860,7 +1861,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
boolean overlayIsOn = rscHandler.isOverlayIsOn(); boolean overlayIsOn = rscHandler.isOverlayIsOn();
if (graphConfigProperty != null) { if (graphConfigProperty != null) {
if (graphConfigProperty.isTemp() == true && !compareStnIsOn if (graphConfigProperty.isTemp() == true && !compareStnIsOn
&& !compareTmIsOn) { && !compareTmIsOn && !compareSndIsOn) {
if (editGraphOn) if (editGraphOn)
plotPressureTempEditPoints(target, world, plotPressureTempEditPoints(target, world,
NsharpConstants.color_red, TEMP_TYPE, NsharpConstants.color_red, TEMP_TYPE,
@ -1868,7 +1869,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
} }
// dew point curve // dew point curve
if (graphConfigProperty.isDewp() == true && !compareStnIsOn if (graphConfigProperty.isDewp() == true && !compareStnIsOn
&& !compareTmIsOn) { && !compareTmIsOn && !compareSndIsOn) {
if (editGraphOn) if (editGraphOn)
plotPressureTempEditPoints(target, world, plotPressureTempEditPoints(target, world,
NsharpConstants.color_green, DEWPOINT_TYPE, NsharpConstants.color_green, DEWPOINT_TYPE,
@ -1876,7 +1877,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
} }
// plot wet bulb trace // plot wet bulb trace
if (graphConfigProperty.isWetBulb() == true if (graphConfigProperty.isWetBulb() == true
&& !compareStnIsOn && !compareTmIsOn) { && !compareStnIsOn && !compareTmIsOn && !compareSndIsOn) {
NsharpLineProperty lp = linePropertyMap NsharpLineProperty lp = linePropertyMap
.get(NsharpConstants.lineNameArray[NsharpConstants.LINE_WETBULB]); .get(NsharpConstants.lineNameArray[NsharpConstants.LINE_WETBULB]);
target.drawWireframeShape(wetBulbTraceRscShape, target.drawWireframeShape(wetBulbTraceRscShape,
@ -1885,7 +1886,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
} }
// plot virtual temperature trace // plot virtual temperature trace
if (graphConfigProperty.isVTemp() == true if (graphConfigProperty.isVTemp() == true
&& !compareStnIsOn && !compareTmIsOn) { && !compareStnIsOn && !compareTmIsOn && !compareSndIsOn) {
NsharpLineProperty lp = linePropertyMap NsharpLineProperty lp = linePropertyMap
.get(NsharpConstants.lineNameArray[NsharpConstants.LINE_VIRTUAL_TEMP]); .get(NsharpConstants.lineNameArray[NsharpConstants.LINE_VIRTUAL_TEMP]);
target.drawWireframeShape(vtempTraceCurveRscShape, target.drawWireframeShape(vtempTraceCurveRscShape,
@ -1894,7 +1895,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
} }
// virtual temperature parcel trace curve // virtual temperature parcel trace curve
if (graphConfigProperty.isParcelTv() == true if (graphConfigProperty.isParcelTv() == true
&& !compareStnIsOn && !compareTmIsOn && !compareStnIsOn && !compareTmIsOn && !compareSndIsOn
&& !overlayIsOn) { && !overlayIsOn) {
if (soundingLys.size() > 0) { if (soundingLys.size() > 0) {
NsharpLineProperty lp = linePropertyMap NsharpLineProperty lp = linePropertyMap
@ -1906,7 +1907,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
} }
if (graphConfigProperty.isDcape() == true if (graphConfigProperty.isDcape() == true
&& dacpeTraceRscShape != null && !compareStnIsOn && dacpeTraceRscShape != null && !compareStnIsOn && !compareSndIsOn
&& !compareTmIsOn && !overlayIsOn) { && !compareTmIsOn && !overlayIsOn) {
if (soundingLys.size() > 0) { if (soundingLys.size() > 0) {
NsharpLineProperty lp = linePropertyMap NsharpLineProperty lp = linePropertyMap
@ -1918,7 +1919,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
} }
} }
if (graphConfigProperty.isEffLayer() == true if (graphConfigProperty.isEffLayer() == true
&& !compareStnIsOn && !compareTmIsOn) { && !compareStnIsOn && !compareTmIsOn && !compareSndIsOn) {
// draw effective layer lines // draw effective layer lines
// drawEffectiveLayerLines(target); // drawEffectiveLayerLines(target);
target.drawWireframeShape(effectiveLayerLineShape, target.drawWireframeShape(effectiveLayerLineShape,
@ -1927,7 +1928,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
} }
// cloud // cloud
if (graphConfigProperty.isCloud() == true if (graphConfigProperty.isCloud() == true
&& !compareStnIsOn && !compareTmIsOn) { && !compareStnIsOn && !compareTmIsOn && !compareSndIsOn) {
if (cloudFMShape != null) if (cloudFMShape != null)
target.drawShadedShape(cloudFMShape, 1f); target.drawShadedShape(cloudFMShape, 1f);
if (cloudFMLabelShape != null) if (cloudFMLabelShape != null)
@ -1938,7 +1939,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
target.drawShadedShape(cloudCEShape, 1f); target.drawShadedShape(cloudCEShape, 1f);
} }
if (graphConfigProperty.isOmega() == true if (graphConfigProperty.isOmega() == true
&& !compareStnIsOn && !compareTmIsOn) { && !compareStnIsOn && !compareTmIsOn && !compareSndIsOn) {
if (NsharpLoadDialog.getAccess() != null if (NsharpLoadDialog.getAccess() != null
&& (NsharpLoadDialog.getAccess() && (NsharpLoadDialog.getAccess()
.getActiveLoadSoundingType() == NsharpLoadDialog.MODEL_SND || NsharpLoadDialog .getActiveLoadSoundingType() == NsharpLoadDialog.MODEL_SND || NsharpLoadDialog
@ -1950,7 +1951,7 @@ public class NsharpSkewTPaneResource extends NsharpAbstractPaneResource {
} }
} else { } else {
// by default, draw everything // by default, draw everything
if (!compareStnIsOn && !compareTmIsOn) { if (!compareStnIsOn && !compareTmIsOn && !compareSndIsOn) {
if (editGraphOn) if (editGraphOn)
plotPressureTempEditPoints(target, world, plotPressureTempEditPoints(target, world,
NsharpConstants.color_red, TEMP_TYPE, NsharpConstants.color_red, TEMP_TYPE,