Merge branch 'release/1.04'

README.md

@@ -33,17 +33,15 @@ 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
  - Add the ability to generate graphs from historical data with user specified options
  - 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
 
 ```

pom.xml

@@ -4,7 +4,7 @@
 
 	<groupId>net.sagebits.weatherlink</groupId>
 	<artifactId>weatherlink</artifactId>
-	<version>1.03</version>
+	<version>1.04</version>
 	<packaging>jar</packaging>
 
 	<name>WeatherLink Logger and GUI</name>

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 (" 

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());