X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scenegraph%2Fsrc%2Forg%2Fsimantics%2Fscenegraph%2Fg2d%2Fnodes%2FImageNode.java;h=43cf64eb0a2159f9d1fce6f12b4ed6351dfe6dd3;hb=452670c58399d8054872655841ebb6e66d9c6b6e;hp=60d42ac273325b154ecf90c1f387ae8eb2565d45;hpb=969bd23cab98a79ca9101af33334000879fb60c5;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/ImageNode.java b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/ImageNode.java
index 60d42ac27..43cf64eb0 100644
--- a/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/ImageNode.java
+++ b/bundles/org.simantics.scenegraph/src/org/simantics/scenegraph/g2d/nodes/ImageNode.java
@@ -1,79 +1,95 @@
-/*******************************************************************************
- * Copyright (c) 2007, 2010 Association for Decentralized Information Management
- * in Industry THTH ry.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     VTT Technical Research Centre of Finland - initial API and implementation
- *******************************************************************************/
-package org.simantics.scenegraph.g2d.nodes;
-
-import java.awt.Graphics2D;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-import java.awt.image.BufferedImage;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-
-import javax.imageio.ImageIO;
-
-import org.simantics.scenegraph.g2d.G2DNode;
-
-public class ImageNode extends G2DNode {
-
-    private static final long serialVersionUID = -4982578347433716440L;
-
-    protected Boolean visible = Boolean.TRUE;
-    protected BufferedImage img = null;
-
-    @SyncField("visible")
-    public void setVisible(Boolean visible) {
-        this.visible = visible;
-    }
-
-    public boolean isVisible() {
-        return visible;
-    }
-
-    @ClientSide
-    public void setImage(byte[] buf) {
-        try {
-            img = ImageIO.read(new ByteArrayInputStream(buf));
-        } catch (IOException e) {
-        }
-    }
-
-    public void setImage(BufferedImage src) {
-        img = src;
-    }
-
-    @Override
-    public void render(Graphics2D g) {
-        if (!visible || img == null) return;
-
-        AffineTransform ot = null;
-        if (!transform.isIdentity()) {
-            ot = g.getTransform();
-            g.transform(transform);
-        }
-
-//        G2DParentNode parent = (G2DParentNode) getParent();
-//        if(parent != null) {
-//            Rectangle2D b = parent.getBoundsInLocal();
-//            g.drawImage(img, (int)b.getMinX(), (int)b.getMinY(), (int)b.getWidth()+(int)b.getMinX(), (int)b.getHeight()+(int)b.getMinY(), 0, 0, img.getWidth(), img.getHeight(), null);
-//        }
-        g.drawImage(img, 0, 0, null);
-
-        if (ot != null)
-            g.setTransform(ot);
-    }
-
-    @Override
-    public Rectangle2D getBoundsInLocal() {
-        return new Rectangle2D.Double(img.getMinX(), img.getMinY(), img.getWidth(), img.getHeight());
-    }
-
-}
+/*******************************************************************************
+ * Copyright (c) 2007, 2010 Association for Decentralized Information Management
+ * in Industry THTH ry.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     VTT Technical Research Centre of Finland - initial API and implementation
+ *******************************************************************************/
+package org.simantics.scenegraph.g2d.nodes;
+
+import java.awt.AlphaComposite;
+import java.awt.Composite;
+import java.awt.Graphics2D;
+import java.awt.geom.AffineTransform;
+import java.awt.geom.Rectangle2D;
+import java.awt.image.BufferedImage;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+
+import javax.imageio.ImageIO;
+
+import org.simantics.scenegraph.g2d.G2DNode;
+
+public class ImageNode extends G2DNode {
+
+    private static final long serialVersionUID = -4982578347433716440L;
+
+    protected Boolean visible = Boolean.TRUE;
+    protected BufferedImage img = null;
+    protected float alpha = 1.0f;
+
+    @SyncField("visible")
+    public void setVisible(Boolean visible) {
+        this.visible = visible;
+    }
+
+    public boolean isVisible() {
+        return visible;
+    }
+
+    @ClientSide
+    public void setImage(byte[] buf) {
+        try {
+            img = ImageIO.read(new ByteArrayInputStream(buf));
+        } catch (IOException e) {
+        }
+    }
+
+    public void setImage(BufferedImage src) {
+        img = src;
+    }
+
+    public void setAlpha(float alpha) {
+        this.alpha = Math.max(0.0f, Math.min(alpha, 1.0f));
+    }
+
+    @Override
+    public void render(Graphics2D g) {
+        if (!visible || img == null) return;
+
+        AffineTransform ot = null;
+        if (!transform.isIdentity()) {
+            ot = g.getTransform();
+            g.transform(transform);
+        }
+
+//        G2DParentNode parent = (G2DParentNode) getParent();
+//        if(parent != null) {
+//            Rectangle2D b = parent.getBoundsInLocal();
+//            g.drawImage(img, (int)b.getMinX(), (int)b.getMinY(), (int)b.getWidth()+(int)b.getMinX(), (int)b.getHeight()+(int)b.getMinY(), 0, 0, img.getWidth(), img.getHeight(), null);
+//        }
+
+        Composite old = null;
+        if (alpha < 1.0f) {
+            old = g.getComposite();
+            g.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
+        }
+
+        g.drawImage(img, 0, 0, null);
+
+        if (old != null)
+            g.setComposite(old);
+        if (ot != null)
+            g.setTransform(ot);
+    }
+
+    @Override
+    public Rectangle2D getBoundsInLocal() {
+        return new Rectangle2D.Double(img.getMinX(), img.getMinY(), img.getWidth(), img.getHeight());
+    }
+
+}