This commit is contained in:
Vulpovile
2025-04-09 21:52:18 -07:00
parent 8da8621d9b
commit 0648a0178c
22 changed files with 288 additions and 317 deletions

View File

@@ -13,4 +13,6 @@ public interface Display {
public void drawBoundLimitedDisplay(RenderPanel renderer, Graphics2D g, Rectangle bounds, long ticks, int iconTicks);
public void redrawRegionlost(RenderPanel renderer);
public void notifyForecastProviderUpdate(RenderPanel renderPanel, ForecastProvider forecastProvider);
public String getDisplayName();
}

View File

@@ -1,32 +1,72 @@
package com.flaremicro.visualforecast.displays;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import com.flaremicro.visualforecast.PropertyManager;
import com.flaremicro.visualforecast.displays.impl.SevenDayForecastDisplay;
import com.flaremicro.visualforecast.displays.impl.HourlyForecastDisplay;
import com.flaremicro.visualforecast.displays.impl.MessageForecastDisplay;
import com.flaremicro.visualforecast.displays.impl.ThirtySixHourForecastDisplay;
public class DisplayFactory {
private static final int CURRENT_SELECTION = 1;
int currentIndex = -1;
String indexValue = "";
PropertyManager propertyManager;
private List<String> nameOrder = new ArrayList<String>();
private Map<String, Display> displays = new HashMap<String, Display>();
public DisplayFactory(PropertyManager propertyManager)
{
displays.put("message", new MessageForecastDisplay());
displays.put("day", new DayForecastDisplay());
displays.put("hourly", new HourlyForecastDisplay());
nameOrder.add("message");
nameOrder.add("day");
nameOrder.add("hourly");
public DisplayFactory(PropertyManager propertyManager) {
this.propertyManager = propertyManager;
nameOrder.add(register(new MessageForecastDisplay()));
//nameOrder.add(register(new CurrentForecastDisplay()));
nameOrder.add(register(new ThirtySixHourForecastDisplay()));
nameOrder.add(register(new SevenDayForecastDisplay()));
nameOrder.add(register(new HourlyForecastDisplay()));
int selection = propertyManager.getInteger("current-display-version", -1);
String nameOrderString = getCurrentNameOrder();
if ((selection >= 0 && selection != CURRENT_SELECTION))
{
propertyManager.setInteger("current-display-version", CURRENT_SELECTION);
propertyManager.setString("display-selection", nameOrderString);
propertyManager.store();
}
else
{
System.out.println("got good order: " + propertyManager.getString("display-selection", "oh no"));
nameOrder.clear();
String[] s = propertyManager.getString("display-selection", nameOrderString).split(",");
nameOrder.addAll(Arrays.asList(s));
}
}
private String getCurrentNameOrder() {
StringBuilder sb = new StringBuilder();
for (int i = 0; i < nameOrder.size(); i++)
{
if (i != 0)
{
sb.append(",");
}
sb.append(nameOrder.get(i));
}
return sb.toString();
}
private String register(Display display) {
displays.put(display.getDisplayName(), display);
return display.getDisplayName();
}
public Display nextDisplay() {
currentIndex = (currentIndex + 1) % nameOrder.size();
return displays.get(nameOrder.get(currentIndex));
}
}

View File

@@ -1,55 +0,0 @@
package com.flaremicro.visualforecast.displays;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import com.flaremicro.visualforecast.RenderPanel;
import com.flaremicro.visualforecast.api.ForecastProvider;
import com.flaremicro.visualforecast.graphics.DrawingUtil;
import static com.flaremicro.visualforecast.graphics.RenderConstants.*;
public class TextDisplay implements Display {
public TextDisplay(String title, String scrollText) {
/*
int w2 = g2d.getFontMetrics().stringWidth("EXTREME WEATHER ADVISORY");
drawOutlinedString(g2d, (W >> 1) - (w2 >> 1), TOPBAR_HEIGHT + 48, "EXTREME WEATHER ADVISORY", Color.RED, Color.BLACK, 2);
g2d.setFont(font.deriveFont(30F));
for (int i = 0; i < testString.length; i++)
{
drawOutlinedString(g2d, 90, TOPBAR_HEIGHT + 78 + 25 * i, testString[i], Color.WHITE, Color.BLACK, 1);
}
*/
}
@Override
public void tick(RenderPanel renderer, long ticks, int iconTicks) {
}
@Override
public void initDisplay(RenderPanel renderer, ForecastProvider forecastProvider, long ticks, int iconTicks) {
}
@Override
public void drawDisplay(RenderPanel renderer, Graphics2D g2d, long ticks, int iconTicks) {
DrawingUtil.drawGradientRect(g2d, 60, TOPBAR_HEIGHT, W - 120, MAINBAR_HEIGHT, 20, BG_BLUE.brighter(), BG_BLUE.darker());
g2d.setColor(BG_BLUE.brighter());
g2d.drawRect(60 + STROKE_OFFSET, TOPBAR_HEIGHT + STROKE_OFFSET, W - 120 - STROKE_WIDTH, MAINBAR_HEIGHT - STROKE_WIDTH);
}
@Override
public void drawBoundLimitedDisplay(RenderPanel renderer, Graphics2D g2d, Rectangle bounds, long ticks, int iconTicks) {
}
@Override
public void redrawRegionlost(RenderPanel renderer) {
}
@Override
public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) {
}
}

