From 8080923c82365ee3857118fd631567edbb800f70 Mon Sep 17 00:00:00 2001 From: darmbrust Date: Tue, 14 Jan 2020 17:46:24 -0600 Subject: [PATCH 1/4] [gitflow]Update for next development version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 228abe9..a524adb 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ net.sagebits.weatherlink weatherlink - 1.03 + 1.04 jar WeatherLink Logger and GUI From f3c5e67dc8ddf75ae0d58e39b0dfb8a6ca333bc1 Mon Sep 17 00:00:00 2001 From: darmbrust Date: Tue, 14 Jan 2020 17:47:33 -0600 Subject: [PATCH 2/4] update after release --- README.md | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/README.md b/README.md index 1e874e3..28104ea 100644 --- a/README.md +++ b/README.md @@ -33,7 +33,6 @@ Feel free to open open trackers here. #TODOs There are lots of TODOs.... useful things I may add (pull requests welcome) - - Fix the menus - Add options for exporting data to TSV/CSV - Add config options for some string constants that are currently hardcoded (like "garage" - Add the ability to enable/disable gauges, and change their order @@ -41,9 +40,8 @@ There are lots of TODOs.... useful things I may add (pull requests welcome) - Package the app as a self-contained JavaFX application - Push data to user-configured upstream stores like CWOP. - # Release Notes ``` -mvn -B gitflow:release-start gitflow:release-finish -DreleaseVersion=1.03 -DdevelopmentVersion=1.04 +mvn -B gitflow:release-start gitflow:release-finish -DreleaseVersion=1.04 -DdevelopmentVersion=1.05 ``` From 77513d4995094badf0f0e92a68a45d3a8c2707f6 Mon Sep 17 00:00:00 2001 From: darmbrust Date: Tue, 14 Jan 2020 17:54:17 -0600 Subject: [PATCH 3/4] turn off h2 trace file --- .../net/sagebits/weatherlink/data/periodic/PeriodicData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/sagebits/weatherlink/data/periodic/PeriodicData.java b/src/main/java/net/sagebits/weatherlink/data/periodic/PeriodicData.java index e75f792..bb3d49d 100644 --- a/src/main/java/net/sagebits/weatherlink/data/periodic/PeriodicData.java +++ b/src/main/java/net/sagebits/weatherlink/data/periodic/PeriodicData.java @@ -47,7 +47,7 @@ private PeriodicData() throws SQLException File dbFile = new File(homeFolder, "weatherLinkData"); log.info("Data folder: {}", dbFile.getAbsoluteFile().toString()); - db = DriverManager.getConnection("jdbc:h2:" + dbFile.getAbsolutePath(), "sa", ""); + db = DriverManager.getConnection("jdbc:h2:" + dbFile.getAbsolutePath() + ";TRACE_LEVEL_FILE=0", "sa", ""); //One table for each of the data structures it returns. db.prepareStatement("CREATE TABLE IF NOT EXISTS iss (" From 8298f389a446cf61e0d5825309c2a91287a395da Mon Sep 17 00:00:00 2001 From: darmbrust Date: Sat, 18 Jan 2020 09:21:28 -0600 Subject: [PATCH 4/4] fix issue with calculation of the range on the temp gauges --- .../weatherlink/gui/WeatherLinkLiveGUIController.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUIController.java b/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUIController.java index d4817d1..02201be 100644 --- a/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUIController.java +++ b/src/main/java/net/sagebits/weatherlink/gui/WeatherLinkLiveGUIController.java @@ -714,7 +714,7 @@ private Gauge buildTempGauge(String wllDeviceId, String sensorId, String title, double current = temp.asDouble().get(); return Math.round(Math.max( Math.max((heatIndexM == null ? current : heatIndexM.getValue()), (tempHeatWindM == null ? current : tempHeatWindM.getValue())), - Math.min(110.0, current + 20.0))); + Math.min(110.0, Math.max(current, mMax.getValue()) + 20.0))); }; //The lowest the guage needs to go @@ -723,7 +723,7 @@ private Gauge buildTempGauge(String wllDeviceId, String sensorId, String title, double current = temp.asDouble().get(); return Math.round(Math.min( Math.min((dewPointM == null ? current : dewPointM.getValue()),(windChillM == null ? current : windChillM.getValue())), - Math.max(-40.0, current - 20.0))); + Math.max(-40.0, Math.min(current, mMin.getValue()) - 20.0))); }; gauge.setMinValue(minCalc.getAsDouble());