gmazza 2003/09/14 14:28:38
Modified: src/java/org/apache/fop/render/awt AWTRenderer.java
Log:
Partial implementation of region border properties.
Note: File contains several *temporary* debugging statements while work is
progressing.
Revision Changes Path
1.12 +36 -21 xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java
Index: AWTRenderer.java
===================================================================
RCS file: /home/cvs/xml-fop/src/java/org/apache/fop/render/awt/AWTRenderer.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- AWTRenderer.java 1 Sep 2003 14:19:34 -0000 1.11
+++ AWTRenderer.java 14 Sep 2003 21:28:38 -0000 1.12
@@ -195,6 +195,7 @@
// empty pageViewportList, in case of a reload from PreviewDialog
pageViewportList.removeAllElements();
pageList.removeAllElements();
+ System.out.println("\nRegion Types: 0-Before/Top, 1-Start/Left, 2-Body,
3-End/Right, 4-After/Bottom");
}
public void stopRenderer()
@@ -317,15 +318,7 @@
currentFontName = "";
currentFontSize = 0;
Rectangle2D viewArea = region.getViewArea();
-/*
- if (region.getRegion() != null) {
- System.out.print("Region type = " +
region.getRegion().getRegionClass());
- }
- System.out.println(" X, Y, Width, Height: " + viewArea.getX()
- + " " + viewArea.getY()
- + " " + viewArea.getWidth()
- + " " + viewArea.getHeight());
-*/
+
int startX = (int)(((float) viewArea.getX() / 1000f + .5)
* (scaleFactor / 100f));
int startY = (int)(((float) viewArea.getY() / 1000f + .5)
@@ -335,6 +328,15 @@
int height = (int)(((float) viewArea.getHeight() / 1000f + .5)
* (scaleFactor / 100f));
+ if (region.getRegion() != null) {
+ System.out.print("\nRegion type = " +
region.getRegion().getRegionClass());
+ }
+ System.out.println(" X, Width, Y, Height: " + startX
+ + " " + width
+ + " " + startY
+ + " " + height
+ );
+
drawBackAndBorders(region, startX, startY, width, height);
}
@@ -384,33 +386,46 @@
BorderProps bps = (BorderProps) block.getTrait(Trait.BORDER_BEFORE);
if (bps != null) {
- int endx = startx + width;
- int bwidth = bps.width;
+ int borderWidth = (int) ((bps.width / 1000f) * (scaleFactor / 100f));
+ System.out.println("Before (color/width) " +
bps.color.getAWTColor().toString() + " " + bps.width);
graphics.setColor(bps.color.getAWTColor());
- graphics.drawLine(startx, starty + bwidth / 2, endx, starty + bwidth /
2);
+ // drawLine(x1, y1, x2, y2);
+ System.out.println("Draw from (" + startx + "," + (starty +
borderWidth/2) +
+ ") to (" + (startx+width) + "," + (starty + borderWidth/ 2) + ")");
+ graphics.drawLine(startx, starty + borderWidth / 2, startx + width,
+ starty + borderWidth / 2);
}
bps = (BorderProps) block.getTrait(Trait.BORDER_START);
if (bps != null) {
- int endy = starty + height;
- int bwidth = bps.width;
+ int borderWidth = (int) ((bps.width / 1000f) * (scaleFactor / 100f));
+ System.out.println("Start (color/width) " +
bps.color.getAWTColor().toString() + " " + bps.width);
graphics.setColor(bps.color.getAWTColor());
- graphics.drawLine(startx + bwidth / 2, starty, startx + bwidth / 2,
endy);
+ System.out.println("Draw from (" + (startx + borderWidth / 2) + "," +
starty +
+ ") to (" + (startx + borderWidth / 2) + "," + (starty + height) +
")");
+ graphics.drawLine(startx + borderWidth / 2, starty, startx +
borderWidth / 2,
+ starty + height);
}
bps = (BorderProps) block.getTrait(Trait.BORDER_AFTER);
if (bps != null) {
+ int borderWidth = (int) ((bps.width / 1000f) * (scaleFactor / 100f));
+ System.out.println("After (color/width) " +
bps.color.getAWTColor().toString() + " " + bps.width);
int sy = starty + height;
- int endx = startx + width;
- int bwidth = bps.width;
graphics.setColor(bps.color.getAWTColor());
- graphics.drawLine(startx, sy - bwidth / 2, endx, sy - bwidth / 2);
+ System.out.println("Draw from (" + startx + "," + (sy - borderWidth /
2) +
+ ") to (" + (startx+width) + "," + (sy - borderWidth / 2) + ")");
+ graphics.drawLine(startx, sy - borderWidth / 2, startx + width,
+ sy - borderWidth / 2);
}
bps = (BorderProps) block.getTrait(Trait.BORDER_END);
if (bps != null) {
+ int borderWidth = (int) ((bps.width / 1000f) * (scaleFactor / 100f));
+ System.out.println("End (color/width) " +
bps.color.getAWTColor().toString() + " " + bps.width);
int sx = startx + width;
- int endy = starty + height;
- int bwidth = bps.width;
graphics.setColor(bps.color.getAWTColor());
- graphics.drawLine(sx - bwidth / 2, starty, sx - bwidth / 2, endy);
+ System.out.println("Draw from (" + (sx - borderWidth / 2) + "," +
starty +
+ ") to (" + (sx - borderWidth / 2) + "," + (starty + height) + ")");
+ graphics.drawLine(sx - borderWidth / 2, starty, sx - borderWidth / 2,
+ starty + height);
}
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