View File

@@ -1,155 +0,0 @@
package com.flaremicro.visualforecast.displays;
import java.awt.Color;
import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.Graphics2D;
import java.awt.Rectangle;
import java.awt.image.BufferedImage;
import java.util.ArrayList;
import com.flaremicro.visualforecast.RenderPanel;
import com.flaremicro.visualforecast.api.ForecastProvider;
import com.flaremicro.visualforecast.graphics.DrawingUtil;
import com.flaremicro.visualforecast.graphics.FontManager;
import static com.flaremicro.visualforecast.graphics.RenderConstants.*;
public class ThirtySixHourDisplay implements Display {
private String[] lines = new String[0];
private Font font;
public ThirtySixHourDisplay() {
font = FontManager.getInstance().getOrCreateFont(Font.TRUETYPE_FONT, this.getClass().getResource("/Star4000.ttf")).deriveFont(30F);
/*
int w2 = g2d.getFontMetrics().stringWidth("EXTREME WEATHER ADVISORY");
drawOutlinedString(g2d, (W >> 1) - (w2 >> 1), TOPBAR_HEIGHT + 48, "EXTREME WEATHER ADVISORY", Color.RED, Color.BLACK, 2);
g2d.setFont(font.deriveFont(30F));
for (int i = 0; i < testString.length; i++)
{
drawOutlinedString(g2d, 90, TOPBAR_HEIGHT + 78 + 25 * i, testString[i], Color.WHITE, Color.BLACK, 1);
}
*/
}
@Override
public void tick(RenderPanel renderer, long ticks, int iconTicks) {
}
@Override
public void initDisplay(RenderPanel renderer, ForecastProvider forecastProvider, long ticks, int iconTicks) {
String test = "*IMPORTANT NOTICE*\n*POWER OUTAGE POSSIBLE*\n*DUE TO EXTREME WINDS*\n\nHurricane-force winds capable of reaching 127km/h will be hitting the east coast around noon tomorrow. Keep windows and doors barricaded to prevent";
ArrayList<String> linesList = new ArrayList<String>();
BufferedImage disposableImage = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY);
Graphics2D g = disposableImage.createGraphics();
FontMetrics f = g.getFontMetrics(font);
System.out.println("yas2");
String[] lines = test.split("\n");
for(int i = 0; i < lines.length; i++)
{
splitText(lines[i], W - 150 - STROKE_WIDTH, f, linesList);
//if(words[i])
}
g.dispose();
disposableImage.flush();
System.out.println("yas");
this.lines = linesList.toArray(new String[0]);
}
private void splitText(String text, int maxWidth, FontMetrics fontMetrics, ArrayList<String> lineList) {
text = text.trim();
//this.text.add(text);
if (fontMetrics.stringWidth(text) <= maxWidth)
lineList.add(text);
else
{
while (text.length() > 0)
{
int idx = binSearch(text, fontMetrics, maxWidth, 1, text.length());
if (idx <= 0)
break;
String texPart = text.substring(0, idx).trim();
if (fontMetrics.stringWidth(text.substring(0, Math.min(text.length(), idx + 1))) > maxWidth && texPart.contains(" "))
{
idx = texPart.lastIndexOf(" ");
texPart = texPart.substring(0, idx);
}
lineList.add(texPart);
text = text.substring(idx).trim();
}
}
}
private static int binSearch(String string, FontMetrics fontMetrics, int key, int low, int high) {
int index = 0;
while (low <= high)
{
int mid = low + ((high - low) / 2);
int midmetric = fontMetrics.stringWidth(string.substring(0, mid));
if (midmetric < key)
{
low = mid + 1;
index = mid;
}
else if (midmetric > key)
{
high = mid - 1;
}
else if (midmetric == key)
{
index = mid;
break;
}
}
return index;
}
@Override
public void drawDisplay(RenderPanel renderer, Graphics2D g2d, long ticks, int iconTicks) {
}
@Override
public void drawBoundLimitedDisplay(RenderPanel renderer, Graphics2D g2d, Rectangle bounds, long ticks, int iconTicks) {
DrawingUtil.drawGradientRect(g2d, 60, TOPBAR_HEIGHT, W - 120, MAINBAR_HEIGHT, 20, BG_BLUE.brighter(), BG_BLUE.darker());
g2d.setFont(font);
FontMetrics fontMetrics = g2d.getFontMetrics();
g2d.setColor(BG_BLUE.brighter());
g2d.drawRect(60 + STROKE_OFFSET, TOPBAR_HEIGHT + STROKE_OFFSET, W - 120 - STROKE_WIDTH, MAINBAR_HEIGHT - STROKE_WIDTH);
for(int i = 0; i < lines.length; i++)
{
if(lines[i].startsWith("*") && lines[i].endsWith("*"))
{
String line = lines[i].substring(1, lines[i].length()-1);
DrawingUtil.drawOutlinedString(g2d, 60 + 20 + STROKE_OFFSET, TOPBAR_HEIGHT + STROKE_OFFSET + 40 + i*30, "*", Color.WHITE, Color.BLACK, 2);
DrawingUtil.drawOutlinedString(g2d, 60 + 20 + STROKE_OFFSET + (W - 150 - STROKE_WIDTH)/2 - fontMetrics.stringWidth(line)/2, TOPBAR_HEIGHT + STROKE_OFFSET + 40 + i*30, line, Color.WHITE, Color.BLACK, 2);
DrawingUtil.drawOutlinedString(g2d, W - 95 - STROKE_WIDTH, TOPBAR_HEIGHT + STROKE_OFFSET + 40 + i*30, "*", Color.WHITE, Color.BLACK, 2);
}
else if(lines[i].startsWith("[") && lines[i].endsWith("]"))
{
String line = lines[i].substring(1, lines[i].length()-1);
DrawingUtil.drawOutlinedString(g2d, 60 + 20 + STROKE_OFFSET + (W - 150 - STROKE_WIDTH)/2 - fontMetrics.stringWidth(line)/2, TOPBAR_HEIGHT + STROKE_OFFSET + 40 + i*30, line, Color.WHITE, Color.BLACK, 2);
}
else
DrawingUtil.drawOutlinedString(g2d, 60 + 20 + STROKE_OFFSET, TOPBAR_HEIGHT + STROKE_OFFSET + 40 + i*30, lines[i], Color.WHITE, Color.BLACK, 2);
}
}
@Override
public void redrawRegionlost(RenderPanel renderer) {
}
@Override
public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) {
}
}

