New support for having validation events in addition to reference eve…

…nts.

* Do not alter the calibration or measurements and are intended to serve as a way to compare asssessments.
* Appear as black squares in the Mw related plots and as a blue dashed line in the spectra plots.
* Can be created from reference events by selecting the reference event in the table and right-clicking->"Toggle Validation".
* Two new related columns for validation Mw and validation stress in the Mw tables; hidden by default in the expanded column list ("+").

* The map now includes a scalebar and distance measurement tool.

* Site/Measurement now share a common set of diagnostic plots for easier validation during routine measurement.
* Added event depth field to the headers on the envelope tool output, a column for depth on the data tab, and to the JSON in/output for calibration.
* Support for cancelling in progress calibrations.

* Corrected an issue when plotting waveforms with synthetic models producing exactly one point at the given time-scale for the plots.
* Corrected a pagination bug with the multiple-waveform plot when plotting waveforms >= page-size but < 2 * page-size.

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.8-runnable.jar
+java -jar coda-calibration/calibration-standalone/target/calibration-standalone-1.0.9-runnable.jar
 ```
 
 #### **GUI alone**
 
 ```shell
-java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.8-runnable.jar
+java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.9-runnable.jar
 ```
 #### **Calibration REST service alone**
 
 ```shell
-java -jar coda-calibration/calibration-service/application/target/application-1.0.8-runnable.jar
+java -jar coda-calibration/calibration-service/application/target/application-1.0.9-runnable.jar
 ```
 
 #### A note about HTTPS

calibration-gui/pom.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="https://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>coda-calibration</artifactId>
-		<version>1.0.8.1</version>
+		<version>1.0.9</version>
 	</parent>
 
 	<artifactId>calibration-gui</artifactId>
 	<packaging>jar</packaging>
 	<name>calibration-gui</name>
-	<url>http://www.llnl.gov</url>
+	<url>https://www.llnl.gov</url>
 
 	<organization>
 		<name>Lawrence Livermore National Laboratory (LLNL)</name>
-		<url>http://www.llnl.gov</url>
+		<url>https://www.llnl.gov</url>
 	</organization>
 
 	<properties>
@@ -37,7 +37,7 @@
 	<pluginRepositories>
 		<pluginRepository>
 			<id>spring-milestones</id>
-			<url>http://repo.spring.io/milestone</url>
+			<url>https://repo.spring.io/milestone</url>
 		</pluginRepository>
 	</pluginRepositories>
 
@@ -62,10 +62,6 @@
 					<groupId>org.eclipse.persistence</groupId>
 					<artifactId>javax.persistence</artifactId>
 				</exclusion>
-				<exclusion>
-					<groupId>io.springlets</groupId>
-					<artifactId>springlets-context</artifactId>
-				</exclusion>
 				<exclusion>
 					<groupId>org.aspectj</groupId>
 					<artifactId>aspectjweaver</artifactId>

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

@@ -456,6 +456,7 @@ private void listener(CalibrationStatusEvent event) {
         if (!monitors.containsKey(event.getId()) && event.getStatus() == Status.STARTING) {
             CalibrationProgressListener eventMonitor = new CalibrationProgressListener(bus, event);
             ProgressMonitor monitor = new ProgressMonitor("Calibration Progress " + event.getId(), eventMonitor);
+            monitor.addCancelCallback(() -> calibrationClient.cancelCalibration(event.getId()).subscribe());
             monitors.put(event.getId(), monitor);
             loadingGui.addProgressMonitor(monitor);
             loadingGui.show();
@@ -465,6 +466,7 @@ private void listener(CalibrationStatusEvent event) {
             final ProgressMonitor monitor = monitors.remove(event.getId());
             if (monitor != null) {
                 monitor.setProgressStage("Finished");
+                monitor.clearCancelCallbacks();
                 service.schedule(() -> loadingGui.removeProgressMonitor(monitor), 15, TimeUnit.MINUTES);
             }
         } else {