Changeset 1102 for trunk/src/org/expeditee/io/Conversion.java

Timestamp:

05/10/18 16:04:51 (6 years ago)

Author:

davidb

Message:

Reworking of the code-base to separate logic from graphics. This version of Expeditee now supports a JFX graphics as an alternative to SWING

File:

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

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

@@ -19 +19 @@
 package org.expeditee.io;
 
-import java.awt.Color;
-import java.awt.Font;
-import java.awt.Point;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
@@ -29 +26 @@
 
 import org.expeditee.actions.Actions;
+import org.expeditee.core.Colour;
+import org.expeditee.core.Font;
+import org.expeditee.core.Point;
 import org.expeditee.items.Item;
 import org.expeditee.items.Text;
@@ -43 +43 @@
 public class Conversion {
 
-        public static final int RGB_MAX = 255;
-
-        private static final float RGB_CONVERSION_FACTOR = 2.55F;
+        public static final short RGB_MAX = Colour.COMPONENT_MAX_VALUE;
+
+        private static final float RGB_CONVERSION_FACTOR = RGB_MAX / 100.0f;
 
         /**
@@ -56 +56 @@
          * @return The Color object corresponding to the given code
          */
-        public static Color getColor(String colorCode, Color current) {
+        public static Colour getColor(String colorCode, Colour current) {
                 if (colorCode == null) {
                         return null;
@@ -66 +66 @@
 
                 // check if its a normal rgb code ie. 100 0 40
-                Color rgb = getRGBColor(colorCode, current);
+                Colour rgb = getRGBColor(colorCode, current);
                 if (rgb != null)
                         return rgb;
@@ -104 +104 @@
                         return null;
 
-                return new Color(color[0], color[1], color[2]);
-        }
-
-        private static Color getRGBColor(String colorCode, Color current) {
+                return new Colour(color[0], color[1], color[2]);
+        }
+
+        private static Colour getRGBColor(String colorCode, Colour current) {
                 int color[] = new int[4];
                 // Assert.assertTrue(color.length == 3);
@@ -135 +135 @@
                                 color[i] = toRGB(color[i]);
                         }
-                        return new Color(color[0], color[1], color[2], color[3]);
+                        return new Colour(color[0], color[1], color[2], color[3]);
                 } catch (Exception e) {
                         return null;
@@ -175 +175 @@
          *         is black.
          */
-        public static String getExpediteeColorCode(Color color) {
+        public static String getExpediteeColorCode(Colour color) {
                 if (color == null)
                         return null;
@@ -195 +195 @@
          */
         public static String getExpediteeFontCode(Font font) {
-                String fontName = font.getFamily();
-                String code = font.getFamily() + '_';
+                String fontName = font.getFamilyName();
+                String code = font.getFamilyName() + '_';
 
                 for (int i = 0; i < Text.FONT_WHEEL.length; i++) {
@@ -206 +206 @@
 
                 switch (font.getStyle()) {
-                case Font.BOLD:
+                case BOLD:
                         code += "b";
                         break;
-                case Font.PLAIN:
+                case PLAIN:
                         code += "r";
                         break;
-                case Font.ITALIC:
+                case ITALIC:
                         code += "i";
                         break;
@@ -237 +237 @@
 
                 int separator = fontCode.indexOf('_');
-                String code = Text.FONT_WHEEL[0];
+                String familyName = Text.FONT_WHEEL[0];
                 if (separator > 0) {
-                        code = Actions.getCapitalizedFontName(fontCode.substring(0,
-                                        separator)) + '-';
+                        familyName = Actions.getCapitalizedFontName(fontCode.substring(0, separator));
                         fontCode = fontCode.substring(separator);
                 } else {
@@ -246 +245 @@
                         for (int i = 0; i < Text.FONT_CHARS.length; i++) {
                                 if (c == Text.FONT_CHARS[i]) {
-                                        code = Text.FONT_WHEEL[i] + '-';
+                                        familyName = Text.FONT_WHEEL[i];
                                         break;
                                 }
                         }
                 }
+                
+                Font font = new Font(familyName);
 
                 switch (fontCode.charAt(1)) {
                 case 'r':
-                        code += "Plain";
+                        font.setStyle(Font.Style.PLAIN);
                         break;
                 case 'b':
-                        code += "Bold";
+                        font.setStyle(Font.Style.BOLD);
                         break;
                 case 'i':
-                        code += "Italic";
+                        font.setStyle(Font.Style.ITALIC);
                         break;
                 case 'p':
-                        code += "BoldItalic";
+                        font.setStyle(Font.Style.BOLD_ITALIC);
                         break;
                 }
-
-                code += "-";
-
-                Font font = null;
 
                 try {
                         int size = Integer.parseInt(fontCode.substring(2));
-                        // double dsize = size * FONT_SCALE;
-                        // if (dsize - ((int) dsize) > FONT_ROUNDING)
-                        // dsize = Math.ceil(dsize);
-
-                        // code += (int) dsize;
-                        code += size;
-
-                        font = Font.decode(code);
+                        
+                        font.setSize(size);
                 } catch (NumberFormatException nfe) {
-                        font = Font.decode(fontCode);
+                        // Just keep going
                 }
 
@@ -362 +353 @@
                 }
 
-                if (type.equals(Color.class)) {
+                if (type.equals(Colour.class)) {
                         if (value.length() == 0)
                                 return null;
@@ -368 +359 @@
                         try {
                                 // Try to decode the string as a hex or octal color code
-                                return Color.decode(value);
+                                return Colour.decode(value);
                         } catch (NumberFormatException nfe) {
                                 try {
-                                        // Try to find the field in the Color class with the same name as the given string
-                                        Field[] fields = java.awt.Color.class.getFields();
+                                        // Try to find the field in the Colour class with the same name as the given string
+                                        Field[] fields = Colour.class.getFields();
                                         Field field = null;
                                         for (int i = 0; i < fields.length; i++) {
@@ -380 +371 @@
                                                 }
                                         }
-                                        return (Color) field.get(null);
+                                        return (Colour) field.get(null);
                                 } catch (Exception e) {
-                                        return getColor(value, (Color) orig);
+                                        return getColor(value, (Colour) orig);
                                 }
                         }
@@ -388 +379 @@
 
                 if (type.equals(int.class)) {
-                        if (orig instanceof Integer
-                                        && (value.startsWith("+") || value.startsWith("-"))) {
+                        if (orig instanceof Integer && (value.startsWith("+") || value.startsWith("-"))) {
                                 value = value.replace("+", "");
 
@@ -395 +385 @@
                         }
 
-                        if (value.length() == 0 || value.equals("null"))
-                                return Item.DEFAULT_INTEGER;
+                        if (value.length() == 0 || value.equals("null")) return Item.DEFAULT_INTEGER;
 
                         return Integer.decode(value);
@@ -427 +416 @@
 
                 if (type.equals(Integer.class)) {
-                        if (orig instanceof Integer
-                                        && (value.startsWith("+") || value.startsWith("-"))) {
+                        if (orig instanceof Integer && (value.startsWith("+") || value.startsWith("-"))) {
                                 value = value.replace("+", "");
 
-                                Integer newValue = ((Integer) orig) + Integer.parseInt(value);
+                                Integer newValue = ((Integer) orig) + Integer.valueOf((int) Double.parseDouble(value));
                                 if (newValue <= 0)
                                         return null;
@@ -440 +428 @@
                                 return null;
 
-                        return Integer.parseInt(value);
+                        return Integer.valueOf((int) Double.parseDouble(value));
                 }
 
@@ -700 +688 @@
 
                 // convert colors
-                if (output instanceof Color)
-                        return getExpediteeColorCode((Color) output);
+                if (output instanceof Colour)
+                        return getExpediteeColorCode((Colour) output);
 
                 // covert points
@@ -737 +725 @@
         }
 
-        public static String getCssColor(Color c) {
+        public static String getCssColor(Colour c) {
                 assert (c != null);
-                return "rgb(" + c.getRed() + "," + c.getGreen() + "," + c.getBlue()
+                return "rgb(" + c.getRed255() + "," + c.getGreen255() + "," + c.getBlue255()
                                 + ")";
         }