Thread: [FOray-commit] SF.net SVN: foray: [9856] trunk/foray (Page 16)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 9856
          http://svn.sourceforge.net/foray/?rev=9856&view=rev
Author:   victormote
Date:     2007-06-27 08:57:11 -0700 (Wed, 27 Jun 2007)

Log Message:
-----------
1. Conform to axsl changes returning bounding box of float[] instead of int[].
2. Improvements to placement and scaling of EPS graphics.

Modified Paths:
--------------
    trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXForm.java
    trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java
    trunk/foray/foray-ps/src/java/org/foray/ps/FOrayBoundingBox.java
    trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java

Modified: trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java
===================================================================

--- trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java	2007-06-27 15:20:50 UTC (rev 9855)
+++ trunk/foray/foray-graphic/src/java/org/foray/graphic/EPSGraphic.java	2007-06-27 15:57:11 UTC (rev 9856)
@@ -77,7 +77,7 @@
     private String docName;
 
     /** Array containing the bounding box. */
-    private int[] bbox = new int[] {0, 0, 0, 0};
+    private float[] bbox = new float[] {0, 0, 0, 0};
 
     /** Indicates whether this EPS is in ASCII format (true) or in binary format
      * (false). */
@@ -205,14 +205,14 @@
         }
         readBBox(fileStart);
         if (bbox != null) {
-            final int xUR = bbox[BoundingBox.BBOX_UPPER_RIGHT_X_INDEX];
-            final int xLL = bbox[BoundingBox.BBOX_LOWER_LEFT_X_INDEX];
-            final int pixelWidth = xUR - xLL;
-            setPixelWidth(pixelWidth);
-            final int yUR = bbox[BoundingBox.BBOX_UPPER_RIGHT_Y_INDEX];
-            final int yLL = bbox[BoundingBox.BBOX_LOWER_LEFT_Y_INDEX];
-            final int pixelHeight = yUR - yLL;
-            setPixelHeight(pixelHeight);
+            final float xUR = bbox[BoundingBox.BBOX_UPPER_RIGHT_X_INDEX];
+            final float xLL = bbox[BoundingBox.BBOX_LOWER_LEFT_X_INDEX];
+            final float pixelWidth = xUR - xLL;
+            setPixelWidth(Math.round(pixelWidth));
+            final float yUR = bbox[BoundingBox.BBOX_UPPER_RIGHT_Y_INDEX];
+            final float yLL = bbox[BoundingBox.BBOX_LOWER_LEFT_Y_INDEX];
+            final float pixelHeight = yUR - yLL;
+            setPixelHeight(Math.round(pixelHeight));
         } else {
             // Invalid EPS if no bounding box.
             throw new IOException("EPS missing bbox: " + getUrl().toString());
@@ -295,7 +295,7 @@
         final byte[] num = new byte[nidx - idx];
         System.arraycopy(fileStart, idx, num, 0, nidx - idx);
         final String ns = new String(num);
-        this.bbox[bboxIndex] = Integer.parseInt(ns);
+        this.bbox[bboxIndex] = Float.parseFloat(ns);
         return 1 + nidx - idx;
     }
 
@@ -314,13 +314,16 @@
         if (testByte == '-') {
             return true;
         }
+        if (testByte == '.') {
+            return true;
+        }
         return false;
     }
 
     /**
      * {@inheritDoc}
      */
-    public int[] getBBox() {
+    public float[] getBBox() {
         return this.bbox;
     }
 

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXForm.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXForm.java	2007-06-27 15:20:50 UTC (rev 9855)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXForm.java	2007-06-27 15:57:11 UTC (rev 9856)
@@ -122,11 +122,11 @@
             return "";
         }
         final EPSGraphic eps = (EPSGraphic) this.getGraphic();
-        final int[] boundingBox = eps.getBBox();
-        final int llx = boundingBox[BoundingBox.BBOX_LOWER_LEFT_X_INDEX];
-        final int lly = boundingBox[BoundingBox.BBOX_LOWER_LEFT_Y_INDEX];
-        final int urx = boundingBox[BoundingBox.BBOX_UPPER_RIGHT_X_INDEX];
-        final int ury = boundingBox[BoundingBox.BBOX_UPPER_RIGHT_Y_INDEX];
+        final float[] boundingBox = eps.getBBox();
+        final float llx = boundingBox[BoundingBox.BBOX_LOWER_LEFT_X_INDEX];
+        final float lly = boundingBox[BoundingBox.BBOX_LOWER_LEFT_Y_INDEX];
+        final float urx = boundingBox[BoundingBox.BBOX_UPPER_RIGHT_X_INDEX];
+        final float ury = boundingBox[BoundingBox.BBOX_UPPER_RIGHT_Y_INDEX];
         final StringBuilder buffer = new StringBuilder();
         buffer.append("/FormType 1" + EOL);
         buffer.append("/BBox [");
