Updated audit screen with sliding zoom window and fixed issue #618 (#619)

* Refactored

* Refactored

* Fixed #618

* Updated audit screen with sliding window to redcue memory usage

Author: bowring

common.gradle

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

squidApp/build.gradle

@@ -20,6 +20,8 @@ if (!hasProperty('mainClass')) {
 mainClassName = 'org.cirdles.squid.gui.SquidUI'
 
 dependencies {
+    implementation 'org.jetbrains:annotations:20.1.0'
+    implementation 'org.jetbrains:annotations:20.1.0'
     compile project(":squidCore")
 
     compile group: 'org.apache.xmlgraphics', name: 'batik-svg-dom', version: '1.9.1'
@@ -40,6 +42,4 @@ task fatAppJar(type: Jar) {
     baseName = 'Squid3'
     from { configurations.compile.collect { it.isDirectory() ? it : zipTree(it) } }
     with jar
-}
-
-
+}

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

@@ -15,15 +15,6 @@
  */
 package org.cirdles.squid.gui;
 
-import java.math.BigDecimal;
-import java.math.RoundingMode;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Locale;
-import java.util.ResourceBundle;
-import java.util.function.Predicate;
 import javafx.beans.value.ChangeListener;
 import javafx.beans.value.ObservableValue;
 import javafx.collections.FXCollections;
@@ -32,44 +23,37 @@
 import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
-import javafx.scene.control.Button;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.ContextMenu;
-import javafx.scene.control.Label;
-import javafx.scene.control.ListCell;
-import javafx.scene.control.ListView;
-import javafx.scene.control.Menu;
-import javafx.scene.control.MenuItem;
-import javafx.scene.control.SelectionMode;
-import javafx.scene.control.SplitPane;
-import javafx.scene.control.TextField;
+import javafx.scene.control.*;
 import javafx.scene.input.KeyEvent;
 import javafx.scene.input.MouseButton;
 import javafx.scene.input.MouseEvent;
 import javafx.scene.layout.HBox;
-import static javafx.scene.paint.Color.BLACK;
 import javafx.util.Callback;
 import javafx.util.StringConverter;
-import static org.cirdles.squid.constants.Squid3Constants.REF_238U235U_DEFAULT;
 import org.cirdles.squid.dialogs.SquidMessageDialog;
 import org.cirdles.squid.exceptions.SquidException;
-import static org.cirdles.squid.gui.SquidUI.primaryStageWindow;
-import static org.cirdles.squid.gui.SquidUIController.parametersLauncher;
-import static org.cirdles.squid.gui.SquidUIController.squidLabData;
-import static org.cirdles.squid.gui.SquidUIController.squidProject;
-import static org.cirdles.squid.gui.constants.Squid3GuiConstants.STYLE_MANAGER_TITLE;
 import org.cirdles.squid.gui.parameters.ParametersLauncher;
 import org.cirdles.squid.gui.parameters.ParametersManagerGUIController;
 import org.cirdles.squid.parameters.parameterModels.ParametersModel;
 import org.cirdles.squid.parameters.parameterModels.referenceMaterialModels.ReferenceMaterialModel;
-import static org.cirdles.squid.parameters.util.RadDates.age206_238r;
-import static org.cirdles.squid.parameters.util.RadDates.age207_206r;
-import static org.cirdles.squid.parameters.util.RadDates.age208_232r;
-import static org.cirdles.squid.parameters.util.ReferenceMaterialEnum.r238_235s;
 import org.cirdles.squid.prawn.PrawnFile;
 import org.cirdles.squid.prawn.PrawnFile.Run;
 import org.cirdles.squid.projects.SquidProject;
 
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.net.URL;
+import java.util.*;
+import java.util.function.Predicate;
+
+import static javafx.scene.paint.Color.BLACK;
+import static org.cirdles.squid.constants.Squid3Constants.REF_238U235U_DEFAULT;
+import static org.cirdles.squid.gui.SquidUI.primaryStageWindow;
+import static org.cirdles.squid.gui.SquidUIController.*;
+import static org.cirdles.squid.gui.constants.Squid3GuiConstants.STYLE_MANAGER_TITLE;
+import static org.cirdles.squid.parameters.util.RadDates.*;
+import static org.cirdles.squid.parameters.util.ReferenceMaterialEnum.r238_235s;
+
 /**
  * FXML Controller class
  *
@@ -232,6 +216,10 @@ public void changed(ObservableValue<? extends String> observable, String oldValu
 
     private void setUpDataFile() throws SquidException {
 
+        // May 2021 fixes issue #618
+        squidProject.getTask().setChanged(true);
+        squidProject.getTask().setupSquidSessionSpecsAndReduceAndReport(true);
+
         shrimpRuns = FXCollections.observableArrayList(squidProject.getPrawnFileRuns());
 
         setUpShrimpFractionList();
@@ -753,4 +741,4 @@ private void refreshRMmodelButton(ActionEvent event) {
 //        updateViewRM();
 //        updateViewCM();
     }
-}
+}

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

@@ -19,17 +19,14 @@
  */
 package org.cirdles.squid.gui.dataViews;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
 import javafx.scene.canvas.Canvas;
 import javafx.scene.canvas.GraphicsContext;
 import javafx.scene.paint.Paint;
 import javafx.scene.shape.Rectangle;
-import org.cirdles.squid.prawn.PrawnFile;
+
+import java.math.BigDecimal;
 
 /**
- *
  * @author James F. Bowring
  */
 public abstract class AbstractDataView extends Canvas {
@@ -38,6 +35,8 @@ public abstract class AbstractDataView extends Canvas {
     protected double y;
     protected double width;
     protected double height;
+    protected static int indexOfSelectedSpot = -1;
+    protected static int indexOfSecondSelectedSpotForMultiSelect = -1;
 
     /**
      *
@@ -47,9 +46,6 @@ public abstract class AbstractDataView extends Canvas {
      *
      */
     protected double[] myOnPeakNormalizedAquireTimes;
-    /**
-     *
-     */
     protected int graphWidth;
     /**
      *
@@ -82,34 +78,32 @@ public abstract class AbstractDataView extends Canvas {
     /**
      *
      */
-    private double displayOffsetY = 0;
+    protected BigDecimal[] ticsX;
     /**
      *
      */
-    private double displayOffsetX = 0;
+    protected BigDecimal[] ticsY;
+    protected BigDecimal[] ticsYII;
+    protected boolean showTimeNormalized;
+    protected boolean showspotLabels;
     /**
      *
      */
-    protected BigDecimal[] ticsX;
+    private double displayOffsetY = 0;
     /**
      *
      */
-    protected BigDecimal[] ticsY;
-    protected BigDecimal[] ticsYII;
+    private double displayOffsetX = 0;
 
-    protected boolean showTimeNormalized;
-    protected boolean showspotLabels;
-    
 
     /**
      *
      */
-    public AbstractDataView() {
+    private AbstractDataView() {
         super();
     }
 
     /**
-     *
      * @param bounds
      */
     protected AbstractDataView(Rectangle bounds, int leftMargin, int topMargin) {
@@ -130,24 +124,22 @@ protected AbstractDataView(Rectangle bounds, int leftMargin, int topMargin) {
     }
 
     /**
-     *
      * @param g2d
      */
     protected void paintInit(GraphicsContext g2d) {
         relocate(x, y);
         g2d.clearRect(0, 0, width, height);
     }
-    
+
     /**
-     *
      * @param g2d
      */
     public void paint(GraphicsContext g2d) {
         paintInit(g2d);
 
         drawBorder(g2d);
     }
-    
+
     public void repaint() {
         paint(this.getGraphicsContext2D());
     }
@@ -163,9 +155,8 @@ private void drawBorder(GraphicsContext g2d) {
         g2d.strokeRect(1, 1, width - 1, height - 1);
 
     }
-    
+
     /**
-     *
      * @param x
      * @return mapped x
      */
@@ -174,7 +165,6 @@ public double mapX(double x) {
     }
 
     /**
-     *
      * @param y
      * @return mapped y
      */
@@ -183,8 +173,7 @@ protected double mapY(double y) {
     }
 
     /**
-     *
-     * @param doReScale the value of doReScale
+     * @param doReScale  the value of doReScale
      * @param inLiveMode the value of inLiveMode
      */
     public void refreshPanel(boolean doReScale, boolean inLiveMode) {
@@ -196,9 +185,6 @@ public void refreshPanel(boolean doReScale, boolean inLiveMode) {
     }
 
     /**
-     *
-     * @param doReScale the value of doReScale
-     * @param inLiveMode the value of inLiveMode
      */
     public abstract void preparePanel();
 
@@ -231,47 +217,41 @@ public void setDisplayOffsetX(double displayOffsetX) {
     }
 
     /**
-     *
      * @return minimum displayed x
      */
     public double getMinX_Display() {
         return minX + displayOffsetX;
     }
 
     /**
-     *
      * @return maximum displayed x
      */
     public double getMaxX_Display() {
         return maxX + displayOffsetX;
     }
 
     /**
-     *
      * @return minimum displayed y
      */
     public double getMinY_Display() {
         return minY + displayOffsetY;
     }
 
     /**
-     *
      * @return maximum displayed y
      */
     public double getMaxY_Display() {
         return maxY + displayOffsetY;
     }
 
     /**
-     *
      * @return
      */
     public double getRangeX_Display() {
         return (getMaxX_Display() - getMinX_Display());
     }
 
     /**
-     *
      * @return
      */
     public double getRangeY_Display() {
@@ -293,20 +273,18 @@ public double[] getMyOnPeakNormalizedAquireTimes() {
     }
 
     /**
-     *
      * @param x
      * @return
      */
     protected double convertMouseXToValue(double x) {
-        double convertedX = (((double) (x - leftMargin + 2)) / (double) graphWidth) //
+        double convertedX = ((x - leftMargin + 2) / (double) graphWidth) //
                 * getRangeX_Display()//
                 + getMinX_Display();
 
         return convertedX;
     }
 
     /**
-     *
      * @param y
      * @return
      */
@@ -321,4 +299,13 @@ protected boolean mouseInHouse(javafx.scene.input.MouseEvent evt) {
                 && (evt.getY() < graphHeight + topMargin - 2)
                 && (evt.getX() < (graphWidth + leftMargin - 2)));
     }
+
+    public void setGraphWidth(int graphWidth) {
+        this.graphWidth = graphWidth;
+    }
+
+    public void setMyWidth(double width) {
+        this.width = width;
+        setWidth(width);
+    }
 }

squidApp/src/main/java/org/cirdles/squid/gui/dataViews/AbstractDataView.java

@@ -15,19 +15,23 @@
  */
 package org.cirdles.squid.gui.dataViews;
 
+import org.cirdles.squid.prawn.PrawnFile;
+
+import java.util.List;
+
 /**
  *
  * @author James F. Bowring, CIRDLES.org, and Earth-Time.org
  */
 public interface MassAuditRefreshInterface {
-    public void updateGraphsWithSelectedIndex(int index);
+    public void updateGraphsWithSelectedIndex(int index, int leadingZoomingTrailing);
 
-    public void updateGraphsWithSecondSelectedIndex(int index);
+    public void updateGraphsWithSecondSelectedIndex(int index, int leadingZoomingTrailing);
 
     /**
      *
      */
     public void updateSpotsInGraphs();
 
-    public int[] getCountOfScansCumulative();
-}
+    public int[] getCountOfScansCumulative(List<PrawnFile.Run> prawnFileRuns);
+}