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

Omaha #4689 Constrained points to be within grid when zooming.

Browse source 
Change-Id: Ic66dd92fed5f26602d514f56c863a0573022809b

Former-commit-id: 81796ef9199bd70d0343444c03e32bc503c7e552
This commit is contained in:
Kevin Bisanz 2015-11-10 14:19:52 -06:00
parent 38860950de
commit 0305228189
1 changed files with 29 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
cave/com.raytheon.uf.viz.xy.crosssection/src/com/raytheon/uf/viz/xy/crosssection/rsc/CrossSectionContourResource.java
View file

@ -75,6 +75,8 @@ import com.vividsolutions.jts.geom.Envelope;
* Feb 17, 2009 njensen Refactored to new rsc architecture
* Feb 09, 2011 8244 bkowal Enabled the magnification capability.
* Feb 17, 2014 2661 bsteffen Use only u,v for vectors.
* Nov 10, 2015 4689 kbisanz Ensure corners are within grid when
* zooming.
*
* </pre>
*
@ -236,14 +238,15 @@ public class CrossSectionContourResource extends AbstractCrossSectionResource
// This does several things at once.
// 1. Expand the grid area by 25% to avoid constant recontouring
// 2. Make sure the new area is not outside the data area
// 3. Round everything to ints
minCorner.x = Math.max((int) (minCorner.x - width / 4), 0);
minCorner.y = Math.min((int) (minCorner.y - height / 4) + 1,
GRID_SIZE);
maxCorner.x = Math.min((int) (maxCorner.x + width / 4) + 1,
GRID_SIZE);
maxCorner.y = Math.max((int) (maxCorner.y + height / 4), 0);
// 2. Round everything to ints
minCorner.x = (int) (minCorner.x - width / 4);
minCorner.y = (int) (minCorner.y - height / 4) + 1;
maxCorner.x = (int) (maxCorner.x + width / 4) + 1;
maxCorner.y = (int) (maxCorner.y + height / 4);
// Ensure corners are within the bounds of the grid.
constrainPoint(minCorner);
constrainPoint(maxCorner);
// Copy the data to a smaller array for the subgrid area.
List<float[]> newDataList = new ArrayList<float[]>();
@ -318,6 +321,24 @@ public class CrossSectionContourResource extends AbstractCrossSectionResource
posLineStyle, negLineStyle, this.crossSectionFont, null);
}
/**
* Ensure point is between 0 and grid size, updating values if necessary.
*
* @param point
* Point to check and update.
*/
private void constrainPoint(DirectPosition2D point) {
// Ensure values are at least 0. Zooming near the edge of the
// screen may cause values less than 0.
point.x = Math.max(point.x, 0.0);
point.y = Math.max(point.y, 0.0);
// Ensure values are at most GRID_SIZE. Zooming near the edge
// of the screen may cause values greater than GRID_SIZE.
point.x = Math.min(point.x, GRID_SIZE);
point.y = Math.min(point.y, GRID_SIZE);
}
@Override
public void setDescriptor(CrossSectionDescriptor descriptor) {
super.setDescriptor(descriptor);