From 107f83084e4f8d435c107593732da2fbc8e2fab2 Mon Sep 17 00:00:00 2001 From: Flare Microsystems Date: Thu, 7 Mar 2024 16:27:21 -0800 Subject: [PATCH] crawl --- CanadaDatamartProvider.jar | Bin 12993 -> 13264 bytes CanadaDatamartProvider.properties | 2 +- EnvironmentCanadaProvider.properties | 4 - crawl.txt | 1 + .../visualforecast/RenderPanel.java | 116 +++++++++++++++--- .../displays/DayForecastDisplay.java | 12 +- vf1000.properties | 4 +- 7 files changed, 114 insertions(+), 25 deletions(-) delete mode 100644 EnvironmentCanadaProvider.properties create mode 100644 crawl.txt diff --git a/CanadaDatamartProvider.jar b/CanadaDatamartProvider.jar index 76803c581cdd0c654bb0a10628e5c7d2602ee917..b4a6838e8d30349d3ee8e8afa1092d21b43ec0b0 100644 GIT binary patch delta 6033 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 YjmUjQj&S~)f_M-a0!-LJkbidhAM{#;;s5{u delta 5729 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 q{Xa}M_&@OCKVNe=|4Y~ 0 && this.crawlPosition + this.currentCrawlStringWidth <= 0) + { + stringIndex = ((stringIndex + 1) % this.crawlStrings.length); + this.currentCrawlString = this.crawlStrings[stringIndex]; + this.crawlPosition = W; + Graphics g = this.getGraphics(); + this.currentCrawlStringWidth = g.getFontMetrics(font.deriveFont(26F)).stringWidth(currentCrawlString); + g.dispose(); + } + else if (this.currentCrawlString != null) + { + this.crawlPosition-=2; + repaint(0, this.crawlBound.x, this.crawlBound.y, this.crawlBound.width, this.crawlBound.height); + } } public BufferedImage getSnapshot() { @@ -199,6 +253,10 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener { public void loseRedrawRegion() { this.redrawBound = null; addRedrawBound(W - TIMEBAR_WIDTH + TIMEBAR_OFFSET, TIMEBAR_Y, TIMEBAR_WIDTH, TIMEBAR_HEIGHT, false); + float wScale = getWidth() / (float) W; + float hScale = getHeight() / (float) H; + this.crawlBound = new Rectangle((int) 0, (int) ((H - INFOBAR_HEIGHT + 8) * hScale), (int) (W * wScale), (int) (30 * hScale)); + if (this.currentFlavour != null) this.currentFlavour.redrawRegionlost(this); } @@ -225,9 +283,8 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener { this.forecastProvider = forecastProvider; this.currentFlavour.notifyForecastProviderUpdate(this, forecastProvider); } - - public void notifyForecastProviderUpdate() - { + + public void notifyForecastProviderUpdate() { this.currentFlavour.notifyForecastProviderUpdate(this, forecastProvider); } @@ -262,6 +319,33 @@ public class RenderPanel extends JPanel implements Tickable, ComponentListener { repaint(exclusiveRedrawBound); } + private void loadCrawlStrings() { + File crawl = new File("./crawl.txt"); + ArrayList strings = new ArrayList(); + if (crawl != null) + { + BufferedReader br = null; + try + { + br = new BufferedReader(new FileReader(crawl)); + String line; + while ((line = br.readLine()) != null) + { + strings.add(line); + } + } + catch (IOException e) + { + e.printStackTrace(); + } + finally + { + Util.cleanClose(br); + } + } + this.crawlStrings = strings.toArray(new String[strings.size()]); + } + /*@Override public void run() { while (true) diff --git a/src/com/flaremicro/visualforecast/displays/DayForecastDisplay.java b/src/com/flaremicro/visualforecast/displays/DayForecastDisplay.java index 92413e6..a4e8614 100644 --- a/src/com/flaremicro/visualforecast/displays/DayForecastDisplay.java +++ b/src/com/flaremicro/visualforecast/displays/DayForecastDisplay.java @@ -217,13 +217,21 @@ public class DayForecastDisplay implements Display { DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + (131 * i) + (127 / 2) - (metrics.stringWidth(statLine1) / 2), RenderConstants.TOPBAR_HEIGHT + 170, statLine1, Color.WHITE, Color.BLACK, 2); DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + (131 * i) + (127 / 2) - (metrics.stringWidth(statLine2) / 2), RenderConstants.TOPBAR_HEIGHT + 200, statLine2, Color.WHITE, Color.BLACK, 2); - if (!ValueCheck.valueNoData(forecast.hiTemp) && !ValueCheck.valueNoData(forecast.loTemp)) + if (!ValueCheck.valueNoData(forecast.hiTemp)) { + g2d.setFont(font.deriveFont(26F)); DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + (131 * i) + 30 - (metrics.stringWidth(String.valueOf(forecast.hiTemp)) >> 1), RenderConstants.TOPBAR_HEIGHT + 295, String.valueOf(forecast.hiTemp), Color.WHITE, Color.BLACK, 2); - DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + (131 * i) + 92 - (metrics.stringWidth(String.valueOf(forecast.loTemp)) >> 1), RenderConstants.TOPBAR_HEIGHT + 295, String.valueOf(forecast.loTemp), Color.WHITE, Color.BLACK, 2); 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)); + DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + (131 * i) + 92 - (metrics.stringWidth(String.valueOf(forecast.loTemp)) >> 1), RenderConstants.TOPBAR_HEIGHT + 295, String.valueOf(forecast.loTemp), Color.WHITE, Color.BLACK, 2); + + g2d.setFont(smallFont.deriveFont(24F)); DrawingUtil.drawOutlinedString(g2d, RenderConstants.SIDE_OFFSET + (131 * i) + 82, RenderConstants.TOPBAR_HEIGHT + 270, "Lo", Color.CYAN, Color.BLACK, 2); } diff --git a/vf1000.properties b/vf1000.properties index b1a623c..871d714 100644 --- a/vf1000.properties +++ b/vf1000.properties @@ -1,3 +1,3 @@ #VisualForecast 1000 Properties file. Functional provider must be set for successful boot! -#Thu Mar 07 14:12:28 PST 2024 -forecast-provider-jar=EnvironmentCanadaProvider.jar +#Thu Mar 07 16:27:03 PST 2024 +forecast-provider-jar=CanadaDatamartProvider.jar