[Jmol-commits] SF.net SVN: jmol:[18825] trunk/Jmol/src/javajs

[<ha...@us...>]

Revision: 18825
          http://sourceforge.net/p/jmol/code/18825
Author:   hansonr
Date:     2013-10-18 14:59:00 +0000 (Fri, 18 Oct 2013)
Log Message:
-----------


Modified Paths:
--------------
    trunk/Jmol/src/javajs/awt/Color.java
    trunk/Jmol/src/javajs/swing/JComponent.java

Added Paths:
-----------
    trunk/Jmol/src/javajs/awt/ColorUtil.java

Modified: trunk/Jmol/src/javajs/awt/Color.java
===================================================================
--- trunk/Jmol/src/javajs/awt/Color.java	2013-10-18 13:37:32 UTC (rev 18824)
+++ trunk/Jmol/src/javajs/awt/Color.java	2013-10-18 14:59:00 UTC (rev 18825)
@@ -36,4 +36,5 @@
 		argb = ((a << 24) | (r << 16) | (g << 8) | b) & 0xFFFFFFFF;
 		return this;
 	}
+	
 }

Added: trunk/Jmol/src/javajs/awt/ColorUtil.java
===================================================================
--- trunk/Jmol/src/javajs/awt/ColorUtil.java	                        (rev 0)
+++ trunk/Jmol/src/javajs/awt/ColorUtil.java	2013-10-18 14:59:00 UTC (rev 18825)
@@ -0,0 +1,30 @@
+package javajs.awt;
+
+import javajs.api.GenericColor;
+
+public class ColorUtil {
+
+  public static String toRGBHexString(GenericColor c) {
+    int rgb = c.getRGB();    
+    if (rgb == 0)
+      return "000000";
+    String r  = "00" + Integer.toHexString((rgb >> 16) & 0xFF);
+    r = r.substring(r.length() - 2);
+    String g  = "00" + Integer.toHexString((rgb >> 8) & 0xFF);
+    g = g.substring(g.length() - 2);
+    String b  = "00" + Integer.toHexString(rgb & 0xFF);
+    b = b.substring(b.length() - 2);
+    return r + g + b;
+  }
+
+  public static String toCSSString(GenericColor c) {
+    int opacity = c.getOpacity255();
+    if (opacity == 255)
+      return "#" + toRGBHexString(c);
+    int rgb = c.getRGB();
+    return "rgba(" + ((rgb>>16)&0xFF) + "," + ((rgb>>8)&0xff) + "," + (rgb&0xff) + "," + opacity/255f  + ")"; 
+  }
+  
+}
+
+

Modified: trunk/Jmol/src/javajs/swing/JComponent.java
===================================================================
--- trunk/Jmol/src/javajs/swing/JComponent.java	2013-10-18 13:37:32 UTC (rev 18824)
+++ trunk/Jmol/src/javajs/swing/JComponent.java	2013-10-18 14:59:00 UTC (rev 18825)
@@ -1,8 +1,8 @@
 package javajs.swing;
 
 import javajs.api.GenericColor;
+import javajs.awt.ColorUtil;
 import javajs.awt.Dimension;
-import jspecview.util.JSVColorUtil;
 
 abstract public class JComponent {
 	
@@ -115,7 +115,7 @@
 		int height = (renderHeight > 0 ? renderHeight : getSubcomponentHeight());
 		return (width > 0 ? "width:" + width +"px;" : defaultPercent > 0 ? "width:"+defaultPercent+"%;" : "")
 		+ (height > 0 ?"height:" + height + "px;" : defaultPercent > 0 ? "height:"+defaultPercent+"%;" : "")
-		+ (bgcolor == null ? "" : "background-color:" + JSVColorUtil.colorToCssString(bgcolor) + ";");
+		+ (bgcolor == null ? "" : "background-color:" + ColorUtil.toCSSString(bgcolor) + ";");
 	}
 	
   public void repaint() {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.