Changeset 562

Timestamp:

12/03/13 09:48:42 (11 years ago)

Author:

jts21

Message:

Add alpha value support for Nathaniel's web page importing (but as mentioned in commit #558, large items with alpha values cause some serious lag when redrawing)

File:

• trunk/src/org/expeditee/io/Conversion.java (modified) (3 diffs)

trunk/src/org/expeditee/io/Conversion.java

@@ -90 +90 @@
 
         private static Color getRGBColor(String colorCode, Color current) {
-                int color[] = new int[3];
+                int color[] = new int[4];
                 // Assert.assertTrue(color.length == 3);
 
@@ -102 +102 @@
                         String g = values.length > 1 ? values[1] : "0";
                         String b = values.length > 2 ? values[2] : "0";
+                        String a = values.length > 3 ? values[3] : "100";
 
                         int red = (current == null ? 0 : toColorPercent(current.getRed()));
-                        int green = (current == null ? 0 : toColorPercent(current
-                                        .getGreen()));
+                        int green = (current == null ? 0 : toColorPercent(current.getGreen()));
                         int blue = (current == null ? 0 : toColorPercent(current.getBlue()));
+                        int alpha = (current == null ? 0 : toColorPercent(current.getAlpha()));
+                        
                         color[0] = (Integer) Convert(int.class, r, red);
                         color[1] = (Integer) Convert(int.class, g, green);
                         color[2] = (Integer) Convert(int.class, b, blue);
+                        color[3] = (Integer) Convert(int.class, a, alpha);
 
                         for (int i = 0; i < color.length; i++) {
                                 color[i] = toRGB(color[i]);
                         }
-                        return new Color(color[0], color[1], color[2]);
+                        return new Color(color[0], color[1], color[2], color[3]);
                 } catch (Exception e) {
                         return null;
@@ -161 +164 @@
                 int g = (int) Math.round((color.getGreen() / RGB_CONVERSION_FACTOR));
                 int b = (int) Math.round((color.getBlue() / RGB_CONVERSION_FACTOR));
-
-                return r + " " + g + " " + b;
+                int a = (int) Math.round((color.getAlpha() / RGB_CONVERSION_FACTOR));
+
+                return r + " " + g + " " + b + " " + a;
         }