From 0b4ca18c69e97760ca0ffe575fa9e4b230c1a1f3 Mon Sep 17 00:00:00 2001 From: Flare Microsystems Date: Fri, 15 Mar 2024 23:45:35 -0700 Subject: [PATCH] Added hourly forecast and message forecast --- CanadaDatamartProvider.jar | Bin 13652 -> 15055 bytes CanadaDatamartProvider.properties | 4 +- .../visualforecast/RenderPanel.java | 14 +- .../visualforecast/VisualForecastFrame.java | 31 +++- .../displays/CurrentForecastDisplay.java | 175 ++++++++++++++++++ .../displays/DisplayFactory.java | 32 ++++ .../displays/HourlyForecastDisplay.java | 56 ++++-- .../displays/MessageForecastDisplay.java | 175 ++++++++++++++++++ .../displays/ThirtySixHourDisplay.java | 155 ++++++++++++++++ .../forecast/HourlyForecast.java | 6 +- .../visualforecast/forecast/TownForecast.java | 22 +++ vf1000.properties | 4 +- 12 files changed, 646 insertions(+), 28 deletions(-) create mode 100644 src/com/flaremicro/visualforecast/displays/CurrentForecastDisplay.java create mode 100644 src/com/flaremicro/visualforecast/displays/DisplayFactory.java create mode 100644 src/com/flaremicro/visualforecast/displays/MessageForecastDisplay.java create mode 100644 src/com/flaremicro/visualforecast/displays/ThirtySixHourDisplay.java diff --git a/CanadaDatamartProvider.jar b/CanadaDatamartProvider.jar index d793fc99b48603e972a88440a22fc2738abe9147..2c9f0d6b59d4a80b10f52312a97ee349427e5e79 100644 GIT binary patch delta 10813 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 diff --git a/CanadaDatamartProvider.properties b/CanadaDatamartProvider.properties index 21f75b6..d0ca5fa 100644 --- a/CanadaDatamartProvider.properties +++ b/CanadaDatamartProvider.properties @@ -1,4 +1,4 @@ #VisualForecast 1000 Properties file. Functional provider must be set for successful boot! -#Fri Mar 08 16:38:56 PST 2024 +#Fri Mar 15 19:46:22 PDT 2024 towns-by-code= -towns-by-name-and-province=Duncan,BC;Halifax,NS;Courtenay,BC;Comox,BC +towns-by-name-and-province=Vancouver,BC;Victora,BC;Kelowna,BC;Nanaimo,BC;Squamish,BC;Prince George,BC;Prince Rupert,BC diff --git a/src/com/flaremicro/visualforecast/RenderPanel.java b/src/com/flaremicro/visualforecast/RenderPanel.java index 3834f14..934bf69 100644 --- a/src/com/flaremicro/visualforecast/RenderPanel.java +++ b/src/com/flaremicro/visualforecast/RenderPanel.java @@ -14,7 +14,6 @@ import java.awt.image.BufferedImage; import java.awt.image.VolatileImage; import java.io.BufferedReader; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; import java.util.ArrayList; @@ -29,7 +28,9 @@ import com.flaremicro.visualforecast.api.ForecastProvider; import com.flaremicro.visualforecast.displays.BootupDisplay; import com.flaremicro.visualforecast.displays.DayForecastDisplay; import com.flaremicro.visualforecast.displays.Display; +import com.flaremicro.visualforecast.displays.DisplayFactory; import com.flaremicro.visualforecast.displays.HourlyForecastDisplay; +import com.flaremicro.visualforecast.displays.ThirtySixHourDisplay; import com.flaremicro.visualforecast.forecast.ForecastDetails; import com.flaremicro.visualforecast.graphics.DrawingUtil; import com.flaremicro.visualforecast.graphics.FontManager; @@ -69,6 +70,8 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener { private int crawlPosition = 0; private int stringIndex = -1; private int currentCrawlStringWidth = 0; + + DisplayFactory displayFactory; public RenderPanel(PropertyManager propManager) { loadCrawlStrings(); @@ -77,6 +80,7 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener { this.propManager = propManager; font = FontManager.getInstance().getOrCreateFont(Font.TRUETYPE_FONT, this.getClass().getResource("/Star4000.ttf")); currentFlavour.initDisplay(this, null, ticks, iconAnimationTicks); + displayFactory = new DisplayFactory(propManager); //new Thread(new TickThread(this, 30)).start(); } @@ -301,7 +305,13 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener { } public void nextDisplay() { - this.currentFlavour = new HourlyForecastDisplay(); + /*if(this.currentFlavour instanceof DayForecastDisplay) + this.currentFlavour = new HourlyForecastDisplay(); + else + this.currentFlavour = new DayForecastDisplay();*/ + this.currentFlavour = displayFactory.nextDisplay(); + /*this.currentFlavour = new ThirtySixHourDisplay(); + */ this.currentFlavour.initDisplay(this, forecastProvider, ticks, iconAnimationTicks); this.loseRedrawRegion(); this.requestFullRepaint(); diff --git a/src/com/flaremicro/visualforecast/VisualForecastFrame.java b/src/com/flaremicro/visualforecast/VisualForecastFrame.java index b2bd384..68092f5 100644 --- a/src/com/flaremicro/visualforecast/VisualForecastFrame.java +++ b/src/com/flaremicro/visualforecast/VisualForecastFrame.java @@ -1,7 +1,8 @@ package com.flaremicro.visualforecast; -import java.awt.BorderLayout; import java.awt.EventQueue; +import java.awt.GraphicsDevice; +import java.awt.GraphicsEnvironment; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.event.KeyEvent; @@ -9,10 +10,13 @@ import java.awt.event.KeyListener; import java.awt.event.WindowEvent; import java.awt.event.WindowListener; import java.io.File; +import java.util.Map; import javax.swing.JFrame; +import javax.swing.JOptionPane; import javax.swing.Timer; +import com.flaremicro.util.Util; import com.flaremicro.visualforecast.api.ForecastProvider; import com.flaremicro.visualforecast.api.ForecastProviderManager; @@ -34,6 +38,7 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi * Launch the application. */ public static void main(String[] args) { + final Map arguments = Util.parseArgs(args, true); EventQueue.invokeLater(new Runnable() { public void run() { try @@ -41,6 +46,29 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi VisualForecastFrame frame = new VisualForecastFrame(); frame.setVisible(true); frame.init(); + + if (arguments.containsKey("fullscreen")) + { + try + { + + int index = Integer.parseInt(arguments.get("fullscreen")); + + GraphicsDevice[] devices = GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices(); + if(index < 0 || devices.length < index) + { + JOptionPane.showMessageDialog(frame, arguments.get("fullscreen") + " does not exist as a screen index"); + } + else + { + devices[index].setFullScreenWindow(frame); + } + } + catch (NumberFormatException ex) + { + JOptionPane.showMessageDialog(frame, arguments.get("fullscreen") + " is not a valid screen index"); + } + } //GraphicsEnvironment.getLocalGraphicsEnvironment().getScreenDevices()[1].setFullScreenWindow(frame); //frame.createBufferStrategy(2); } @@ -74,7 +102,6 @@ public class VisualForecastFrame extends JFrame implements WindowListener, KeyLi } }); timer.start(); - new Thread() { public void run() { diff --git a/src/com/flaremicro/visualforecast/displays/CurrentForecastDisplay.java b/src/com/flaremicro/visualforecast/displays/CurrentForecastDisplay.java new file mode 100644 index 0000000..7dd42cd --- /dev/null +++ b/src/com/flaremicro/visualforecast/displays/CurrentForecastDisplay.java @@ -0,0 +1,175 @@ +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 CurrentForecastDisplay implements Display { + + private String[] lines = new String[0]; + private Font font; + + private int stringOffset = 0; + private int ticksBeforeChange = 0; + + public CurrentForecastDisplay() { + 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) { + ticksBeforeChange--; + if (ticksBeforeChange <= 0) + { + stringOffset += 9; + if (stringOffset < lines.length) + { + ticksBeforeChange = 200; + renderer.requestExclusiveBoundedRepaint(); + } + else + { + renderer.nextDisplay(); + } + } + } + + @Override + public void initDisplay(RenderPanel renderer, ForecastProvider forecastProvider, long ticks, int iconTicks) { + ticksBeforeChange = 200; + stringOffset = 0; + 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 linesList = new ArrayList(); + + renderer.setCurrentForecast("Welcome to the"); + renderer.setCurrentTown("VisualForecast 1000"); + + BufferedImage disposableImage = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY); + Graphics2D g = disposableImage.createGraphics(); + FontMetrics f = g.getFontMetrics(font); + 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(); + + redrawRegionlost(renderer); + + this.lines = linesList.toArray(new String[0]); + } + + private void splitText(String text, int maxWidth, FontMetrics fontMetrics, ArrayList 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.darker(), BG_BLUE.brighter()); + g2d.setFont(font); + FontMetrics fontMetrics = g2d.getFontMetrics(); + g2d.setColor(BG_BLUE.darker()); + g2d.drawRect(60 + STROKE_OFFSET, TOPBAR_HEIGHT + STROKE_OFFSET, W - 120 - STROKE_WIDTH, MAINBAR_HEIGHT - STROKE_WIDTH); + for (int i = 0; i < Math.min(9, lines.length - this.stringOffset); i++) + { + if (lines[i + stringOffset].startsWith("*") && lines[i].endsWith("*")) + { + String line = lines[i + stringOffset].substring(1, lines[i + stringOffset].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 + stringOffset].startsWith("[") && lines[i].endsWith("]")) + { + String line = lines[i + stringOffset].substring(1, lines[i + stringOffset].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 + stringOffset], Color.WHITE, Color.BLACK, 2); + } + } + + @Override + public void redrawRegionlost(RenderPanel renderer) { + renderer.addRedrawBound(TOPBAR_HEIGHT, W - 120, MAINBAR_HEIGHT, 20); + } + + @Override + public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) { + } + +} diff --git a/src/com/flaremicro/visualforecast/displays/DisplayFactory.java b/src/com/flaremicro/visualforecast/displays/DisplayFactory.java new file mode 100644 index 0000000..2ae42fc --- /dev/null +++ b/src/com/flaremicro/visualforecast/displays/DisplayFactory.java @@ -0,0 +1,32 @@ +package com.flaremicro.visualforecast.displays; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import com.flaremicro.visualforecast.PropertyManager; + +public class DisplayFactory { + int currentIndex = -1; + String indexValue = ""; + + private List nameOrder = new ArrayList(); + private Map displays = new HashMap(); + + 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 Display nextDisplay() { + currentIndex = (currentIndex + 1) % nameOrder.size(); + return displays.get(nameOrder.get(currentIndex)); + } + +} diff --git a/src/com/flaremicro/visualforecast/displays/HourlyForecastDisplay.java b/src/com/flaremicro/visualforecast/displays/HourlyForecastDisplay.java index 0685e38..7e9a18d 100644 --- a/src/com/flaremicro/visualforecast/displays/HourlyForecastDisplay.java +++ b/src/com/flaremicro/visualforecast/displays/HourlyForecastDisplay.java @@ -31,7 +31,6 @@ import com.flaremicro.visualforecast.graphics.RenderConstants; import com.flaremicro.visualforecast.icons.IconProvider; public class HourlyForecastDisplay implements Display { - private int dayOffset = 0; private Font font; private Font smallFont; private ForecastDetails details; @@ -41,7 +40,7 @@ public class HourlyForecastDisplay implements Display { private int ticksBeforeChange = 200; private int animationTicks = -1; - private byte[] dewval = null; + private byte[] windchill = null; private byte[] tempval = null; private float[] percipval = null; @@ -56,7 +55,26 @@ public class HourlyForecastDisplay implements Display { @Override public void tick(RenderPanel renderer, long ticks, int iconTicks) { + ticksBeforeChange--; + if (ticksBeforeChange <= 0) + { + ticksBeforeChange = 200; + do + { + townIndex++; + if (details == null || townIndex >= details.getTownForecast().length) + { + renderer.nextDisplay(); + return; + } + this.currentTown = details.getTownForecast()[townIndex]; + } + while (this.currentTown == null || currentTown.getHourlyForecast() == null || currentTown.getHourlyForecast().length == 0); + renderer.setCurrentTown(currentTown.getTownName()); + setGraphValues(currentTown); + renderer.requestFullRepaint(); + } } public void setGraphValues(TownForecast town) { @@ -66,12 +84,12 @@ public class HourlyForecastDisplay implements Display { if (forecast != null && forecast.length > 0) { int size = Math.min(12, forecast.length); - dewval = new byte[size]; + windchill = new byte[size]; tempval = new byte[size]; percipval = new float[size]; for (int i = 0; i < size; i++) { - dewval[i] = forecast[i].dewPoint; + windchill[i] = forecast[i].windChill; tempval[i] = forecast[i].temp; percipval[i] = forecast[i].percip; } @@ -133,15 +151,17 @@ public class HourlyForecastDisplay implements Display { FontMetrics fm = g2d.getFontMetrics(); DrawingUtil.drawOutlinedString(g2d, 100, RenderConstants.TOPBAR_HEIGHT + 35, "Temperature\u00B0c", Color.RED, Color.BLACK, 2); - DrawingUtil.drawOutlinedString(g2d, 260, RenderConstants.TOPBAR_HEIGHT + 35, "Dew point\u00B0c", Color.WHITE, Color.BLACK, 2); + DrawingUtil.drawOutlinedString(g2d, 260, RenderConstants.TOPBAR_HEIGHT + 35, "Wind Chill\u00B0c", Color.WHITE, Color.BLACK, 2); DrawingUtil.drawOutlinedString(g2d, 410, RenderConstants.TOPBAR_HEIGHT + 35, "Precipitation%", Color.CYAN, Color.BLACK, 2); + g2d.setFont(font.deriveFont(20F)); String minText = min + "\u00B0"; String maxText = max + "\u00B0"; - DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + 40 - fm.stringWidth(maxText), RenderConstants.TOPBAR_HEIGHT + 53, maxText, Color.YELLOW, Color.BLACK, 2); - DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + 40 - fm.stringWidth(minText), RenderConstants.TOPBAR_HEIGHT + MAINBAR_HEIGHT - 92, minText, Color.YELLOW, Color.BLACK, 2); + DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + 38 - fm.stringWidth(maxText), RenderConstants.TOPBAR_HEIGHT + 53, maxText, Color.YELLOW, Color.BLACK, 2); + DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + 38 - fm.stringWidth(minText), RenderConstants.TOPBAR_HEIGHT + MAINBAR_HEIGHT - 92, minText, Color.YELLOW, Color.BLACK, 2); + g2d.setFont(font.deriveFont(20F)); g2d.setColor(RenderConstants.BG_ORANGE.darker()); g2d.drawLine(RenderConstants.SIDE_OFFSET + 40, (RenderConstants.TOPBAR_HEIGHT + 50), (RenderConstants.W - RenderConstants.SIDE_OFFSET - 20), (RenderConstants.TOPBAR_HEIGHT + 50)); @@ -150,6 +170,7 @@ public class HourlyForecastDisplay implements Display { //BlackLines + g2d.setFont(smallFont.deriveFont(20F)); if (max > 0 && min < 0) { int nextTemp = (RenderConstants.TOPBAR_HEIGHT + RenderConstants.MAINBAR_HEIGHT - 94) + (int) (((min) / (float) range) * (RenderConstants.MAINBAR_HEIGHT - 144)); @@ -166,10 +187,10 @@ public class HourlyForecastDisplay implements Display { g2d.translate(2, 2); g2d.setColor(Color.BLACK); - this.graphTemp(g2d, this.dewval, min, slotWidth, range, RenderConstants.MAINBAR_HEIGHT - 144); + this.graphTemp(g2d, this.windchill, min, slotWidth, range, RenderConstants.MAINBAR_HEIGHT - 144); g2d.setColor(Color.WHITE); g2d.translate(-2, -2); - this.graphTemp(g2d, this.dewval, min, slotWidth, range, RenderConstants.MAINBAR_HEIGHT - 144); + this.graphTemp(g2d, this.windchill, min, slotWidth, range, RenderConstants.MAINBAR_HEIGHT - 144); g2d.translate(2, 2); g2d.setColor(Color.BLACK); @@ -196,6 +217,7 @@ public class HourlyForecastDisplay implements Display { for (int i = 0; i < Math.min(12, forecast.length); i++) { String timeString = simpleDateFormat.format(forecast[i].hour); + timeString = timeString.substring(0, timeString.length() - 1); if ((i % 2) == 0) DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + 40 + slotWidth / 2 + (slotWidth * i) - fm.stringWidth(timeString) / 2, RenderConstants.TOPBAR_HEIGHT + MAINBAR_HEIGHT - 70, timeString, Color.YELLOW, Color.BLACK, 2); else DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + 40 + slotWidth / 2 + (slotWidth * i) - fm.stringWidth(timeString) / 2, RenderConstants.TOPBAR_HEIGHT + MAINBAR_HEIGHT - 60, timeString, Color.YELLOW, Color.BLACK, 2); @@ -210,13 +232,13 @@ public class HourlyForecastDisplay implements Display { for (int i = 0; i < forecast.length; i++) { int currMin; - if (ValueCheck.valueNoData(forecast[i].dewPoint) && ValueCheck.valueNoData(forecast[i].temp)) + if (ValueCheck.valueNoData(forecast[i].windChill) && ValueCheck.valueNoData(forecast[i].temp)) continue; - else if (ValueCheck.valueNoData(forecast[i].dewPoint)) + else if (ValueCheck.valueNoData(forecast[i].windChill)) currMin = forecast[i].temp; else if (ValueCheck.valueNoData(forecast[i].temp)) - currMin = forecast[i].dewPoint; - else currMin = Math.min(forecast[i].temp, forecast[i].dewPoint); + currMin = forecast[i].windChill; + else currMin = Math.min(forecast[i].temp, forecast[i].windChill); if (currMin < min) min = currMin; } @@ -228,13 +250,13 @@ public class HourlyForecastDisplay implements Display { for (int i = 0; i < forecast.length; i++) { int currMax; - if (ValueCheck.valueNoData(forecast[i].dewPoint) && ValueCheck.valueNoData(forecast[i].temp)) + if (ValueCheck.valueNoData(forecast[i].windChill) && ValueCheck.valueNoData(forecast[i].temp)) continue; - else if (ValueCheck.valueNoData(forecast[i].dewPoint)) + else if (ValueCheck.valueNoData(forecast[i].windChill)) currMax = forecast[i].temp; else if (ValueCheck.valueNoData(forecast[i].temp)) - currMax = forecast[i].dewPoint; - else currMax = Math.max(forecast[i].temp, forecast[i].dewPoint); + currMax = forecast[i].windChill; + else currMax = Math.max(forecast[i].temp, forecast[i].windChill); if (currMax > max) max = currMax; } diff --git a/src/com/flaremicro/visualforecast/displays/MessageForecastDisplay.java b/src/com/flaremicro/visualforecast/displays/MessageForecastDisplay.java new file mode 100644 index 0000000..8909c99 --- /dev/null +++ b/src/com/flaremicro/visualforecast/displays/MessageForecastDisplay.java @@ -0,0 +1,175 @@ +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 MessageForecastDisplay implements Display { + + private String[] lines = new String[0]; + private Font font; + + private int stringOffset = 0; + private int ticksBeforeChange = 0; + + public MessageForecastDisplay() { + 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) { + ticksBeforeChange--; + if (ticksBeforeChange <= 0) + { + stringOffset += 9; + if (stringOffset < lines.length) + { + ticksBeforeChange = 200; + renderer.requestExclusiveBoundedRepaint(); + } + else + { + renderer.nextDisplay(); + } + } + } + + @Override + public void initDisplay(RenderPanel renderer, ForecastProvider forecastProvider, long ticks, int iconTicks) { + ticksBeforeChange = 200; + stringOffset = 0; + 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 linesList = new ArrayList(); + + renderer.setCurrentForecast("Welcome to the"); + renderer.setCurrentTown("VisualForecast 1000"); + + BufferedImage disposableImage = new BufferedImage(1, 1, BufferedImage.TYPE_BYTE_GRAY); + Graphics2D g = disposableImage.createGraphics(); + FontMetrics f = g.getFontMetrics(font); + 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(); + + redrawRegionlost(renderer); + + this.lines = linesList.toArray(new String[0]); + } + + private void splitText(String text, int maxWidth, FontMetrics fontMetrics, ArrayList 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.darker(), BG_BLUE.brighter()); + g2d.setFont(font); + FontMetrics fontMetrics = g2d.getFontMetrics(); + g2d.setColor(BG_BLUE.darker()); + g2d.drawRect(60 + STROKE_OFFSET, TOPBAR_HEIGHT + STROKE_OFFSET, W - 120 - STROKE_WIDTH, MAINBAR_HEIGHT - STROKE_WIDTH); + for (int i = 0; i < Math.min(9, lines.length - this.stringOffset); i++) + { + if (lines[i + stringOffset].startsWith("*") && lines[i].endsWith("*")) + { + String line = lines[i + stringOffset].substring(1, lines[i + stringOffset].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 + stringOffset].startsWith("[") && lines[i].endsWith("]")) + { + String line = lines[i + stringOffset].substring(1, lines[i + stringOffset].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 + stringOffset], Color.WHITE, Color.BLACK, 2); + } + } + + @Override + public void redrawRegionlost(RenderPanel renderer) { + renderer.addRedrawBound(TOPBAR_HEIGHT, W - 120, MAINBAR_HEIGHT, 20); + } + + @Override + public void notifyForecastProviderUpdate(RenderPanel renderer, ForecastProvider forecastProvider) { + } + +} diff --git a/src/com/flaremicro/visualforecast/displays/ThirtySixHourDisplay.java b/src/com/flaremicro/visualforecast/displays/ThirtySixHourDisplay.java new file mode 100644 index 0000000..bd57794 --- /dev/null +++ b/src/com/flaremicro/visualforecast/displays/ThirtySixHourDisplay.java @@ -0,0 +1,155 @@ +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 linesList = new ArrayList(); + + 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 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) { + } + +} diff --git a/src/com/flaremicro/visualforecast/forecast/HourlyForecast.java b/src/com/flaremicro/visualforecast/forecast/HourlyForecast.java index 43f8f26..1f3c8ca 100644 --- a/src/com/flaremicro/visualforecast/forecast/HourlyForecast.java +++ b/src/com/flaremicro/visualforecast/forecast/HourlyForecast.java @@ -10,15 +10,15 @@ public class HourlyForecast { public final byte temp; public final short windSpeed; public final float percip; - public final byte dewPoint; + public final byte windChill; - public HourlyForecast(Date hour, byte iconId, byte temp, short windSpeed, float percip, byte dewPoint) + public HourlyForecast(Date hour, byte iconId, byte temp, short windSpeed, float percip, byte windChill) { this.hour = hour; this.iconId = (byte) (iconId % IconProvider.INDEXED_ICONS.length); this.temp = temp; this.windSpeed = windSpeed; this.percip = percip; - this.dewPoint = dewPoint; + this.windChill = windChill; } } diff --git a/src/com/flaremicro/visualforecast/forecast/TownForecast.java b/src/com/flaremicro/visualforecast/forecast/TownForecast.java index 49d31af..01adb88 100644 --- a/src/com/flaremicro/visualforecast/forecast/TownForecast.java +++ b/src/com/flaremicro/visualforecast/forecast/TownForecast.java @@ -1,5 +1,10 @@ package com.flaremicro.visualforecast.forecast; +import java.util.Arrays; +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + public class TownForecast { public TownForecast(String townName, DayForecast[] dayForecast) { this.townName = townName; @@ -8,7 +13,24 @@ public class TownForecast { private final String townName; private final DayForecast[] dayForecast; + private Set displays = new HashSet(); + + private HourlyForecast[] hourlyForecast; + + public boolean isDisplaySupported(String displayName) + { + return displays.size() == 0 || displays.contains(displayName); + } + + public void setSupportedDisplays(String ... displays){ + setSupportedDisplays(Arrays.asList(displays)); + } + + public void setSupportedDisplays(Collection displays){ + this.displays.clear(); + this.displays.addAll(displays); + } public void setHourlyForecast(HourlyForecast[] forecast) { this.hourlyForecast = forecast; diff --git a/vf1000.properties b/vf1000.properties index c509e50..a6c66df 100644 --- a/vf1000.properties +++ b/vf1000.properties @@ -1,3 +1,3 @@ #VisualForecast 1000 Properties file. Functional provider must be set for successful boot! -#Sat Mar 09 23:49:43 PST 2024 -forecast-provider-jar=MockForecastProvider.jar +#Fri Mar 15 19:46:22 PDT 2024 +forecast-provider-jar=CanadaDatamartProvider.jar