Rendering with LWJGL

.gitignore

@@ -9,7 +9,7 @@ target/
 .settings
 .idea/
 **/.idea/
-
+**/bin/
 
 # OS specific folder data files
 .DS_Store

doc/release.md

@@ -10,11 +10,11 @@
 * Run ITTests of the extension APIs (macOS 10.12)
 
 ## Deploy
-* Generate and upload Javadoc
-* Deploy JARs
+* Generate and upload Javadoc `mvn javadoc:aggregate`
+* Deploy JARs `mvn deploy`
 
 ## Prepare next version
-* Bump all projects version to next version
+* Bump all projects version to next version `mvn release:prepare`
 
 ## Publish
 * Update website with this new version content

jzy3d-core-awt/pom.xml

@@ -17,6 +17,15 @@
 			<artifactId>jzy3d-core</artifactId>
 			<version>${project.version}</version>
 		</dependency>
+
+		<dependency>
+			<groupId>${project.groupId}</groupId>
+			<artifactId>jzy3d-core</artifactId>
+			<version>${project.version}</version>
+			<type>test-jar</type>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
-</project>
+</project>

jzy3d-core-awt/src/main/java/org/jzy3d/chart/AWTChart.java

@@ -7,8 +7,10 @@
 import org.jzy3d.plot3d.primitives.axis.layout.AxisLayout;
 import org.jzy3d.plot3d.rendering.canvas.Quality;
 import org.jzy3d.plot3d.rendering.legends.colorbars.AWTColorbarLegend;
+import org.jzy3d.plot3d.rendering.legends.colorbars.IColorbarLegend;
 import org.jzy3d.plot3d.rendering.view.AWTRenderer2d;
 import org.jzy3d.plot3d.rendering.view.AWTView;
