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

12.11.1-12 baseline

Browse source 
Former-commit-id: 9ff9cb8aa3 [formerly 14a4f6c31948361ff83aa64d6eaca3d958fd1d8f]
Former-commit-id: 8682e4f6ca
This commit is contained in:
Steve Harris 2012-10-29 12:15:56 -05:00
parent 63dddc5f5f
commit 565756567f
7 changed files with 37 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
cave/com.raytheon.uf.viz.d2d.core/src/com/raytheon/uf/viz/d2d/core/time/TimeMatcher.java
View file

@ -651,21 +651,12 @@ public class TimeMatcher {
dtd = (rv.intrinsicPeriod * 3) / 2;
dataFcsts = rv.haveForecasts;
if (fspatial) {
dtf = dt;
frameFcsts = dataFcsts;
} else {
rv = intrinsicPeriod(frameTimes, frameFcsts);
dtf = rv.intrinsicPeriod;
frameFcsts = rv.haveForecasts;
}
rv = intrinsicPeriod(frameTimes, frameFcsts);
dtf = rv.intrinsicPeriod;
frameFcsts = rv.haveForecasts;
if (dt > ONE_MINUTE_MS && dt <= ELEVEN_MINUTES_MS
&& dtf > ONE_MINUTE_MS && dtf <= ELEVEN_MINUTES_MS
&& radarOnRadarYes) {
if (dtf < dt) {
dt = dtf;
}
if (fspatial) {
frameFcsts = dataFcsts;
} else if (dtf > dt) {
dt = dtf;
}
@ -683,12 +674,17 @@ public class TimeMatcher {
dt++;
}
if (dt > dtd || frameTimes[ef].getMatchValid() - latest.getTime() > dtd) {
// The first check makes sure that dtd is always bigger than dt
// since dtd is supposed to add extra padding to the time. The
// second check makes it so that if the latest frameTime is past the
// latest depictTime by more than dtd than we ignore dtd by setting
// it to dt which makes it a no op.
if (dt > dtd || dt < dtf
|| frameTimes[ef].getMatchValid() - latest.getTime() > dtd) {
// Three conditions here:
// 1) dtd is supposed to provide extra padding compared to dt, so if
// dt is bigger then set them equal to avoid reducing the padding.
// 2) Clear the extra padding if the acceptable depict time spacing
// is not bigger than the frame time spacing
// 3) Clear the extra padding if the latest frame time is not within
// dtd of the latest depict time
// setting dtd to dt makes any use of dtd a noop.
dtd = dt;
}

3
cave/com.raytheon.viz.gfe/src/com/raytheon/viz/gfe/makehazard/MakeHazardDialog.java
View file

@ -25,6 +25,7 @@ import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@ -724,7 +725,7 @@ public class MakeHazardDialog extends CaveSWTDialog implements
private List<String> getZoneList() {
List<List<String>> zoneGroupings = zoneSelector.getZoneGroupings();
List<String> zoneList = null;
List<String> zoneList = Collections.emptyList();
if (zoneGroupings.size() > 0) {
zoneList = zoneGroupings.get(0);
}

6
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/db/dao/GFEDao.java
View file

@ -849,10 +849,10 @@ public class GFEDao extends DefaultPluginDao {
if (dTimeList.contains(tr)) {
timeList.add(new TimeRange(tr.getStart(), tr.getStart()));
}
}
if (!timeList.isEmpty()) {
return timeList;
}
if (!timeList.isEmpty()) {
return timeList;
}
} else {
List<DataTime> results = executeD2DParmQuery(id);

6
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/D2DGridDatabase.java
View file

@ -177,9 +177,9 @@ public class D2DGridDatabase extends VGridDatabase {
+ ": GFE domain does not overlap dataset domain.");
this.remap = null;
} else {
this.remap = new RemapGrid(NetCDFUtils.subGridGL(
dbId.toString(), this.inputLoc, subdomain),
this.outputLoc);
GridLocation subGloc = new GridLocation(dbId.toString(),
this.inputLoc, subdomain);
this.remap = new RemapGrid(subGloc, this.outputLoc);
}
}

12
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/NetCDFGridDatabase.java
View file

@ -19,6 +19,7 @@
**/
package com.raytheon.edex.plugin.gfe.server.database;
import java.awt.Point;
import java.awt.Rectangle;
import java.util.ArrayList;
import java.util.Arrays;
@ -51,6 +52,7 @@ import com.raytheon.uf.common.status.UFStatus;
import com.raytheon.uf.common.status.UFStatus.Priority;
import com.raytheon.uf.common.time.TimeRange;
import com.raytheon.uf.edex.database.DataAccessLayerException;
import com.vividsolutions.jts.geom.Coordinate;
/**
* Database that reads netCDF files like A1
@ -205,9 +207,13 @@ public class NetCDFGridDatabase extends VGridDatabase {
+ ": GFE domain does not overlap dataset domain.");
this.remap = null;
} else {
this.remap = new RemapGrid(NetCDFUtils.subGridGL(
this.dbId.toString(), this.inputGloc, this.subdomain),
this.outputGloc);
GridLocation subGloc = new GridLocation(this.dbId.toString(),
this.inputGloc.getProjection(), new Point(
this.subdomain.width, this.subdomain.height),
new Coordinate(this.subdomain.x, this.subdomain.y),
new Coordinate(this.subdomain.width,
this.subdomain.height), "GMT");
this.remap = new RemapGrid(subGloc, this.outputGloc);
}
loadParms();
}

11
edexOsgi/com.raytheon.edex.plugin.gfe/src/com/raytheon/edex/plugin/gfe/server/database/NetCDFUtils.java
View file

@ -370,15 +370,4 @@ public class NetCDFUtils {
return rval;
}
public static GridLocation subGridGL(String id, GridLocation igloc,
Rectangle subd) {
// Coordinate nwo = igloc.worldCoordinate(subd.origin());
// Coordinate nwe = igloc.worldCoordinate(subd.upperRight());
// CartDomain2D<float> swd (nwo, nwe - nwo);
// return GridLocation(igloc.projection()->pdata(),
// subd.extent() + Point (1, 1), swd);
return new GridLocation(id, igloc, subd);
}
}

4
rpms/build/common/lookupRPM.sh
View file

@ -117,6 +117,10 @@ function lookupRPM()
fi
# awips2 rpms.
if [ "${1}" = "Installer.ncep-database" ]; then
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.ncep-database"
return 0
fi
if [ "${1}" = "awips2-adapt-native" ]; then
export RPM_SPECIFICATION="${awips2_core_dir}/Installer.adapt-native"
return 0