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

Merge "Issue #2262 Convert ncep ContoursToGrid to use new FortConBuf." into development

Browse source 
Former-commit-id: cdcbb85578 [formerly c1a79922cc] [formerly f112ab22c4] [formerly 2e240ea7a9 [formerly f112ab22c4 [formerly f2aa34f138ca01036d558f20a71c637be5c6a066]]]
Former-commit-id: 2e240ea7a9
Former-commit-id: c18f5c0dc62c4015fe678d796eb38b446213dd15 [formerly 455832b850]
Former-commit-id: 5227144a46
This commit is contained in:
Nate Jensen 2013-08-28 12:05:57 -05:00 • committed by Gerrit Code Review
commit 509eb2d17a
2 changed files with 36 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ncep/gov.noaa.nws.ncep.ui.pgen/META-INF/MANIFEST.MF
View file

@ -38,7 +38,7 @@ Export-Package: gov.noaa.nws.ncep.ui.pgen,
gov.noaa.nws.ncep.ui.pgen.sigmet,
gov.noaa.nws.ncep.ui.pgen.tca,
gov.noaa.nws.ncep.ui.pgen.tools
Import-Package: com.raytheon.edex.meteoLib,
Import-Package: com.raytheon.viz.core.contours.util,
com.raytheon.viz.core.gl,
com.raytheon.viz.core.gl.images,
gov.noaa.nws.ncep.common.staticdata,

64
ncep/gov.noaa.nws.ncep.ui.pgen/src/gov/noaa/nws/ncep/ui/pgen/graphtogrid/ContoursToGrid.java
View file

@ -29,8 +29,10 @@ import java.util.regex.Matcher;
import java.util.regex.Pattern;
import java.io.File;
import com.raytheon.edex.meteoLib.Controller;
import com.raytheon.uf.common.util.GridUtil;
import com.raytheon.viz.core.contours.util.ContourContainer;
import com.raytheon.viz.core.contours.util.FortConBuf;
import com.raytheon.viz.core.contours.util.FortConConfig;
import com.vividsolutions.jts.geom.Coordinate;
import com.vividsolutions.jts.geom.CoordinateSequence;
import com.vividsolutions.jts.geom.GeometryFactory;
@ -59,6 +61,8 @@ import org.eclipse.ui.PlatformUI;
* a GEMPAK grid file
* 09/10 #215 J. Wu Checked working directory and PATH.
* 11/10 #345 J. Wu Added support for circle.
* 11/10 #345 J. Wu Added support for circle.
* Aug 27, 2013 2262 bsteffen Convert to use new FortConBuf.
*
* </pre>
*
@ -585,20 +589,27 @@ public class ContoursToGrid extends GraphToGrid {
/*
* Call AWIPS contouring code to generate contour lines
*/
Controller.fortconbuf( grid, work, szX, szX, szY, 1, 0,
contVals.length, contVals, xPoints, yPoints, numPoints,
smallestContourValue, largestContourValue );
float[][] grid2d = new float[szX][szY];
int idx = 0;
for (int j = 0; j < szY; j += 1) {
for (int i = 0; i < szX; i += 1) {
grid2d[i][j] = grid[idx];
idx += 1;
}
}
FortConConfig config = new FortConConfig();
config.mode = contVals.length;
config.seed = contVals;
config.badlo = smallestContourValue;
config.badhi = largestContourValue;
config.xOffset = 1f;
config.yOffset = 1f;
ContourContainer container = FortConBuf.contour(grid2d, config);
/*
* Find out the number of lines (-99999.0 is the line separator)
*/
int nContours = 0;
for ( int ii = 0; ii < numPoints[0]; ii++ ) {
if ( xPoints[ ii ] == -99999.0 ) {
// start of one contour
nContours++;
}
int nContours = container.contourVals.size();
int numPoints2 = 0;
for (float[] line : container.xyContourPoints) {
numPoints2 += line.length / 2;
}
/*
@ -607,23 +618,18 @@ public class ContoursToGrid extends GraphToGrid {
int[] nContourPts = new int[ nContours ];
float[] contourValue = new float[ nContours ] ;
double[] vals = new double[ (numPoints[0] - nContours) * 2 ];
double[] vals = new double[numPoints2 * 2];
int ncnt = 0;
int npts = 0;
for ( int ii = 0; ii < numPoints[0]; ii++ ) {
if ( xPoints[ ii ] == -99999.0 ) {
nContourPts[ ncnt ] = 0;
contourValue[ ncnt ] = ((int) ( yPoints[ii] * 10) ) / 10.0f;
ncnt++;
}
else {
nContourPts[ ncnt-1 ]++;
vals[ npts ] = xPoints[ ii ];
vals[ npts + 1 ] = yPoints[ ii ];
npts = npts + 2;
}
for (int ii = 0; ii < nContours; ii++) {
float[] line = container.xyContourPoints.get(ii);
contourValue[ncnt] = ((int) (container.contourVals.get(ii) * 10)) / 10.0f;
nContourPts[ncnt] = line.length / 2;
for (int jj = 0; jj < line.length; jj += 1) {
vals[npts] = line[jj];
npts += 1;
}
ncnt += 1;
}
double[] latlons = gtrans.gridToWorld( vals );