Skip to content

Commit

Permalink
CCT 1.0.7
Browse files Browse the repository at this point in the history 
Features and Changes:
Basic plotting for Measured Mws spectra and tables + export results as JSON file in File->Export Measured Mws.
Added a constraint set configuration panel in Parameter for the velocity model and the model space bounds on Shape (V/B/G) models for advanced users.
Updated the input/output formats to include the new configurable fields (see schema folder for updates.)
Combined V/B/G Shape plots into one instead.
Support loading bands from the Envelope tool in CCT.
Changed the Envelope tool to generate evid folder names consistent with the evid used for filenames and headers.
Updated notebook to use new REST JSON format for measurements.
Slight changes to Site and Measure for more consistent include/exclude painting behavior.
Made all plots change their status immediately on include/exclude instead of waiting on refresh.
Added ability to remove reference events from Site table.
Added ability in Shape and Site to grow/shrink the data on the Y and X axis respectively via a button toggle.
Added a toggle for waveform plot pop-up behavior in Window->Waveform Pop-ups; defaults to pop-up the first time and respects focus thereafter.

Bugfixes:
Workaround for the classloading problem introduced by System Classloader ForkJoinPool changes in Java 9+ with Javafx WebKit native JNI loaders.
Cleaned up some map plotting problems related to include and exclude.
Small offset fix to account for waveform plots where the origin is very close to the begin time.
Remove dependency on BoringSSL for use on Java 9+
Fixed some web client serialization errors related to tiling from abritrary WMS sources.
  • Loading branch information
@justinbarno
justinbarno committed Nov 7, 2019
1 parent 2e33bbf commit f5b6754
Show file tree
Hide file tree
Showing 156 changed files with 6,431 additions and 1,697 deletions.
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.6-runnable.jar
java -jar coda-calibration/calibration-standalone/target/calibration-standalone-1.0.7-runnable.jar
```

#### **GUI alone**

```shell
java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.6-runnable.jar
java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.7-runnable.jar
```
#### **Calibration REST service alone**

```shell
java -jar coda-calibration/calibration-service/application/target/application-1.0.6-runnable.jar
java -jar coda-calibration/calibration-service/application/target/application-1.0.7-runnable.jar
```

#### A note about HTTPS
Expand Down
95 changes: 74 additions & 21 deletions calibration-gui/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<parent>
<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
<artifactId>coda-calibration</artifactId>
<version>1.0.6</version>
<version>1.0.7</version>
</parent>

<artifactId>calibration-gui</artifactId>
Expand Down Expand Up @@ -179,9 +179,9 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-tcnative-boringssl-static</artifactId>
</dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-loader</artifactId>
</dependency>
</dependencies>

<build>
Expand All @@ -194,6 +194,7 @@
<goals>
<goal>unpack</goal>
</goals>
<phase>prepare-package</phase>
<configuration>
<artifactItems>
<artifactItem>
Expand Down Expand Up @@ -224,23 +225,6 @@
<target>${maven.compile.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<configuration>
<executable>true</executable>
<mainClass>${start-class}</mainClass>
<classifier>runnable</classifier>
<excludeDevtools>true</excludeDevtools>
</configuration>
<executions>
<execution>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
Expand All @@ -259,6 +243,75 @@
</archive>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>${spring.boot.version}</version>
</dependency>
</dependencies>
<executions>
<execution>
<phase>package</phase>
<goals>
<goal>shade</goal>
</goals>
<configuration>
<transformers>
<transformer
implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<resource>META-INF/spring.handlers</resource>
</transformer>
<transformer
implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<resource>META-INF/spring.factories</resource>
</transformer>
<transformer
implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<resource>META-INF/spring.schemas</resource>
</transformer>
<transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<resource>META-INF/spring.tooling</resource>
</transformer>
<transformer
implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
<transformer
implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
<manifestEntries>
<Main-Class>org.springframework.boot.loader.JarLauncher</Main-Class>
<Start-Class>gov.llnl.gnem.apps.coda.calibration.gui.GuiApplication</Start-Class>
</manifestEntries>
</transformer>
</transformers>
</configuration>
</execution>
</executions>
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<excludes>
<exclude>**/module-info.*</exclude>
</excludes>
</filter>
<filter>
<!-- filter out signature files from signed dependencies, else repackaging fails with security ex -->
<artifact>*:*</artifact>
<excludes>
<exclude>META-INF/*.SF</exclude>
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>runnable</shadedClassifierName>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</plugin>
</plugins>
</build>
</project>
Loading

0 comments on commit f5b6754

Please sign in to comment.