Fix resolution of MultiPointResource.java during AWIPS2 DR and baseline merge
Former-commit-id:735ed2ecd9
[formerlyfa77df807d
] [formerly596d19466b
[formerly 55326667ca13a37c7802849484949382e65a6329]] Former-commit-id:596d19466b
Former-commit-id:20fda57d37
This commit is contained in:
parent
f0cb647101
commit
b0b8a13e60
1 changed files with 1606 additions and 1612 deletions
|
@ -713,13 +713,11 @@ public class MultiPointResource extends
|
||||||
/**
|
/**
|
||||||
* Get the x direction shift value.
|
* Get the x direction shift value.
|
||||||
*
|
*
|
||||||
* @param props
|
|
||||||
* The PaintProperties object
|
|
||||||
* @param gage
|
* @param gage
|
||||||
* The GageData object
|
* The GageData object
|
||||||
* @return The number of pixels to shift in the x direction
|
* @return The number of pixels to shift in the x direction
|
||||||
*/
|
*/
|
||||||
private double getShiftWidth(PaintProperties props, GageData gage) {
|
private double getShiftWidth(GageData gage) {
|
||||||
double shiftWidthValue = (gage.getX_shift() / 2.0)
|
double shiftWidthValue = (gage.getX_shift() / 2.0)
|
||||||
/ screenToWorldWidthRatio;
|
/ screenToWorldWidthRatio;
|
||||||
|
|
||||||
|
@ -729,13 +727,11 @@ public class MultiPointResource extends
|
||||||
/**
|
/**
|
||||||
* Get the y direction shift value.
|
* Get the y direction shift value.
|
||||||
*
|
*
|
||||||
* @param props
|
|
||||||
* The PaintProperties object
|
|
||||||
* @param gage
|
* @param gage
|
||||||
* The GageData object
|
* The GageData object
|
||||||
* @return The number of pixels to shift in the y direction
|
* @return The number of pixels to shift in the y direction
|
||||||
*/
|
*/
|
||||||
private double getShiftHeight(PaintProperties props, GageData gage) {
|
private double getShiftHeight(GageData gage) {
|
||||||
double shiftHeightValue = (gage.getY_shift() / 2.0)
|
double shiftHeightValue = (gage.getY_shift() / 2.0)
|
||||||
/ screenToWorldHeightRatio;
|
/ screenToWorldHeightRatio;
|
||||||
|
|
||||||
|
@ -800,9 +796,8 @@ public class MultiPointResource extends
|
||||||
double[] pixel = descriptor.worldToPixel(new double[] {
|
double[] pixel = descriptor.worldToPixel(new double[] {
|
||||||
c.x, c.y });
|
c.x, c.y });
|
||||||
if (pixel != null && extent.contains(pixel)) {
|
if (pixel != null && extent.contains(pixel)) {
|
||||||
double shiftHeightValue = getShiftHeight(paintProps,
|
double shiftHeightValue = getShiftHeight(gage);
|
||||||
gage);
|
double shiftWidthValue = getShiftWidth(gage);
|
||||||
double shiftWidthValue = getShiftWidth(paintProps, gage);
|
|
||||||
/* Draw the icons */
|
/* Draw the icons */
|
||||||
if (pcOptions.getIcon() == 1) {
|
if (pcOptions.getIcon() == 1) {
|
||||||
RGB color = null;
|
RGB color = null;
|
||||||
|
@ -835,9 +830,8 @@ public class MultiPointResource extends
|
||||||
if (currentData != null) {
|
if (currentData != null) {
|
||||||
List<GageData> siteList = pdcManager.getObsReportList();
|
List<GageData> siteList = pdcManager.getObsReportList();
|
||||||
if ((siteList != null) && siteList.contains(currentData)) {
|
if ((siteList != null) && siteList.contains(currentData)) {
|
||||||
double shiftHeightValue = getShiftHeight(paintProps,
|
double shiftHeightValue = getShiftHeight(currentData);
|
||||||
currentData);
|
double shiftWidthValue = getShiftWidth(currentData);
|
||||||
double shiftWidthValue = getShiftWidth(paintProps, currentData);
|
|
||||||
|
|
||||||
PixelExtent pe = getPixelExtent(currentData, shiftWidthValue,
|
PixelExtent pe = getPixelExtent(currentData, shiftWidthValue,
|
||||||
shiftHeightValue);
|
shiftHeightValue);
|
||||||
|
|
Loading…
Add table
Reference in a new issue