Fixes #632 and 633. (#634)

* Fixed #633

* Fixed #632

Author: bowring

common.gradle

@@ -6,7 +6,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 
 String mavenGroupId = 'org.cirdles'
-String mavenVersion = '1.8.1'
+String mavenVersion = '1.8.2'
 
 sourceCompatibility = '1.8'
 [compileJava, compileTestJava]*.options*.encoding = 'UTF-8'

squidApp/src/main/java/org/cirdles/squid/gui/MassesAuditController.java

@@ -62,6 +62,7 @@
  */
 public class MassesAuditController implements Initializable, MassAuditRefreshInterface {
 
+    public static final int LEGEND_WIDTH = 259;
     private static final String STYLE_BUTTON_LABEL
             = "-fx-font-family: 'Monospaced', 'SansSerif';\n"
             + "    -fx-font-weight: bold;\n"
@@ -411,7 +412,7 @@ private void displayBothCountsAction(ActionEvent actionEvent) {
     private void produceMassModeGraphOnScrolledPane(int massCounter, String title, List<Double> data, MassStationDetail entry) {
         // plot legend
         AbstractDataView legendCanvas
-                = new SpeciesAMUAuditViewForShrimp(new Rectangle(0, (massCounter * heightOfMassPlot) + 25, 260, heightOfMassPlot),
+                = new SpeciesAMUAuditViewForShrimp(new Rectangle(0, (massCounter * heightOfMassPlot) + 25, LEGEND_WIDTH, heightOfMassPlot),
                 title,
                 data,
                 entry.getTimesOfMeasuredTrimMasses(),
@@ -646,7 +647,7 @@ private void updateAllMassesCanvases(int savedZoomedStart) {
     private void produceCountsModeGraphOnScrolledPane(int massCounter, String title, List<Double> countsData, List<Double> countsSBMData, MassStationDetail entry) {
         // plot legend
         AbstractDataView legendCanvas
-                = new SpeciesCountsAuditViewForShrimp(new Rectangle(0, (massCounter * heightOfMassPlot) + 25, 260, heightOfMassPlot),
+                = new SpeciesCountsAuditViewForShrimp(new Rectangle(0, (massCounter * heightOfMassPlot) + 25, LEGEND_WIDTH, heightOfMassPlot),
                 title,
                 countsData,
                 countsSBMData,

squidApp/src/main/java/org/cirdles/squid/gui/dataViews/SpeciesGraphs/SpeciesAMUAuditViewForShrimp.java

@@ -46,6 +46,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.cirdles.squid.gui.MassesAuditController.LEGEND_WIDTH;
 import static org.cirdles.squid.gui.SquidUI.primaryStageWindow;
 import static org.cirdles.squid.gui.SquidUIController.squidProject;
 
@@ -254,7 +255,7 @@ private int indexOfSpotFromMouseX(double x) {
     public void paint(GraphicsContext g2d) {
         super.paint(g2d);
 
-        boolean legendOnly = (width - 260 == 0);
+        boolean legendOnly = (width - LEGEND_WIDTH == 0);
         float verticalTextShift = 3.1f;
 
         g2d.setFont(Font.font("SansSerif", 12));
@@ -263,7 +264,7 @@ public void paint(GraphicsContext g2d) {
         g2d.setLineWidth(0.5);
 
         if (legendOnly) {
-            leftMargin = 260;
+            leftMargin = LEGEND_WIDTH;
             g2d.setFill(Paint.valueOf("Red"));
             if (plotTitle.contains("-")) {
                 String[] titleArray = plotTitle.split("-");

squidApp/src/main/java/org/cirdles/squid/gui/dataViews/SpeciesGraphs/SpeciesCountsAuditViewForShrimp.java

@@ -43,6 +43,7 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import static org.cirdles.squid.gui.MassesAuditController.LEGEND_WIDTH;
 import static org.cirdles.squid.gui.SquidUI.primaryStageWindow;
 import static org.cirdles.squid.gui.SquidUIController.squidProject;
 
@@ -69,7 +70,7 @@ public class SpeciesCountsAuditViewForShrimp extends AbstractDataView implements
     private String plotTitle = "NONE";
     private int[] scanIndices;
     private int[] runIndices;
-//    private List<Run> selectedRuns = new ArrayList<>();
+    //    private List<Run> selectedRuns = new ArrayList<>();
     private MenuItem spotContextMenuItem1;
     private Menu spotRestoreMenu;
     private Menu prawnFileSplitMenu;
@@ -260,7 +261,7 @@ private int indexOfSpotFromMouseX(double x) {
     public void paint(GraphicsContext g2d) {
         super.paint(g2d);
 
-        boolean legendOnly = (width - 260 == 0);
+        boolean legendOnly = (width - LEGEND_WIDTH == 0);
         float verticalTextShift = 3.1f;
 
         g2d.setFont(Font.font("SansSerif", 12));
@@ -269,7 +270,7 @@ public void paint(GraphicsContext g2d) {
         g2d.setLineWidth(0.5);
 
         if (legendOnly) {
-            leftMargin = 260;
+            leftMargin = LEGEND_WIDTH;
             g2d.setFill(Paint.valueOf("Red"));
             if (plotTitle.contains("-")) {
                 String[] titleArray = plotTitle.split("-");

squidCore/src/main/java/org/cirdles/squid/squidReports/squidWeightedMeanReports/SquidWeightedMeanReportEngine.java

@@ -17,6 +17,8 @@
 
 import org.cirdles.squid.tasks.expressions.spots.SpotSummaryDetails;
 
+import java.util.Locale;
+
 /**
  * per @NicoleRayner Items I would like to see incorporated as headers into the
  * WM stats file: Sample Name * Value Name WM Value * 2s Err * 95% conf Err * n
@@ -49,7 +51,7 @@ public static String makeWeightedMeanReportAsCSV(SpotSummaryDetails spotSummaryD
             }
         }
 
-        boolean isAnAge = spotSummaryDetails.getSelectedExpressionName().contains("Age");
+        boolean isAnAge = spotSummaryDetails.getExpressionTree().getName().toUpperCase(Locale.ROOT).contains("AGE");
         report.append(spotSummaryDetails.getExpressionTree().getUnknownsGroupSampleName()).append(", ");
         report.append(spotSummaryDetails.getExpressionTree().getName().split("_WM_")[0]).append(", ");
         report.append(spotSummaryDetails.getValues()[0][0] / (isAnAge ? 1e6 : 1.0)).append(", ");
@@ -72,4 +74,4 @@ public static String makeWeightedMeanReportHeaderAsCSV() {
         return header.toString();
     }
 
-}
+}