CCT 1.0.11 Release Notes

Features and changes:
Collapsed the envelope and common modules down into calibration and moved the envelope tool from a standalone app to a sub-application in the tool menu.
Updated the site and measurement Mw fitting algorithm to re-weight the fits by the standard error of the frequency band population in an effort to improve the fitting robustness and get better uncertainty estimates

Autopicking updates:
Now a two-step iterative process where we first take the SNR end pick, compute shapes, measure the deviation of each fit against the frequency model, pick the divergence point, and then re-measure with the new endpoint as a variable.
See the new Parameters->Shape Constraints->Fit Length parameter to adjust the tradeoff of envelope length vs. misfit. The range is [0,1] and is the ratio of weight given to the length where 0 dis-regards length and 1 disregards misfit.

Constraint changes:
Maximum stress changed from 10 to 100 MPa
Widened the path constraints in Joint1DPathCorrection to admit much higher Q values and allow longer crossover distances to support additional regions and higher frequency bands.

Adjusted the spectra truncation feature that is enabled when you have both a GT source spectra and Mw only reference events to use the MDAC sigma/psi-based falloff to compute the truncation corner frequency rather than an arbitrarily low value. This allows you to control how many bands on average are used for the Mw only events as site term constraints. This change was introduced for situations where the GT spectra events might not contain sufficient measurements below the corner frequency.

Bugfixes:
Addressed three potential NPEs and nine potential resources handle leaks
Updated all the entry points to set the default locale to English to prevent numbers being converted from using periods in countries that use comma separators. This is a temporary workaround to prevent functional errors related to envelope creation and reading.
Updates for the latest release versions of all dependencies.

README.md

@@ -42,18 +42,18 @@ We don't presently deploy versioned artifacts into a public repository like the
 #### **As a single runnable JAR**
 
 ```shell
-java -jar coda-calibration/calibration-standalone/target/calibration-standalone-1.0.10-runnable.jar
+java -jar coda-calibration/calibration-standalone/target/calibration-standalone-1.0.11-runnable.jar
 ```
 
 #### **GUI alone**
 
 ```shell
-java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.10-runnable.jar
+java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.11-runnable.jar
 ```
 #### **Calibration REST service alone**
 
 ```shell
-java -jar coda-calibration/calibration-service/application/target/application-1.0.10-runnable.jar
+java -jar coda-calibration/calibration-service/application/target/application-1.0.11-runnable.jar
 ```
 
 #### A note about HTTPS

calibration-gui/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.10</version>
+		<version>1.0.11</version>
 	</parent>
 
 	<artifactId>calibration-gui</artifactId>
@@ -46,10 +46,6 @@
 			<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 			<artifactId>externals</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>gov.llnl.gnem.apps.coda.common</groupId>
-			<artifactId>common-gui</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>gov.llnl.gnem.apps.coda.common</groupId>
 			<artifactId>mapping</artifactId>
@@ -189,13 +185,6 @@
 						<phase>prepare-package</phase>
 						<configuration>
 							<artifactItems>
