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

Omaha #3300 Fixing merge errors in PointPrecipPlotResource

Browse source 
Change-Id: I6c5b8f0f2e590b0cf0440c1885435c2bf5649df4

Former-commit-id: d71e91a297 [formerly 260a818778] [formerly 56c3135aef] [formerly 25f32b4c70 [formerly 56c3135aef [formerly e7968f03e688e7dbad9a2e87b9de7f0664997a5f]]]
Former-commit-id: 25f32b4c70
Former-commit-id: fb0588046442bda24401b075821a17c3dc4f20a1 [formerly ca03110763]
Former-commit-id: d282d70d60
This commit is contained in:
David Lovely 2015-02-12 09:16:30 -06:00
parent f59cef1b7a
commit 7782f738b9
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cave/com.raytheon.viz.mpe.ui/src/com/raytheon/viz/mpe/ui/rsc/PointPrecipPlotResource.java
View file

@ -37,8 +37,6 @@ import javax.measure.unit.NonSI;
import javax.measure.unit.Unit;
import org.eclipse.swt.graphics.RGB;
import org.eclipse.swt.widgets.Shell;
import org.eclipse.ui.PlatformUI;
import org.opengis.referencing.FactoryException;
import org.opengis.referencing.operation.TransformException;
@ -174,8 +172,6 @@ public class PointPrecipPlotResource extends
strTree = new STRtree();
gageData = dqc.new Station();
if (!station.isEmpty()) {
if (!dqc.precip_stations.isEmpty()) {
int i = 0;
for (ListIterator<Station> it = dqc.precip_stations.listIterator(); it
@ -191,7 +187,8 @@ public class PointPrecipPlotResource extends
kv.append(":");
kv.append(pm);
dataMap.put(kv.toString(), gageData);
pdataMap.put(kv.toString(), DailyQcUtils.pdata[DailyQcUtils.pcpn_day].stn[i]);
pdataMap.put(kv.toString(),
DailyQcUtils.pdata[DailyQcUtils.pcpn_day].stn[i]);
/* Create a small envelope around the point */
Coordinate p1 = new Coordinate(xy.x + .02, xy.y + .02);
@ -336,7 +333,8 @@ public class PointPrecipPlotResource extends
}
for (m = 0; m < tsmax; m++) {
if (station.parm.substring(3, 5).equalsIgnoreCase(ts[m].abr)
if (station.parm.substring(3, 5)
.equalsIgnoreCase(dqc.ts[m].abr)
&& (DailyQcUtils.dflag[m + 1] == 1)) {
break;
}
@ -349,9 +347,9 @@ public class PointPrecipPlotResource extends
for (m = 0; m < 9; m++) {
if ((m == pdataMap.get(key).frain[time_pos].qual)
&& (qflag[m] == 1)) {
&& (dqc.qflag[m] == 1)) {
break;
} else if ((m == 7) && (qflag[7] == 1)
} else if ((m == 7) && (dqc.qflag[7] == 1)
&& (pdataMap.get(key).frain[time_pos].data == -99)
&& (pdataMap.get(key).frain[time_pos].qual == -99)) {
break;