Fix for hibernate indices being mismatched and preventing inserts on …

…the frequency band params tables.
LLNL · Oct 23, 2018 · 58ce33b · 58ce33b
1 parent b7ebf05
commit 58ce33b
Show file tree

Hide file tree

Showing 20 changed files with 81 additions and 215 deletions.
diff --git a/README.md b/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.2-runnable.jar
+java -jar coda-calibration/calibration-standalone/target/calibration-standalone-1.0.3-runnable.jar
 ```
 
 #### **GUI alone**
 
 ```shell
-java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.2-runnable.jar
+java -jar coda-calibration/calibration-gui/target/calibration-gui-1.0.3-runnable.jar
 ```
 #### **Calibration REST service alone**
 
 ```shell
-java -jar coda-calibration/calibration-service/application/target/application-1.0.2-runnable.jar
+java -jar coda-calibration/calibration-service/application/target/application-1.0.3-runnable.jar
 ```
 
 #### A note about HTTPS

diff --git a/calibration-gui/pom.xml b/calibration-gui/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 	<artifactId>calibration-gui</artifactId>
-	<version>1.0.2</version>
+	<version>1.0.3</version>
 	<packaging>jar</packaging>
 
 	<name>calibration-gui</name>
@@ -65,12 +65,12 @@
 		<dependency>
 			<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 			<artifactId>externals</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3</version>
 		</dependency>
 		<dependency>
 			<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 			<artifactId>model</artifactId>
-			<version>1.0.2</version>
+			<version>1.0.3</version>
 			<exclusions>
 				<exclusion>
 					<groupId>org.eclipse.persistence</groupId>

diff --git a/...ion-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/LoadingGui.java b/...ion-gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/LoadingGui.java
diff --git a/...gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/PathController.java b/...gui/src/main/java/gov/llnl/gnem/apps/coda/calibration/gui/controllers/PathController.java
@@ -372,6 +372,8 @@ private void plotSd() {
 
                         if (xmax == null) {
                             xmax = plotObj.getXcenter();
+                        }
+                        if (xmin == null) {
                             xmin = plotObj.getXcenter();
                         }
                         if (plotObj.getXcenter() > xmax) {
@@ -402,10 +404,14 @@ private void plotSd() {
                         }
                         plot.AddPlotObject(plotObj2, 10);
                     }
+                    String labelText;
                     if (xmax != null) {
                         plot.SetAxisLimits(xmin - (xmin * .1) - .1, xmax + (xmax * .1) + .1, ymin - (ymin * .1) - .1, ymax + (ymax * .1) + .1);
+                        labelText = "StdDev(Before) = " + dfmt2.format(overallBeforeStats.getStandardDeviation()) + " StdDev(After) = " + dfmt2.format(overallAfterStats.getStandardDeviation());
+                    }
+                    else {
+                        labelText = "";
                     }
-                    String labelText = "StdDev(Before) = " + dfmt2.format(overallBeforeStats.getStandardDeviation()) + " StdDev(After) = " + dfmt2.format(overallAfterStats.getStandardDeviation());
                     sdPlot.getXaxis().setVisible(false);
                     sdPlot.getXaxis().setLabelText(labelText);
                     sdPlot.getXaxis().setVisible(true);
@@ -473,6 +479,8 @@ private void plotBeforeAfter() {
 
                                     if (xmax == null) {
                                         xmax = plotObj.getXcenter();
+                                    }
+                                    if (xmin == null) {
                                         xmin = plotObj.getXcenter();
                                     }
                                     if (plotObj.getXcenter() > xmax) {
@@ -507,7 +515,12 @@ private void plotBeforeAfter() {
                         }
                     }
 
-
+                    if (xmax == null) {
+                        xmax = 1.0;
+                    }
+                    if (xmin == null) {
+                        xmin = 0.0;
+                    }
                     double paddedXmin = xmin - (xmin * .1);
                     double paddedXmax = xmax + (xmax * .1);
                     if (xmax != null) {

diff --git a/calibration-gui/src/main/resources/fxml/WaveformLoading.fxml b/calibration-gui/src/main/resources/fxml/WaveformLoading.fxml
diff --git a/calibration-service/application/pom.xml b/calibration-service/application/pom.xml
@@ -4,7 +4,7 @@
 	<parent>
 		<groupId>gov.llnl.gnem.apps.coda.calibration</groupId>
 		<artifactId>calibration-service</artifactId>
-		<version>1.0.2</version>
+		<version>1.0.3</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>application</artifactId>