Added two additional fonts for the lcd displays in the gauges

The fonts could be selected via the Gauge.LcdFont enum.
oedemis · May 31, 2012 · 686b723 · 686b723
1 parent 106c9c6
commit 686b723
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,4 +19,5 @@ src/main/java/Demo.java
 /nbbuild/
 /dist/
 nbproject
-build.xml
+build.xml
+.DS_Store
diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/LcdSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/LcdSkin.java
@@ -571,6 +571,14 @@ private void prepareLcd() {
                 LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/digital.ttf"), (0.5833333333 * SIZE));
                 lcdDigitalFontSizeFactor = 1.9098073909;
                 break;
+            case PIXEL:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/pixel.ttf"), (0.5208333333 * SIZE));
+                lcdDigitalFontSizeFactor = 1.0;
+                break;
+            case PHONE_LCD:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/phonelcd.ttf"), (0.4583333333 * SIZE));
+                lcdDigitalFontSizeFactor = 1.0;
+                break;
             case STANDARD:
             default:
                 LCD_VALUE_FONT = Font.font("Verdana", FontWeight.NORMAL, (0.5 * SIZE));

diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/LinearSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/LinearSkin.java
@@ -1459,6 +1459,14 @@ public void drawLcdContent() {
                 LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/bus.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
                 UNIT_Y_OFFSET = 2.0;
                 break;
+            case PIXEL:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/pixel.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
+                UNIT_Y_OFFSET = 2.0;
+                break;
+            case PHONE_LCD:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/phonelcd.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
+                UNIT_Y_OFFSET = 2.0;
+                break;
             case STANDARD:
             default:
                 LCD_VALUE_FONT = Font.font("Verdana", FontWeight.NORMAL, (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));

diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/RadialQuarterNSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/RadialQuarterNSkin.java
@@ -1339,6 +1339,14 @@ public void drawLcdContent() {
                 LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/bus.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
                 UNIT_Y_OFFSET = 2.0;
                 break;
+            case PIXEL:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/pixel.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
+                UNIT_Y_OFFSET = 2.0;
+                break;
+            case PHONE_LCD:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/phonelcd.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
+                UNIT_Y_OFFSET = 2.0;
+                break;
             case STANDARD:
             default:
                 LCD_VALUE_FONT = Font.font("Verdana", FontWeight.NORMAL, (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));

diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/RadialQuarterSSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/RadialQuarterSSkin.java
@@ -1334,6 +1334,14 @@ public void drawLcdContent() {
                 LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/bus.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
                 UNIT_Y_OFFSET = 2.0;
                 break;
+            case PIXEL:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/pixel.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
+                UNIT_Y_OFFSET = 2.0;
+                break;
+            case PHONE_LCD:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/phonelcd.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
+                UNIT_Y_OFFSET = 2.0;
+                break;
             case STANDARD:
             default:
                 LCD_VALUE_FONT = Font.font("Verdana", FontWeight.NORMAL, (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));

diff --git a/src/main/java/jfxtras/labs/internal/scene/control/skin/RadialSkin.java b/src/main/java/jfxtras/labs/internal/scene/control/skin/RadialSkin.java
@@ -1439,6 +1439,14 @@ public void drawLcdContent() {
                 LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/bus.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
                 UNIT_Y_OFFSET = 2.0;
                 break;
+            case PIXEL:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/pixel.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
+                UNIT_Y_OFFSET = 2.0;
+                break;
+            case PHONE_LCD:
+                LCD_VALUE_FONT = Font.loadFont(getClass().getResourceAsStream("/jfxtras/labs/scene/control/gauge/phonelcd.ttf"), (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));
+                UNIT_Y_OFFSET = 2.0;
+                break;
             case STANDARD:
             default:
                 LCD_VALUE_FONT = Font.font("Verdana", FontWeight.NORMAL, (0.6 * LCD_FRAME.getLayoutBounds().getHeight()));

diff --git a/src/main/java/jfxtras/labs/scene/control/gauge/Gauge.java b/src/main/java/jfxtras/labs/scene/control/gauge/Gauge.java
@@ -131,7 +131,9 @@ public static enum KnobDesign {
     public static enum LcdFont {
         STANDARD,
         LCD,
-        BUS
+        BUS,
+        PIXEL,
+        PHONE_LCD
     }
     public static enum NumberFormat {
         AUTO("0"),

diff --git a/src/main/resources/jfxtras/labs/scene/control/gauge/phonelcd.ttf b/src/main/resources/jfxtras/labs/scene/control/gauge/phonelcd.ttf
diff --git a/src/main/resources/jfxtras/labs/scene/control/gauge/pixel.ttf b/src/main/resources/jfxtras/labs/scene/control/gauge/pixel.ttf