Merge branch 'main' of https://github.com/macster110/PAMGuard

src/Array/ArrayDialog.java

@@ -33,7 +33,6 @@ import PamView.help.PamHelp;
  */
 public class ArrayDialog extends PamDialog implements ActionListener {
 
-
 	private static final long serialVersionUID = 1L;
 
 	static private ArrayDialog singleInstance = null;
@@ -56,9 +55,6 @@ public class ArrayDialog extends PamDialog implements ActionListener {
 	private ArrayDialog(Frame parentFrame) {
 		super(parentFrame, "Pamguard hydrophone array", false);
 
-//		JPanel p = new JPanel();
-//		p.setBorder(BorderFactory.createEmptyBorder(10, 10, 10, 10));
-//		p.setLayout(new BorderLayout());
 		JPanel mainPanel = new JPanel(new BorderLayout());
 		JSplitPane splitPanel = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT);
 		mainPanel.add(BorderLayout.CENTER, splitPanel);
@@ -73,8 +69,6 @@ public class ArrayDialog extends PamDialog implements ActionListener {
 		eastPanel.add(channelPanel.getChannelPanel());
 
 		environmentPanel = new EnvironmentPanel(this);
-		//		eastPanel.add(environmentPanel.getEnvironmentPanel());
-
 
 		hydrophoneDiagram = new HydrophoneDiagram(this);
 		JPanel westPanel = new JPanel(new BorderLayout());

src/PamController/PamguardVersionInfo.java

@@ -24,7 +24,7 @@ public class PamguardVersionInfo {
 	 * PAMGuard can work with. 
 	 */
 	static public final String minJavaVersion = "11.0.0";
-	static public final String maxJavaVersion = "18.99.99";
+	static public final String maxJavaVersion = "19.99.99";
 	
 
 	/**

src/PamModel/PamModel.java

@@ -1258,6 +1258,7 @@ final public class PamModel implements PamModelInterface, PamSettings {
 								String help = null;
 								int ans = WarnOnce.showWarning(PamController.getMainFrame(), title, msg, WarnOnce.WARNING_MESSAGE, help, e1);
 								System.err.println("Exception while loading " +	className);
+								System.err.println(e1.getMessage());								
 								continue;
 							}
 						}						

src/Resources/css/primer-dark.css

@@ -3703,7 +3703,7 @@ Text {
 }
 
 #label-title2 {
-    -fx-font: bold 11pt  -fx-font-family;
+    -fx-font: bold 13pt  -fx-font-family;
   }
 
 /*******************************************************************************

src/SoundRecorder/RecorderControl.java

@@ -436,7 +436,6 @@ public class RecorderControl extends PamControlledUnit implements PamSettings {
 
 	public boolean restoreSettings(PamControlledUnitSettings pamControlledUnitSettings) {
 		recorderSettings = ((RecorderSettings) pamControlledUnitSettings.getSettings()).clone();
-		newParams();
 		/*
 		 * Then check to see if there is a command line override of the currently stored folder name. 
 		 */
@@ -450,6 +449,9 @@ public class RecorderControl extends PamControlledUnit implements PamSettings {
 				System.err.println("Unable to set recording storage folder " + globFolder);
 			}
 		}
+
+		newParams();
+		
 		return true;
 	}
 

src/rocca/RoccaWhistleSelect.java

@@ -205,9 +205,12 @@ public class RoccaWhistleSelect extends PamProcess implements SpectrogramMarkObs
              * DG June '22.
              * I hope IT's K to set these back here. It's possible it's also 
              * done elsewhere.  
+             * 
+             * MO Jan '23
+             * These are set to 0 in the RoccaSpecPopUp class, before the user closes the window.  If set here, the objects are cleared before the user can trace the whistle and throws an exception
              */
-            selectedWhistle.setNaturalLifetimeMillis(0);
-            selectedWhistleRaw.setNaturalLifetimeMillis(0);
+//            selectedWhistle.setNaturalLifetimeMillis(0);
+//            selectedWhistleRaw.setNaturalLifetimeMillis(0);
         }
 	}