(#73) Add coordinates and size parameters to Image

fabriciofx · Dec 30, 2023 · cf36952 · cf36952
1 parent 745b734
commit cf36952
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 5 deletions.
diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Image.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Image.java
@@ -31,6 +31,7 @@
 import com.github.fabriciofx.cactoos.pdf.type.Int;
 import com.github.fabriciofx.cactoos.pdf.type.Stream;
 import java.io.ByteArrayOutputStream;
+import org.cactoos.Scalar;
 import org.cactoos.text.FormattedText;
 
 /**
@@ -49,16 +50,98 @@ public final class Image implements Content {
      */
     private final Png png;
 
+    /**
+     * Position X.
+     */
+    private final double posx;
+
+    /**
+     * Position Y.
+     */
+    private final double posy;
+
+    /**
+     * Width.
+     */
+    private final Scalar<Double> width;
+
+    /**
+     * Height.
+     */
+    private final Scalar<Double> height;
+
+    /**
+     * Ctor.
+     *
+     * @param name Image name
+     * @param png Raw PNG
+     * @param posx Position X
+     * @param posy Position Y
+     * @checkstyle ParameterNumberCheck (10 lines)
+     */
+    public Image(
+        final String name,
+        final Png png,
+        final double posx,
+        final double posy
+    ) {
+        this(
+            name,
+            png,
+            posx,
+            posy,
+            () -> (double) png.width(),
+            () -> (double) png.height()
+        );
+    }
+
+    /**
+     * Ctor.
+     *
+     * @param name Image name
+     * @param png Raw PNG
+     * @param posx Position X
+     * @param posy Position Y
+     * @param width Image width
+     * @param height Image height
+     * @checkstyle ParameterNumberCheck (10 lines)
+     */
+    public Image(
+        final String name,
+        final Png png,
+        final double posx,
+        final double posy,
+        final double width,
+        final double height
+    ) {
+        this(name, png, posx, posy, () -> width, () -> height);
+    }
+
     /**
      * Ctor.
      *
      * @param name Image name
      * @param png Raw PNG
+     * @param posx Position X
+     * @param posy Position Y
+     * @param width Image width
+     * @param height Image height
      * @checkstyle ParameterNumberCheck (10 lines)
      */
-    public Image(final String name, final Png png) {
+    public Image(
+        final String name,
+        final Png png,
+        final double posx,
+        final double posy,
+        final Scalar<Double> width,
+        final Scalar<Double> height
+    ) {
         this.label = name;
         this.png = png;
+        this.posx = posx;
+        this.posy = posy;
+        this.width = width;
+        this.height = height;
     }
 
     /**
@@ -73,7 +156,11 @@ public String name() {
     @Override
     public byte[] asStream() throws Exception {
         return new FormattedText(
-            "q 85.04 0 0 58.06 28.35 766.83 cm /%s Do Q",
+            "q %.2f 0 0 %.2f %.2f %.2f cm /%s Do Q",
+            this.width.value(),
+            this.height.value(),
+            this.posx,
+            this.posy,
             this.label
         ).asString().getBytes();
     }

diff --git a/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Png.java b/src/main/java/com/github/fabriciofx/cactoos/pdf/content/Png.java
@@ -75,6 +75,26 @@ public Png(final Bytes bytes) {
         this.raw = new SafePngRaw(new PngRaw(bytes));
     }
 
+    /**
+     * Image width.
+     *
+     * @return Image width in pixels
+     * @throws Exception if fails
+     */
+    public int width() throws Exception {
+        return this.raw.header().width();
+    }
+
+    /**
+     * Image height.
+     *
+     * @return Image height in pixels
+     * @throws Exception if fails
+     */
+    public int height() throws Exception {
+        return this.raw.header().height();
+    }
+
     @Override
     public Definition definition(final Id id) throws Exception {
         final int num = id.increment();

diff --git a/src/test/java/com/github/fabriciofx/cactoos/pdf/DocumentTest.java b/src/test/java/com/github/fabriciofx/cactoos/pdf/DocumentTest.java
@@ -136,7 +136,9 @@ void buildDocumentWithPngImage() throws Exception {
             "I1",
             new Png(
                 "src/test/resources/image/logo.png"
-            )
+            ),
+            28,
+            766
         );
         final byte[] actual = new Document(
             new Information(
@@ -175,7 +177,9 @@ void buildFileWithPngImage() throws Exception {
             "I1",
             new Png(
                 "src/test/resources/image/logo.png"
-            )
+            ),
+            28,
+            766
         );
         final File file = new File("image-png.pdf");
         Files.write(

diff --git a/src/test/java/com/github/fabriciofx/cactoos/pdf/resource/ResourcesTest.java b/src/test/java/com/github/fabriciofx/cactoos/pdf/resource/ResourcesTest.java
@@ -45,7 +45,9 @@ void definition() throws Exception {
         );
         final Image image = new Image(
             "I1",
-            png
+            png,
+            28,
+            766
         );
         new Assertion<>(
             "Must represent a resources definition",

diff --git a/src/test/resources/document/image-png.pdf b/src/test/resources/document/image-png.pdf
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,7 +45,9 @@ void definition() throws Exception { @@
             );
             final Image image = new Image(
                 "I1",
-                png
+                png,
+,
             );
             new Assertion<>(
                 "Must represent a resources definition",
@@ Expand Down @@