From bf14b4c1ce3e0954dae0eb5bb6820125f55b91b0 Mon Sep 17 00:00:00 2001 From: Martin Pernollet Date: Wed, 15 Dec 2021 18:09:22 +0100 Subject: [PATCH] Started debugging --- .../jzy3d-jGL-awt/src/main/java/jgl/wt/awt/GL.java | 11 ++++++++--- .../org/jzy3d/tests/integration/ITTest_Colorbar.java | 1 - .../org/jzy3d/tests/integration/ITTest_Scatter.java | 5 +++++ 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/jzy3d-jGL/jzy3d-jGL-awt/src/main/java/jgl/wt/awt/GL.java b/jzy3d-jGL/jzy3d-jGL-awt/src/main/java/jgl/wt/awt/GL.java index 3ffc89966..a4008938c 100644 --- a/jzy3d-jGL/jzy3d-jGL-awt/src/main/java/jgl/wt/awt/GL.java +++ b/jzy3d-jGL/jzy3d-jGL-awt/src/main/java/jgl/wt/awt/GL.java @@ -31,13 +31,14 @@ import java.awt.image.ImageObserver; import java.awt.image.MemoryImageSource; import java.awt.image.RenderedImage; - +import org.apache.log4j.Logger; import jgl.ImageToDraw; import jgl.TextToDraw; import jgl.context.gl_util; public final class GL extends jgl.GL { - + Logger log = Logger.getLogger(GL.class); + protected Component canvas; protected BufferedImage glImage; protected boolean renderedOnce = false; @@ -117,8 +118,12 @@ public BufferedImage getRenderedImage() { public void applyViewport() { // Update pixel scale to guess if HiDPI - if(canvas != null && canvas.getGraphics() != null) + if(canvas != null) { + if(canvas.getGraphics() != null) updatePixelScale(canvas.getGraphics()); + else + log.warn("Graphics is null, can't detect pixel scale"); + } super.applyViewport(); } diff --git a/jzy3d-tests-java9/src/test/java/org/jzy3d/tests/integration/ITTest_Colorbar.java b/jzy3d-tests-java9/src/test/java/org/jzy3d/tests/integration/ITTest_Colorbar.java index a4d5ca627..6395b6049 100644 --- a/jzy3d-tests-java9/src/test/java/org/jzy3d/tests/integration/ITTest_Colorbar.java +++ b/jzy3d-tests-java9/src/test/java/org/jzy3d/tests/integration/ITTest_Colorbar.java @@ -25,7 +25,6 @@ public static void main(String[] args) { //Chart c = new ITTest_Colorbar().whenColorbar_HasMininumWidth(WT.EmulGL_AWT, HiDPI.ON); //Chart c = new ITTest_Colorbar().whenColorbar_HasMininumWidth(WT.EmulGL_AWT, HiDPI.OFF); open(new ITTest_Colorbar().whenColorbar_IsModifiedByCustomFont(WT.EmulGL_AWT, HiDPI.ON)); - open(new ITTest_Colorbar().whenColorbar_IsModifiedByCustomFont(WT.EmulGL_AWT, HiDPI.ON)); } /* ************************************************************************************************** */ diff --git a/jzy3d-tests-java9/src/test/java/org/jzy3d/tests/integration/ITTest_Scatter.java b/jzy3d-tests-java9/src/test/java/org/jzy3d/tests/integration/ITTest_Scatter.java index 0727a28c8..52281176e 100644 --- a/jzy3d-tests-java9/src/test/java/org/jzy3d/tests/integration/ITTest_Scatter.java +++ b/jzy3d-tests-java9/src/test/java/org/jzy3d/tests/integration/ITTest_Scatter.java @@ -6,6 +6,11 @@ import org.jzy3d.utils.LoggerUtils; public class ITTest_Scatter extends ITTest{ + public static void main(String[] args) { + new ITTest_Scatter().whenScatterChart_ThenMatchBaselineImagePixelwise(WT.EmulGL_AWT, HiDPI.ON); + + } + @Test public void whenScatterChart_ThenMatchBaselineImagePixelwise() { LoggerUtils.minimal();