RED-1276: Fixed annotation position problem for 270° rotated pages
This commit is contained in:
parent
57a79719d4
commit
8375c04829
@ -101,10 +101,13 @@ public class TextPositionSequence implements CharSequence {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public float getRotationAdjustedY() {
|
public float getRotationAdjustedY() {
|
||||||
|
|
||||||
return textPositions.get(0).getY();
|
return textPositions.get(0).getY();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public float getY1() {
|
public float getY1() {
|
||||||
|
|
||||||
if (textPositions.get(0).getRotation() == 90) {
|
if (textPositions.get(0).getRotation() == 90) {
|
||||||
@ -202,6 +205,13 @@ public class TextPositionSequence implements CharSequence {
|
|||||||
posXEnd = textPositions.get(0).getYDirAdj() + 2;
|
posXEnd = textPositions.get(0).getYDirAdj() + 2;
|
||||||
posYInit = getY1();
|
posYInit = getY1();
|
||||||
posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
|
posYEnd = textPositions.get(textPositions.size() - 1).getXDirAdj() - height + 4;
|
||||||
|
} else if (textPositions.get(0).getRotation() == 270) {
|
||||||
|
posYInit = textPositions.get(0).getPageHeight() - getX1();
|
||||||
|
posYEnd = textPositions.get(0).getPageHeight() - getX2() - textPositions.get(0)
|
||||||
|
.getWidth() - textPositions.get(textPositions.size() - 1).getWidth() - 1;
|
||||||
|
posXInit = textPositions.get(0).getPageWidth() - textPositions.get(0).getYDirAdj() - 2;
|
||||||
|
posXEnd = textPositions.get(0).getPageWidth() - textPositions.get(textPositions.size() - 1)
|
||||||
|
.getYDirAdj() + height;
|
||||||
} else {
|
} else {
|
||||||
posXEnd = textPositions.get(textPositions.size() - 1)
|
posXEnd = textPositions.get(textPositions.size() - 1)
|
||||||
.getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
|
.getXDirAdj() + textPositions.get(textPositions.size() - 1).getWidth() + 1;
|
||||||
@ -213,5 +223,4 @@ public class TextPositionSequence implements CharSequence {
|
|||||||
return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
|
return new Rectangle(new Point(posXInit, posYInit), posXEnd - posXInit, posYEnd - posYInit + height, page);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user