View File

@@ -1,4 +1,4 @@
package com.flaremicro.visualforecast.displays;
package com.flaremicro.visualforecast.displays.impl;
import java.awt.Color;
import java.awt.Font;
@@ -7,6 +7,7 @@ import java.awt.Rectangle;
import com.flaremicro.visualforecast.RenderPanel;
import com.flaremicro.visualforecast.api.ForecastProvider;
import com.flaremicro.visualforecast.displays.Display;
import com.flaremicro.visualforecast.graphics.DrawingUtil;
import com.flaremicro.visualforecast.graphics.FontManager;
import com.flaremicro.visualforecast.graphics.RenderConstants;
@@ -64,7 +65,7 @@ public class BootupDisplay implements Display {
IconProvider.drawIcon(g2d, IconProvider.INDEXED_ICONS[i], x, y, 80, iconTicks);
}
g2d.setFont(font.deriveFont(40F));
DrawingUtil.drawOutlinedString(g2d, RenderConstants.W / 2 - g2d.getFontMetrics().stringWidth("VisualForecast 1000") / 2, RenderConstants.H / 2, "VisualForecast 1000", Color.WHITE, Color.BLACK, 2);
//DrawingUtil.drawOutlinedString(g2d, RenderConstants.W / 2 - g2d.getFontMetrics().stringWidth("VisualForecast 1000") / 2, RenderConstants.H / 2, "VisualForecast 1000", Color.WHITE, Color.BLACK, 2);
}
else if (this.ticks > 90)
{
@@ -102,4 +103,9 @@ public class BootupDisplay implements Display {
this.forecastReady = provider.isForecastReady();
}
}
@Override
public String getDisplayName() {
return "bootup";
}
}

