Merge pull request #57 from usgs/release-2.6.0

Release 2.6.0
usgs · Feb 6, 2017 · 8670921 · 8670921
2 parents a34444c + 46aea6e
commit 8670921
Show file tree

Hide file tree

Showing 71 changed files with 7,193 additions and 5,871 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,7 @@
 /target/
 /classes/
 src/main/java/gov/usgs/volcanoes/swarm/Version.java
+/.DS_Store
+/dependency-reduced-pom.xml
+/Swarm.config
+/Swarm.config.bak
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,3 +1,11 @@
+## Version 2.6.0
+  * Add option to plot hypocenters from NEIC summary files on map
+  * Add event inspector dialog
+  * Expand maximum time span of inset wave window
+  * Quote command line args before passing them to java
+  * Fix wave close buttons
+  * Fix kisok enter/exit keys
+
 ## Version 2.5.2
   * Remove obsoleted DefaultMetadata Class.
 

diff --git a/RsamDefaults.config b/RsamDefaults.config
@@ -0,0 +1,30 @@
+default.autoScale=true
+
+default.binSize=Hour
+
+default.countsPeriod=10
+
+default.detrend=false
+
+default.eventMaxLength=300.0
+
+default.eventRatio=1.3
+
+default.eventThreshold=50.0
+
+default.runningMean=false
+
+default.runningMeanPeriod=300.0
+
+default.runningMedian=false
+
+default.runningMedianPeriod=300.0
+
+default.scaleMax=100.0
+
+default.scaleMin=0.0
+
+default.valuesPeriod=600
+
+default.viewType=VALUES
+