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

Issue #3026 - Implement last minute requirement change, change location of text on screen

Browse source 
Change-Id: I2f8fb480a3259bae71f7c09e46e393a413972378

Former-commit-id: 153ee82abf [formerly a5708994f7] [formerly b98cc4c385] [formerly 153ee82abf [formerly a5708994f7] [formerly b98cc4c385] [formerly 57f51e4c99 [formerly b98cc4c385 [formerly 773590a3936ca34be68cb5b19ae8fbf027085926]]]]
Former-commit-id: 57f51e4c99
Former-commit-id: 3d469bacd6 [formerly f2d043a8a2] [formerly 749c3f7fa47098be0e97ac595bbc122868ed195f [formerly bf8c0bb296]]
Former-commit-id: 95ffff8193e2d373d9f39298a5a6cfae22a30e30 [formerly 09ce659b76]
Former-commit-id: b6c023da1f
This commit is contained in:
Mike Duff 2014-12-16 12:28:52 -06:00
parent cbe368a0ba
commit 149d20885d
3 changed files with 26 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cave/com.raytheon.uf.viz.hpe/src/com/raytheon/uf/viz/hpe/rsc/HpeLabelResource.java
View file

@ -65,6 +65,7 @@ import com.raytheon.viz.grid.rsc.general.D2DGridResource;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* May 5, 2014 3026 mpduff Initial creation * May 5, 2014 3026 mpduff Initial creation
* Dec 16, 2014 3026 mpduff Change location of text
* *
* </pre> * </pre>
* *
@ -121,7 +122,7 @@ public class HpeLabelResource extends
.getResourcesByTypeAsType(D2DGridResource.class); .getResourcesByTypeAsType(D2DGridResource.class);
if (!list.isEmpty()) { if (!list.isEmpty()) {
double[] pixel = paintProps.getView().getDisplayCoords( double[] pixel = paintProps.getView().getDisplayCoords(
new double[] { 125, 50 }, target); new double[] { 125, 100 }, target);
RGB color = getCapability(ColorableCapability.class).getColor(); RGB color = getCapability(ColorableCapability.class).getColor();
for (D2DGridResource rsc : list) { for (D2DGridResource rsc : list) {
GridRecord currentGridRec = rsc.getCurrentGridRecord(); GridRecord currentGridRec = rsc.getCurrentGridRecord();

14
cave/com.raytheon.uf.viz.monitor.ffmp/src/com/raytheon/uf/viz/monitor/ffmp/ui/rsc/FFMPResource.java
View file

@ -185,6 +185,7 @@ import com.vividsolutions.jts.geom.Point;
* May 05, 2014 3026 mpduff Display Hpe bias source. * May 05, 2014 3026 mpduff Display Hpe bias source.
* May 19, 2014 DR 16096 gzhang Make getBasin() protected for FFMPDataGenerator. * May 19, 2014 DR 16096 gzhang Make getBasin() protected for FFMPDataGenerator.
* Nov 10, 2014 3026 dhladky HPE BIAS displays. * Nov 10, 2014 3026 dhladky HPE BIAS displays.
* Dec 16, 2014 3026 mpduff Change location of text
* </pre> * </pre>
* *
* @author dhladky * @author dhladky
@ -1466,7 +1467,7 @@ public class FFMPResource extends
private void paintProductString(IGraphicsTarget target, private void paintProductString(IGraphicsTarget target,
PaintProperties paintProps) throws VizException { PaintProperties paintProps) throws VizException {
double[] pixel = paintProps.getView().getDisplayCoords( double[] pixel = paintProps.getView().getDisplayCoords(
new double[] { 110, 50 }, target); new double[] { 110, 100 }, target);
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
if (isAutoRefresh || isQuery) { if (isAutoRefresh || isQuery) {
sb.append("FFMP ").append(df.format(getTime())).append(" hour ") sb.append("FFMP ").append(df.format(getTime())).append(" hour ")
@ -3168,7 +3169,8 @@ public class FFMPResource extends
if (rateBasin != null) { if (rateBasin != null) {
for (Date date : rateBasin.getValues().keySet()) { for (Date date : rateBasin.getValues().keySet()) {
if (date.before(minUriTime) || date.before(barrierTime) || date.after(mostRecentRefTime)) if (date.before(minUriTime) || date.before(barrierTime)
|| date.after(mostRecentRefTime))
continue;// DR 16148 continue;// DR 16148
double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime, double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime,
@ -3196,7 +3198,8 @@ public class FFMPResource extends
for (Date date : qpeBasin.getValues().keySet()) { for (Date date : qpeBasin.getValues().keySet()) {
if (date.before(minUriTime) || date.before(barrierTime) || date.after(mostRecentRefTime)) if (date.before(minUriTime) || date.before(barrierTime)
|| date.after(mostRecentRefTime))
continue;// DR 16148 continue;// DR 16148
double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime, double dtime = FFMPGuiUtils.getTimeDiff(mostRecentRefTime,
@ -4141,8 +4144,9 @@ public class FFMPResource extends
} }
/** /**
* This method creates the upper left legend text for HPE derived QPE sources. * This method creates the upper left legend text for HPE derived QPE
* It is only used for HPE QPE sources. * sources. It is only used for HPE QPE sources.
*
* @param date * @param date
* @return * @return
*/ */

7
edexOsgi/com.raytheon.uf.edex.plugin.hpe/src/com/raytheon/uf/edex/plugin/hpe/util/HpeLabelGenerator.java
View file

@ -41,6 +41,7 @@ import com.raytheon.uf.edex.plugin.hpe.util.HpeEnums.HpeDataSource;
* Date Ticket# Engineer Description * Date Ticket# Engineer Description
* ------------ ---------- ----------- -------------------------- * ------------ ---------- ----------- --------------------------
* Mar 26, 2014 3026 mpduff Initial creation * Mar 26, 2014 3026 mpduff Initial creation
* Dec 16, 2014 3026 mpduff Add default value if numPairs < npairBiasSelect
* *
* </pre> * </pre>
* *
@ -172,7 +173,11 @@ public class HpeLabelGenerator {
sb.append(bias).append(SLASH) sb.append(bias).append(SLASH)
.append((int) rec.getNumPairs()); .append((int) rec.getNumPairs());
sb.append(StringUtil.NEWLINE); sb.append(StringUtil.NEWLINE);
return sb.toString();
} else {
sb.append("1.00").append(SLASH)
.append((int) rec.getNumPairs());
sb.append(StringUtil.NEWLINE);
return sb.toString(); return sb.toString();
} }
} }