View File

@@ -1,4 +1,4 @@
package com.flaremicro.visualforecast.displays;
package com.flaremicro.visualforecast.displays.impl;
import java.awt.Color;
import java.awt.Font;
@@ -10,6 +10,7 @@ import java.util.ArrayList;
import com.flaremicro.visualforecast.RenderPanel;
import com.flaremicro.visualforecast.api.ForecastProvider;
import com.flaremicro.visualforecast.displays.Display;
import com.flaremicro.visualforecast.graphics.DrawingUtil;
import com.flaremicro.visualforecast.graphics.FontManager;
@@ -63,8 +64,8 @@ public class CurrentForecastDisplay implements Display {
String test = "*IMPORTANT NOTICE*\n*THIS BETA IS UNFINISHED*\n\nThis is a Beta version of the VisualForeast 1000! Many things are not finished, and only the hourly and 7 day forecasts are ready. There will be a lot more to come!\nPlease note that there are some issues with data collection from Environment Canada resulting in missing or potentially incorrect information around midnight hours. This will be fixed as the project continues and the disclaimer will be removed.";
ArrayList<String> linesList = new ArrayList<String>();
renderer.setCurrentForecast("Welcome to the");
renderer.setCurrentTown("VisualForecast 1000");
renderer.setCurrentForecast("Current Conditions");
renderer.setCurrentTown("TOWN NAME HERE");
BufferedImage disposableImage = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY);
Graphics2D g = disposableImage.createGraphics();
@@ -171,5 +172,9 @@ public class CurrentForecastDisplay implements Display {
@Override
public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) {
}
@Override
public String getDisplayName() {
return "current";
}
}

View File

