Skip to content

Commit

Permalink
CCT 1.0.12 Release Notes
Browse files Browse the repository at this point in the history 
* This release is focused around replacing all of our plots with new HTML5 based plots that utilize PlotlyJS and D3.js.
  * Our existing plotting codes have been moved to the llnl.gnem.core.gui.swing package.
  * All plots now share a common look-and-feel and have a common interface through the toolbar available by mousing over the top right corner of each plot.
  * New plots all support export via SVG in addition to existing snapshot functionality.
* We now have navigation buttons on the top bar of the waveform display when you are looking at a single waveform that allow you to quicky navigate to different frequency bands for that event/station pair.
* Added a menu item under the Data menu item to mark all picks in a data set as reviewed.
* Additional data exposed in the UI based on user feedback.
  * Added depth and julian day information in site/meas event view.
  * Added an ISO 8601 date column to the results tables.
  * Added station count and frequency band coverage QC metric columns in the results tables.
  * Added network code column to the data and parameter tables.
* Waveform plots are now aligned on the time axis such that 0 aligns to the event origin time.
* Site and measurement tabs for individual events now only show stations that contributed measurements to that event.
* Spectral plots now include a right Y-axis that displays the Mw value in addition to the existing Y-axis in log dyne-cm.
* Spectral plot frequency axis is now plotting as log labels rather than the center frequency (label change only, no change to plot of data values).
* Plots now allow turning elements on and off by clicking on the legend entry for that element.
  • Loading branch information
@justinbarno
justinbarno committed Jun 15, 2021
1 parent 084166a commit 8f6e4b2
Show file tree
Hide file tree
Showing 230 changed files with 7,612 additions and 4,386 deletions.
51 changes: 24 additions & 27 deletions calibration-gui/pom.xml
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<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">
<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.11.1</version>
<version>1.0.12</version>
</parent>

<artifactId>calibration-gui</artifactId>
Expand Down Expand Up @@ -198,13 +196,17 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-javadoc-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
</configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
Expand Down Expand Up @@ -242,27 +244,22 @@
</goals>
<configuration>
<transformers>
<transformer
implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<resource>META-INF/spring.handlers</resource>
</transformer>
<transformer
implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<transformer implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<resource>META-INF/spring.factories</resource>
</transformer>
<transformer
implementation="org.springframework.boot.maven.PropertiesMergingResourceTransformer">
<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">
<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>
<Main-Class>org.springframework.boot.loader.JarLauncher</Main-Class>
<Start-Class>gov.llnl.gnem.apps.coda.calibration.gui.GuiApplication</Start-Class>
</manifestEntries>
</transformer>
Expand All @@ -273,11 +270,11 @@
<configuration>
<filters>
<filter>
<artifact>*:*</artifact>
<artifact>*:*</artifact>
<excludes>
<exclude>**/module-info.*</exclude>
</excludes>
</filter>
</filter>
<filter>
<!-- filter out signature files from signed dependencies, else repackaging fails with security ex -->
<artifact>*:*</artifact>
Expand All @@ -286,13 +283,13 @@
<exclude>META-INF/*.DSA</exclude>
<exclude>META-INF/*.RSA</exclude>
</excludes>
</filter>
</filters>
</filter>
</filters>
<shadedArtifactAttached>true</shadedArtifactAttached>
<shadedClassifierName>runnable</shadedClassifierName>
<shadedClassifierName>runnable</shadedClassifierName>
<createDependencyReducedPom>false</createDependencyReducedPom>
</configuration>
</plugin>
</plugin>
</plugins>
</build>
</project>
21 changes: 13 additions & 8 deletions calibration-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/CodaGuiController.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ public class CodaGuiController {

@FXML
private CheckMenuItem waveformFocus;

private EnvelopeGuiController envelopeGui;

private Label activeMapIcon;
Expand Down Expand Up @@ -187,9 +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, EnvelopeGuiController envelopeGui,
EventBus bus) {
super();
ParametersController param, ShapeController shape, PathController path, SiteController site, MeasuredMwsController measuredMws, ParameterClient configClient,
EnvelopeGuiController envelopeGui, EventBus bus) {
this.mapController = mapController;
this.waveformClient = waveformClient;
this.envelopeLoadingController = waveformLoadingController;
Expand Down Expand Up @@ -230,7 +229,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
Expand Down Expand Up @@ -334,6 +333,12 @@ private void clearData() {
}, err -> log.trace(err.getMessage(), err), () -> data.getRefreshFunction().run());
}

@FXML
private void clearAutopicks() {
waveformClient.clearAutoPicks().subscribe(val -> {
}, err -> log.trace(err.getMessage(), err), () -> data.getRefreshFunction().run());
}

@FXML
private void runAutoPickingCalibration() {
calibrationClient.runCalibration(Boolean.TRUE).subscribe(value -> {
Expand All @@ -355,14 +360,14 @@ public void initialize() {
snapshotButton.setContentDisplay(ContentDisplay.CENTER);

addEnabledTabListeners(dataTab, data);
activeTabScreenshot = (folder) -> SnapshotUtils.writePng(folder, new Pair<>(dataTab.getText(), dataTab.getContent()));
activeTabScreenshot = folder -> SnapshotUtils.writePng(folder, new Pair<>(dataTab.getText(), dataTab.getContent()));
data.setVisible(true);

paramTab.setOnSelectionChanged(e -> {
if (paramTab.isSelected()) {
mapController.clearIcons();
activeTabRefresh = param.getRefreshFunction();
activeTabScreenshot = (folder) -> SnapshotUtils.writePng(folder, new Pair<>(paramTab.getText(), paramTab.getContent()));
activeTabScreenshot = folder -> SnapshotUtils.writePng(folder, new Pair<>(paramTab.getText(), paramTab.getContent()));
}
});

Expand Down Expand Up @@ -411,7 +416,7 @@ private void addEnabledTabListeners(Tab tab, MapListeningController controller)
if (controller instanceof ScreenshotEnabledController) {
activeTabScreenshot = ((ScreenshotEnabledController) controller).getScreenshotFunction();
} else {
activeTabScreenshot = (folder) -> SnapshotUtils.writePng(folder, new Pair<>(tab.getText(), tab.getContent()));
activeTabScreenshot = folder -> SnapshotUtils.writePng(folder, new Pair<>(tab.getText(), tab.getContent()));
}
} else {
tab.setGraphic(null);
Expand Down
Loading

0 comments on commit 8f6e4b2

Please sign in to comment.