@@ -135,19 +135,32 @@
         buffer.append(urx + " ");
         buffer.append(ury + "]" + EOL);
         final Rectangle2D contentRectangle = this.getContentRectangle();
-        final int formSpaceWidth = urx - llx;
-        final int formSpaceHeight = ury - lly;
+        final float formSpaceWidth = urx - llx;
+        final float formSpaceHeight = ury - lly;
         final float horizontalScaling = (float) (contentRectangle.getWidth()
                 / formSpaceWidth);
         final float verticalScaling = (float) (contentRectangle.getHeight()
                 / formSpaceHeight);
+        float xTranslate = (float) contentRectangle.getX();
+        if (llx < 0) {
+            /* If the bounding box of the graphic is negative, adjust it up to
+             * zero. */
+            xTranslate -= llx;
+        }
+        float yTranslate = (float) (contentRectangle.getY()
+                - contentRectangle.getHeight());
+        if (lly < 0) {
+            /* If the bounding box of the graphic is negative, adjust it up to
+             * zero. */
+            yTranslate -= lly;
+        }
         buffer.append("/Matrix ["
                 + horizontalScaling
                 + " 0 0 "
                 + verticalScaling + " "
-                + contentRectangle.getX() + " "
-                + (contentRectangle.getY() - contentRectangle.getHeight())
-                + "]" + EOL);
+                + xTranslate + " "
+                + yTranslate + "]"
+                + EOL);
         buffer.append("/Resources << /ProcSet [/PDF] >>" + EOL);
         return buffer.toString();
     }

Modified: trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java
===================================================================
--- trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java	2007-06-27 15:20:50 UTC (rev 9855)
+++ trunk/foray/foray-pdf/src/java/org/foray/pdf/object/PDFXPostScript.java	2007-06-27 15:57:11 UTC (rev 9856)
@@ -95,9 +95,9 @@
      */
     public byte[] epsToPDFXObject(final EPSGraphic eps)
             throws GraphicException {
-        final int[] bbox = eps.getBBox();
-        final int bboxw = FOrayBoundingBox.width(bbox);
-        final int bboxh = FOrayBoundingBox.height(bbox);
+        final float[] bbox = eps.getBBox();
+        final float bboxw = FOrayBoundingBox.width(bbox);
+        final float bboxh = FOrayBoundingBox.height(bbox);
 
         final StringBuilder preamble = new StringBuilder();
         preamble.append("%%BeginDocument: " + eps.getName()

Modified: trunk/foray/foray-ps/src/java/org/foray/ps/FOrayBoundingBox.java
===================================================================
--- trunk/foray/foray-ps/src/java/org/foray/ps/FOrayBoundingBox.java	2007-06-27 15:20:50 UTC (rev 9855)
+++ trunk/foray/foray-ps/src/java/org/foray/ps/FOrayBoundingBox.java	2007-06-27 15:57:11 UTC (rev 9856)
@@ -45,7 +45,7 @@
      * box.
      * @return The width of the bounding box.
      */
-    public static int width(final int[] boundingBoxArray) {
+    public static float width(final float[] boundingBoxArray) {
         return boundingBoxArray[BBOX_UPPER_RIGHT_X_INDEX]
                 - boundingBoxArray[BBOX_LOWER_LEFT_X_INDEX];
 
@@ -57,7 +57,7 @@
      * box.
      * @return The height of the bounding box.
      */
-    public static int height(final int[] boundingBoxArray) {
+    public static float height(final float[] boundingBoxArray) {
         return boundingBoxArray[BBOX_UPPER_RIGHT_Y_INDEX]
                 - boundingBoxArray[BBOX_LOWER_LEFT_Y_INDEX];
     }

Modified: trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java
===================================================================
--- trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2007-06-27 15:20:50 UTC (rev 9855)
+++ trunk/foray/foray-render/src/java/org/foray/render/ps/PSRenderer.java	2007-06-27 15:57:11 UTC (rev 9856)
@@ -617,9 +617,9 @@
      */
     public byte[] epsToPostScript(final EPSGraphic image, final int x,
             final int y, final int w, final int h) throws GraphicException {
-        final int[] bbox = image.getBBox();
-        final int bboxw = FOrayBoundingBox.width(bbox);
-        final int bboxh = FOrayBoundingBox.height(bbox);
+        final float[] bbox = image.getBBox();
+        final float bboxw = FOrayBoundingBox.width(bbox);
+        final float bboxh = FOrayBoundingBox.height(bbox);
 
         StringBuilder buffer = new StringBuilder();
         buffer.append("%%BeginDocument: " + image.getName());


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




Thread: [FOray-commit] SF.net SVN: foray: [9856] trunk/foray (Page 16)

Modular XSL-FO Implementation for Java.

foray-commit