Improve background image. Remove unnecessary cleartype test.

wrandelshofer · Aug 16, 2024 · f77de2a · f77de2a
1 parent e4a2b48
commit f77de2a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 20 deletions.
diff --git a/doc/assets/testimage/Cleartype_SubSampleCenter.png b/doc/assets/testimage/Cleartype_SubSampleCenter.png
diff --git a/doc/assets/testimage/SubpixelAntialiasing.png b/doc/assets/testimage/SubpixelAntialiasing.png
diff --git a/doc/assets/testimage/VideoCodecTestImage.xml b/doc/assets/testimage/VideoCodecTestImage.xml
@@ -104,9 +104,9 @@
     <Rectangle bounds="624 440 8 8"
                fill="linear-gradient(from 0 0 to 0 4, repeat, #ff0000 25%, #00ff00 25%, #00ff00 50%, #0000ff 50%, #0000ff 75%, #000000 75%)"
                id="rectangle5" stroke="none"/>
-    <TextArea bounds="520 251 120 53" fill="none" font="8 Pixel Operator \38 " id="textarea6" lineSpacing="2"
+    <TextArea bounds="520 251 120 109" fill="none" font="8 Pixel Operator \38 " id="textarea6" lineSpacing="2"
               stroke="none"
-              text="The Quick Brown Fox Jumps Over the Lazy Dog. THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG."
+              text="The Quick Brown Fox Jumps Over the Lazy Dog. THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG. The Quick Brown Fox Jumps Over the Lazy Dog. THE QUICK BROWN FOX JUMPS OVER THE LAZY DOG."
               textFill="#000000"/>
     <TextArea bounds="472 251 32 8" fill="none" font="8 Pixel Operator \38 " id="textarea1" lineSpacing="1"
               stroke="none" text="red" textFill="#ff0000"/>
@@ -137,11 +137,12 @@
     <Rectangle bounds="472 120 168 10" fill="#000000" id="rectangle14" stroke="none"/>
     <TextArea bounds="472 120 72 8" fill="none" font="8 Pixel Operator \38 " id="textarea13" lineSpacing="1"
               stroke="none" text="Photo" textFill="#ffffff"/>
-    <TextArea bounds="520 303 120 57" fill="none" font="13 Arial" id="textarea14" lineSpacing="2" padding="2 0"
-              stroke="none" text="the quick brown fox jumps over the lazy dog THE QUICK" textFill="#000000"/>
-    <Image bounds="519 306 120 56" id="image2" src="SubpixelAntialiasing.png"/>
     <Rectangle bounds="472 360 168 10" fill="#000000" id="rectangle15" stroke="none"/>
     <TextArea bounds="472 360 168 8" fill="none" font="8 Pixel Operator \38 " id="textarea12" lineSpacing="1"
               stroke="none" text="Colors" textFill="#ffffff"/>
+    <Rectangle bounds="472 0 168 120" id="rectangle19" stroke="none"/>
+    <Rectangle bounds="472 0 168 10" fill="#000000" id="rectangle20" stroke="none"/>
+    <TextArea bounds="472 0 112 8" fill="none" font="8 Pixel Operator \38 " id="textarea14" lineSpacing="1"
+              stroke="none" text="Video Frame" textFill="#ffffff"/>
   </Layer>
 </Drawing>
diff --git a/doc/assets/testimage/third-party-licenses.md b/doc/assets/testimage/third-party-licenses.md
diff --git a/....demo.aviwriter/src/main/java/org.monte.demo.aviwriter/org/monte/demo/aviwriter/Main.java b/....demo.aviwriter/src/main/java/org.monte.demo.aviwriter/org/monte/demo/aviwriter/Main.java
@@ -75,8 +75,13 @@ private static BufferedImage createImage(Format format) {
         return img;
     }
 
-    private static void drawAnimationFrame(BufferedImage img, Graphics2D g, double second) {
+    private static void drawAnimationFrame(BufferedImage img, Graphics2D g, double second, int frameIndex, int frameCount) {
         drawClock(g, 232, 240, 150, second);
+
+        g.setPaint(Color.WHITE);
+        g.fillRect(472, 10, 168, 110);
+        g.setPaint(Color.BLACK);
+        g.drawString("Frame " + (frameIndex + 1) + " of " + frameCount, 473, 24);
     }
 
     private static void drawClock(Graphics2D g, int cx, int cy, int radius, double seconds) {
@@ -211,7 +216,7 @@ private static void testWriting(File file, Format format) throws IOException {
             // Draw the animation
             for (int i = 0, n = frameRate.multiply(60).intValue(); i < n; i++) {
                 double t = frameRate.divide(i).doubleValue() + 8 * 3600 + 25 * 60;
-                drawAnimationFrame(img, g, t);
+                drawAnimationFrame(img, g, t, i, n);
 
                 // write image to the writer
                 out.write(0, img, 1);

diff --git a/...resources/org.monte.demo.aviwriter/org/monte/demo/aviwriter/BackgroundImage.png b/...resources/org.monte.demo.aviwriter/org/monte/demo/aviwriter/BackgroundImage.png
diff --git a/...ter/src/main/java/org.monte.demo.quicktimewriter/org/monte/demo/quicktimewriter/Main.java b/...ter/src/main/java/org.monte.demo.quicktimewriter/org/monte/demo/quicktimewriter/Main.java
@@ -116,7 +116,7 @@ private static void testWriting(File file, Format format) throws IOException {
             // Draw the animation
             for (int i = 0, n = frameRate.multiply(60).intValue(); i < n; i++) {
                 double t = frameRate.divide(i).doubleValue() + 8 * 3600 + 25 * 60;
-                drawAnimationFrame(img, g, t);
+                drawAnimationFrame(img, g, t, i, n);
 
                 // write image to the writer
                 out.write(0, img, 1);
@@ -133,8 +133,13 @@ private static void testWriting(File file, Format format) throws IOException {
         }
     }
 
-    private static void drawAnimationFrame(BufferedImage img, Graphics2D g, double second) {
+    private static void drawAnimationFrame(BufferedImage img, Graphics2D g, double second, int frameIndex, int frameCount) {
         drawClock(g, 232, 240, 150, second);
+
+        g.setPaint(Color.WHITE);
+        g.fillRect(472, 10, 168, 110);
+        g.setPaint(Color.BLACK);
+        g.drawString("Frame " + (frameIndex + 1) + " of " + frameCount, 473, 24);
     }
 
     private static void drawClock(Graphics2D g, int cx, int cy, int radius, double seconds) {

diff --git a/...g.monte.demo.quicktimewriter/org/monte/demo/quicktimewriter/BackgroundImage.png b/...g.monte.demo.quicktimewriter/org/monte/demo/quicktimewriter/BackgroundImage.png