@@ -1,4 +1,4 @@
package com.flaremicro.visualforecast.displays;
package com.flaremicro.visualforecast.displays.impl;
import static com.flaremicro.visualforecast.graphics.RenderConstants.BG_BLUE;
import static com.flaremicro.visualforecast.graphics.RenderConstants.MAINBAR_HEIGHT;
@@ -9,18 +9,13 @@ import java.awt.Font;
import java.awt.FontMetrics;
import java.awt.GradientPaint;
import java.awt.Graphics2D;
import java.awt.Polygon;
import java.awt.Rectangle;
import java.awt.Transparency;
import java.awt.image.BufferedImage;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Locale;
import com.flaremicro.visualforecast.RenderPanel;
import com.flaremicro.visualforecast.api.ForecastProvider;
import com.flaremicro.visualforecast.forecast.DayForecast;
import com.flaremicro.visualforecast.displays.Display;
import com.flaremicro.visualforecast.forecast.ForecastDetails;
import com.flaremicro.visualforecast.forecast.HourlyForecast;
import com.flaremicro.visualforecast.forecast.TownForecast;
@@ -70,7 +65,7 @@ public class HourlyForecastDisplay implements Display {
}
this.currentTown = details.getTownForecast()[townIndex];
}
while (this.currentTown == null || currentTown.getHourlyForecast() == null || currentTown.getHourlyForecast().length == 0);
while (this.currentTown == null || !currentTown.isDisplaySupported(this.getDisplayName()) || currentTown.getHourlyForecast() == null || currentTown.getHourlyForecast().length == 0);
renderer.setCurrentTown(currentTown.getTownName());
setGraphValues(currentTown);
renderer.requestFullRepaint();
@@ -346,4 +341,9 @@ public class HourlyForecastDisplay implements Display {
public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) {
}
@Override
public String getDisplayName() {
return "hourly";
}
}

View File

@@ -1,4 +1,4 @@
package com.flaremicro.visualforecast.displays;
package com.flaremicro.visualforecast.displays.impl;
import java.awt.Color;
import java.awt.Font;
@@ -10,6 +10,7 @@ import java.util.ArrayList;
import com.flaremicro.visualforecast.RenderPanel;
import com.flaremicro.visualforecast.api.ForecastProvider;
import com.flaremicro.visualforecast.displays.Display;
import com.flaremicro.visualforecast.graphics.DrawingUtil;
import com.flaremicro.visualforecast.graphics.FontManager;
@@ -171,5 +172,9 @@ public class MessageForecastDisplay implements Display {
@Override
public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) {
}
@Override
public String getDisplayName() {
return "message";
}
}

View File