-								<artifactItem>
-									<groupId>gov.llnl.gnem.apps.coda.common</groupId>
-									<artifactId>common-gui</artifactId>
-									<version>${project.version}</version>
-									<includes>**</includes>
-									<excludes>gov/**</excludes>
-								</artifactItem>
 								<artifactItem>
 									<groupId>gov.llnl.gnem.apps.coda.common</groupId>
 									<artifactId>mapping</artifactId>

calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/CodaGuiController.java

@@ -68,6 +68,7 @@
 import gov.llnl.gnem.apps.coda.common.gui.util.SnapshotUtils;
 import gov.llnl.gnem.apps.coda.common.mapping.api.GeoMap;
 import gov.llnl.gnem.apps.coda.common.model.domain.Pair;
+import gov.llnl.gnem.apps.coda.envelope.gui.EnvelopeGuiController;
 import javafx.application.Platform;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -134,6 +135,8 @@ public class CodaGuiController {
 
     @FXML
     private CheckMenuItem waveformFocus;
+
+    private EnvelopeGuiController envelopeGui;
 
     private Label activeMapIcon;
 
@@ -142,7 +145,7 @@ public class CodaGuiController {
     private GeoMap mapController;
 
     private WaveformClient waveformClient;
-    
+
     private ParameterClient configClient;
 
     private EnvelopeLoadingController envelopeLoadingController;
@@ -184,7 +187,8 @@ public class CodaGuiController {
     @Autowired
     public CodaGuiController(GeoMap mapController, WaveformClient waveformClient, EnvelopeLoadingController waveformLoadingController, CodaParamLoadingController codaParamLoadingController,
             ReferenceEventLoadingController refEventLoadingController, CalibrationClient calibrationClient, ParamExporter paramExporter, WaveformGui waveformGui, DataController data,
-            ParametersController param, ShapeController shape, PathController path, SiteController site, MeasuredMwsController measuredMws, ParameterClient configClient, EventBus bus) {
+            ParametersController param, ShapeController shape, PathController path, SiteController site, MeasuredMwsController measuredMws, ParameterClient configClient, EnvelopeGuiController envelopeGui,
+            EventBus bus) {
         super();
         this.mapController = mapController;
         this.waveformClient = waveformClient;
@@ -201,6 +205,7 @@ public CodaGuiController(GeoMap mapController, WaveformClient waveformClient, En
         this.site = site;
         this.measuredMws = measuredMws;
         this.configClient = configClient;
+        this.envelopeGui = envelopeGui;
         this.bus = bus;
         bus.register(this);
 
@@ -225,7 +230,7 @@ public CodaGuiController(GeoMap mapController, WaveformClient waveformClient, En
         fiModelFileChooser.getExtensionFilters().add(allFilesFilter);
 
         referenceEventFileChooser.getExtensionFilters().add(new ExtensionFilter("Reference Event Files (.txt,.dat)", "*.txt", "*.dat"));
-        referenceEventFileChooser.getExtensionFilters().add(allFilesFilter);
+        referenceEventFileChooser.getExtensionFilters().add(allFilesFilter);                
     }
 
     @FXML
@@ -420,6 +425,11 @@ private void refreshTab(ActionEvent e) {
         activeTabRefresh.run();
     }
 
+    @FXML
+    private void openEnvelopeTool(ActionEvent e) {
+        envelopeGui.toFront();
+    }
+
     @FXML
     private void snapshotTab(ActionEvent e) {
         File folder = screenshotFolderChooser.showDialog(rootElement.getScene().getWindow());
@@ -463,7 +473,7 @@ private void listener(UpdateMapPolygonEvent event) {
             mapController.setPolygonGeoJSON(event.getGeoJSON());
         }
     }
-    
+
     //TODO: Move this to a controller
     @Subscribe
     private void listener(CalibrationStatusEvent event) {

calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/GuiApplication.java

@@ -15,7 +15,9 @@
 package gov.llnl.gnem.apps.coda.calibration.gui;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URL;
+import java.util.Locale;
 import java.util.TimeZone;
 import java.util.concurrent.CancellationException;
 import java.util.concurrent.CompletableFuture;
@@ -54,6 +56,8 @@
 @SpringBootApplication
 @ComponentScan("gov.llnl.gnem.apps.coda.common.mapping")
 @ComponentScan("gov.llnl.gnem.apps.coda.common.gui")
+@ComponentScan("gov.llnl.gnem.apps.coda.envelope.model")
+@ComponentScan("gov.llnl.gnem.apps.coda.envelope.gui")
 @ComponentScan("gov.llnl.gnem.apps.coda.calibration.gui")
 public class GuiApplication extends Application {
 
@@ -67,6 +71,7 @@ public class GuiApplication extends Application {
 
     @PostConstruct
     void started() {
+        Locale.setDefault(Locale.ENGLISH);
         TimeZone.setDefault(TimeZone.getTimeZone("UTC"));
     }
 
@@ -98,10 +103,15 @@ public void init() throws Exception {
     @Override
     public void start(Stage primaryStage) throws Exception {
         this.primaryStage = primaryStage;
-        primaryStage.getIcons().add(new Image(this.getClass().getResourceAsStream("/coda_32x32.png")));
-        primaryStage.getIcons().add(new Image(this.getClass().getResourceAsStream("/coda_64x64.png")));
-        primaryStage.getIcons().add(new Image(this.getClass().getResourceAsStream("/coda_128x128.png")));
-        primaryStage.getIcons().add(new Image(this.getClass().getResourceAsStream("/coda_256x256.png")));
+        try (InputStream icon1 = this.getClass().getResourceAsStream("/coda_32x32.png");
+                InputStream icon2 = this.getClass().getResourceAsStream("/coda_64x64.png");
+                InputStream icon3 = this.getClass().getResourceAsStream("/coda_128x128.png");
+                InputStream icon4 = this.getClass().getResourceAsStream("/coda_256x256.png");) {
+            primaryStage.getIcons().add(new Image(icon1));
+            primaryStage.getIcons().add(new Image(icon2));
+            primaryStage.getIcons().add(new Image(icon3));
+            primaryStage.getIcons().add(new Image(icon4));
+        }
         primaryStage.setOnCloseRequest((evt) -> Platform.exit());
         primaryStage.setOnShown((evt) -> bus.post(new CalibrationStageShownEvent()));