+import org.jzy3d.plot3d.rendering.view.View;
 
 public class AWTChart extends Chart {
   public AWTChart(IChartFactory components, Quality quality) {
@@ -19,33 +21,43 @@ protected AWTChart() {
     super();
   }
 
-  public void addRenderer(AWTRenderer2d renderer2d) {
-    getAWTView().addRenderer2d(renderer2d);
+  public void add(AWTRenderer2d renderer2d) {
+    addRenderer(renderer2d);
   }
 
-  public void removeRenderer(AWTRenderer2d renderer2d) {
-    getAWTView().removeRenderer2d(renderer2d);
+  public void addRenderer(AWTRenderer2d renderer2d) {
+    getView().addRenderer2d(renderer2d);
+  }
+
+  public void remove(AWTRenderer2d renderer2d) {
+    removeRenderer(renderer2d);
   }
 
-  public AWTView getAWTView() {
-    return (AWTView) view;
+
+  public void removeRenderer(AWTRenderer2d renderer2d) {
+    getView().removeRenderer2d(renderer2d);
   }
 
   public AWTColorbarLegend colorbar(Drawable drawable) {
-    return colorbar(drawable, null, getView().getAxis().getLayout());
+    return colorbar(drawable, getView().getAxis().getLayout());
   }
 
   public AWTColorbarLegend colorbar(Drawable drawable, AxisLayout layout) {
-    return colorbar(drawable, null, layout);
-  }
-
-  public AWTColorbarLegend colorbar(Drawable drawable, Dimension minDimension, AxisLayout layout) {
-    AWTColorbarLegend colorbar = new AWTColorbarLegend(drawable, layout);
-
-    if(minDimension!=null)
-      colorbar.setMinimumDimension(minDimension);
-
+    AWTColorbarLegend colorbar = new AWTColorbarLegend(drawable, layout, layout.getMainColor(), view.getBackgroundColor());
     drawable.setLegend(colorbar);
     return colorbar;
   }
+
+  @Override
+  public AWTColorbarLegend getColorbar() {
+    AWTColorbarLegend bar = (AWTColorbarLegend)super.getColorbar();
+    return bar;
+  }
+
+
+  @Override
+  public AWTView getView() {
+    return (AWTView)super.getView();
+  }
 }
+

jzy3d-core-awt/src/main/java/org/jzy3d/chart/controllers/mouse/camera/AWTCameraMouseController.java

@@ -57,9 +57,11 @@ public void dispose() {
    */
   @Override
   public void mousePressed(MouseEvent e) {
-    if(getChart().getView().is2D()) {
-      return;
-    }
+	if(getChart()!=null) {
+	  if(getChart().getView().is2D()) {
+	    return;
+	  }
+	}
 
     if (handleSlaveThread(e))
       return;
@@ -73,9 +75,11 @@ public void mousePressed(MouseEvent e) {
   /** Compute shift or rotate */
   @Override
   public void mouseDragged(MouseEvent e) {
-    if(getChart().getView().is2D()) {
-      return;
-    }
+	if(getChart()!=null) {
+      if(getChart().getView().is2D()) {
+        return;
+      }
+	}
 
     // Check if mouse rate limiter wish to forbid this mouse drag instruction
     if(rateLimiter!=null && !rateLimiter.rateLimitCheck()) {
@@ -103,10 +107,12 @@ else if (AWTMouseUtilities.isRightDown(e)) {
   /** Compute zoom */
   @Override
   public void mouseWheelMoved(MouseWheelEvent e) {
-    if(getChart().getView().is2D()) {
-      return;
-    }
-
+	if(getChart()!=null) {
+      if(getChart().getView().is2D()) {
+        return;
+      }
+	}
+
     // Check if mouse rate limiter wish to forbid this mouse drag instruction
     if(rateLimiter!=null && !rateLimiter.rateLimitCheck()) {
       return;

jzy3d-core-awt/src/main/java/org/jzy3d/plot2d/primitive/AWTColorbarImageGenerator.java

@@ -24,14 +24,17 @@ public class AWTColorbarImageGenerator extends AWTAbstractImageGenerator
   public static final int MIN_BAR_HEIGHT = 100;
 
   protected ColorMapper mapper;
-  protected ITickProvider provider;
-  protected ITickRenderer renderer;
+  protected ITickProvider tickProvider;
+  protected ITickRenderer tickRenderer;
   protected double min;
   protected double max;
 
   public static int BAR_WIDTH_DEFAULT = 20;
+  public static int TEXT_TO_BAR_DEFAULT = 2;
+
   protected int barWidth;
-  protected int textToBarHorizontalMargin = 2;
+  protected int textToBarHorizontalMargin = TEXT_TO_BAR_DEFAULT;
+  protected int maxTextWidth;
 
   protected boolean addTextHeightToVerticalMargin = false;
 
@@ -45,8 +48,8 @@ public AWTColorbarImageGenerator(IColorMap map, float min, float max, ITickProvi
   public AWTColorbarImageGenerator(ColorMapper mapper, ITickProvider provider,
       ITickRenderer renderer) {
     this.mapper = mapper;
-    this.provider = provider;
-    this.renderer = renderer;
+    this.tickProvider = provider;
+    this.tickRenderer = renderer;
     this.min = mapper.getMin();
     this.max = mapper.getMax();
 
@@ -62,8 +65,8 @@ public BufferedImage toImage(int width, int height) {
 
   /** Renders the colorbar to an image. */
   public BufferedImage toImage(int width, int height, int barWidth) {
-    if (barWidth > width)
-      return null;
+    //if (barWidth > width)
+    //  return null;
 
     this.barWidth = barWidth;
 
@@ -75,9 +78,9 @@ public BufferedImage toImage(int width, int height, int barWidth) {
 
     configureText(graphic);
     drawBackground(width, height, graphic);
-    drawBarColors(height, this.barWidth/*getScaledBarWidth()*/, graphic);
-    drawBarContour(height, this.barWidth/*getScaledBarWidth()*/, graphic);
-    drawTextAnnotations(height, this.barWidth/*getScaledBarWidth()*/, graphic);
+    drawBarColors(height, getScaledBarWidth(), graphic);
+    drawBarContour(height, getScaledBarWidth(), graphic);
+    drawTextAnnotations(height, getScaledBarWidth(), graphic);
     return image;
   }
 
@@ -95,7 +98,7 @@ public BufferedImage toImage(int width, int height, int barWidth) {
   protected void drawBarContour(int height, int barWidth, Graphics2D graphic) {
 
     int finalY = 0;
-    int finalH = height;
+    int finalH = height-1; // let bottom contour appear in the image
 
     // add little space to avoid cutting the text 
     // on top and bottom of colorbar
@@ -118,7 +121,7 @@ protected void drawBarContour(int height, int barWidth, Graphics2D graphic) {
   protected void drawBarColors(int height, int barWidth, Graphics2D graphic) {
 
     int finalFrom = 0;
-    int finalTo = height;
+    int finalTo = height-1;
 
     // add little space to avoid cutting the text 
     // on top and bottom of colorbar
@@ -140,8 +143,8 @@ protected void drawBarColors(int height, int barWidth, Graphics2D graphic) {
   }
 
  protected void drawTextAnnotations(int height, int barWidth, Graphics2D graphic) {
-    if (provider != null) {
-      double[] ticks = provider.generateTicks(min, max);
+    if (tickProvider != null) {
+      double[] ticks = tickProvider.generateTicks(min, max);
 
       //System.out.println("AWTColorbarImageGen : min=" + min + " max=" + max);
 
@@ -158,7 +161,7 @@ protected void drawTextAnnotations(int height, int barWidth, Graphics2D graphic)
         int ypos = (int) (height - (heightNoText * ratioOfRange));
 
 
-        String txt = renderer.format(ticks[t]);
+        String txt = tickRenderer.format(ticks[t]);
         graphic.drawString(txt, xpos, ypos);
       }
     }
@@ -174,7 +177,7 @@ public void setPixelScale(Coord2d pixelScale) {
 
   /* */
 
-  protected int getScaledBarWidth() {
+  public int getScaledBarWidth() {
     if(pixelScale!=null) {
       return (int)(barWidth * pixelScale.x);
     }
@@ -183,18 +186,10 @@ protected int getScaledBarWidth() {
     }
   }
 
-  /**
-   * Compute the optimal image width to contain the text as defined by the tick provided and
-   * renderer.
-   */
-  public int getPreferedWidth(IPainter painter) {
-    int maxWidth = getMaxTickLabelWidth(painter);
-    return getPreferedWidth(maxWidth);
+  public int getBarWidth() {
+      return barWidth;
   }
 
-  protected int getPreferedWidth(int maxTextWidth) {
-    return maxTextWidth + textToBarHorizontalMargin + BAR_WIDTH_DEFAULT;
-  }
 
   public int getTextToBarHorizontalMargin() {
     return textToBarHorizontalMargin;
@@ -204,21 +199,72 @@ public void setTextToBarHorizontalMargin(int textToBarHorizontalMargin) {
     this.textToBarHorizontalMargin = textToBarHorizontalMargin;
   }
 
-  protected int getMaxTickLabelWidth(IPainter painter) {
+  /**
+   * Compute the optimal image width to contain the text as defined by the tick provided and
+   * renderer.
+   */
+  public int getPreferredWidth(IPainter painter) {
+    maxTextWidth = getMaxTickLabelWidth(painter);
+
+    //System.out.println("AWTColorbarImageGen : max txt width " + maxTextWidth);
+
+    // we unscale it : we here use a graphics2D context that consider
+    // text scale by itself. As font is globally magnified, mainly for JOGL
+    // text renderer, we will unscale it for processing the width
+
+    int maxTextActual = maxTextWidth;
+
+    if(pixelScale.x>0)
+      maxTextActual = Math.round(maxTextWidth / pixelScale.x);
+
+    //System.out.println("AWTColorbarImageGen : max txt act " + maxTextActual + " " + pixelScale);
+
+    return getPreferredWidth(maxTextActual);
+  }
+
+  protected int getPreferredWidth(int maxTextWidth) {
+    return maxTextWidth + getTextToBarHorizontalMargin() + getBarWidth();
+  }
+
+  /**
+   * Only valid after a call to {@link #getPreferredWidth(IPainter)}
+   * @return
+   */
+  public int getMaxTextWidth() {
+    return maxTextWidth;
+  }
+
+  public int getMaxTickLabelWidth(IPainter painter) {
     int maxWidth = 0;
-    if (provider != null) {
-      double[] ticks = provider.generateTicks(min, max);
+    if (tickProvider != null) {
+      double[] ticks = tickProvider.generateTicks(min, max);
       String tickLabel;
       for (int t = 0; t < ticks.length; t++) {
-        tickLabel = renderer.format(ticks[t]);
+        tickLabel = tickRenderer.format(ticks[t]);
 
         int stringWidth = painter.getTextLengthInPixels(font, tickLabel);
-
+        //System.out.println("Gen : " + stringWidth + " for " + tickLabel);
         if (maxWidth < stringWidth) {
           maxWidth = stringWidth;
         }
       }
     }
     return maxWidth;
   }
+
+  public ITickProvider getTickProvider() {
+    return tickProvider;
+  }
+
+  public void setTickProvider(ITickProvider tickProvider) {
+    this.tickProvider = tickProvider;
+  }
+
+  public ITickRenderer getTickRenderer() {
+    return tickRenderer;
+  }
+
+  public void setTickRenderer(ITickRenderer tickRenderer) {
+    this.tickRenderer = tickRenderer;
+  }
 }

jzy3d-core-awt/src/main/java/org/jzy3d/plot2d/rendering/AWTGraphicsUtils.java

@@ -67,6 +67,11 @@ public static void drawString(Graphics2D g2d, Font font, boolean useOSFontRender
     }
   }
 
+  public static int stringWidth(String string) {
+    BufferedImage i = new BufferedImage(0,0, BufferedImage.TYPE_4BYTE_ABGR);
+
+    return stringWidth(i.createGraphics(), string);
+  }
   public static int stringWidth(Graphics2D g2d, String string) {
     FontMetrics fm = g2d.getFontMetrics();
     if (fm != null) {