@@ -1,4 +1,4 @@
package com.flaremicro.visualforecast.displays;
package com.flaremicro.visualforecast.displays.impl;
import static com.flaremicro.visualforecast.graphics.RenderConstants.MAINBAR_HEIGHT;
@@ -16,6 +16,7 @@ import java.util.Locale;
import com.flaremicro.visualforecast.RenderPanel;
import com.flaremicro.visualforecast.api.ForecastProvider;
import com.flaremicro.visualforecast.displays.Display;
import com.flaremicro.visualforecast.forecast.DayForecast;
import com.flaremicro.visualforecast.forecast.ForecastDetails;
import com.flaremicro.visualforecast.forecast.TownForecast;
@@ -25,7 +26,7 @@ import com.flaremicro.visualforecast.graphics.FontManager;
import com.flaremicro.visualforecast.graphics.RenderConstants;
import com.flaremicro.visualforecast.icons.IconProvider;
public class DayForecastDisplay implements Display {
public class SevenDayForecastDisplay implements Display {
private int dayOffset = 0;
private Font font;
private Font smallFont;
@@ -40,14 +41,19 @@ public class DayForecastDisplay implements Display {
private int ticksBeforeChange = 200;
private int animationTicks = -1;
public DayForecastDisplay() {
public SevenDayForecastDisplay() {
font = FontManager.getInstance().getOrCreateFont(Font.TRUETYPE_FONT, this.getClass().getResource("/Star4000.ttf"));
smallFont = FontManager.getInstance().getOrCreateFont(Font.TRUETYPE_FONT, this.getClass().getResource("/Star4000 Small.ttf"));
}
//TODO improve
@Override
public void tick(RenderPanel renderer, long ticks, int iconTicks) {
if (animationTicks >= 0)
if(details == null || details.getTownForecast() == null){
renderer.nextDisplay();
return;
}
else if (animationTicks >= 0)
{
animationTicks += 8;
if (animationTicks > RenderConstants.W - 60)
@@ -70,19 +76,23 @@ public class DayForecastDisplay implements Display {
dayOffset = dayOffset + 4;
if (dayOffset >= 8)
{
dayOffset = 0;
townIndex++;
if (townIndex >= details.getTownForecast().length)
do
{
renderer.nextDisplay();
return;
}
else
{
previousTown = currentTown;
currentTown = details.getTownForecast()[townIndex];
renderer.setCurrentTown(currentTown.getTownName());
dayOffset = 0;
townIndex++;
if (townIndex >= details.getTownForecast().length)
{
renderer.nextDisplay();
return;
}
else
{
previousTown = currentTown;
currentTown = details.getTownForecast()[townIndex];
renderer.setCurrentTown(currentTown.getTownName());
}
}
while (this.currentTown != null && !this.currentTown.isDisplaySupported(this.getDisplayName()));
}
animationTicks = 0;
@@ -225,7 +235,7 @@ public class DayForecastDisplay implements Display {
g2d.setFont(smallFont.deriveFont(24F));
DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + (131 * i) + 20, RenderConstants.TOPBAR_HEIGHT + 270, "Hi", Color.RED, Color.BLACK, 2);
}
if (!ValueCheck.valueNoData(forecast.loTemp))
{
g2d.setFont(font.deriveFont(26F));
@@ -296,4 +306,9 @@ public class DayForecastDisplay implements Display {
public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) {
}
@Override
public String getDisplayName() {
return "7-day";
}
}

View File

@@ -1,4 +1,4 @@
package com.flaremicro.visualforecast.displays;
package com.flaremicro.visualforecast.displays.impl;
import static com.flaremicro.visualforecast.graphics.RenderConstants.MAINBAR_HEIGHT;
@@ -16,6 +16,7 @@ import java.util.Locale;
import com.flaremicro.visualforecast.RenderPanel;
import com.flaremicro.visualforecast.api.ForecastProvider;
import com.flaremicro.visualforecast.displays.Display;
import com.flaremicro.visualforecast.forecast.DayForecast;
import com.flaremicro.visualforecast.forecast.ForecastDetails;
import com.flaremicro.visualforecast.forecast.TownForecast;
@@ -25,7 +26,7 @@ import com.flaremicro.visualforecast.graphics.FontManager;
import com.flaremicro.visualforecast.graphics.RenderConstants;
import com.flaremicro.visualforecast.icons.IconProvider;
public class DayForecastDisplayOldAnimation implements Display {
public class SevenDayForecastDisplayOldAnimation implements Display {
private int dayOffset = 0;
private Font font;
private Font smallFont;
@@ -39,7 +40,7 @@ public class DayForecastDisplayOldAnimation implements Display {
private int ticksBeforeChange = 200;
private int animationTicks = -1;
public DayForecastDisplayOldAnimation() {
public SevenDayForecastDisplayOldAnimation() {
font = FontManager.getInstance().getOrCreateFont(Font.TRUETYPE_FONT, this.getClass().getResource("/Star4000.ttf"));
smallFont = FontManager.getInstance().getOrCreateFont(Font.TRUETYPE_FONT, this.getClass().getResource("/Star4000 Small.ttf"));
}
@@ -263,4 +264,9 @@ public class DayForecastDisplayOldAnimation implements Display {
@Override
public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) {
}
@Override
public String getDisplayName() {
return "7-day-old";
}
}