Merge pull request #41 from PAMGuard/main

updated x3

pom.xml

@@ -784,7 +784,7 @@
  	<dependency>
 	    <groupId>pamguard.org</groupId>
 	    <artifactId>x3</artifactId>
-	    <version>2.2.0</version>
+	    <version>2.2.1</version>
 	</dependency>
 	
 		<!-- https://mvnrepository.com/artifact/it.sauronsoftware/jave -->

repo/pamguard/org/x3/2.2.1/_remote.repositories

@@ -0,0 +1,4 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Mon Apr 24 10:32:52 BST 2023
+x3-2.2.1.jar>=
+x3-2.2.1.pom>=

repo/pamguard/org/x3/2.2.1/x3-2.2.1.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>pamguard.org</groupId>
+  <artifactId>x3</artifactId>
+  <version>2.2.1</version>
+  <description>POM was created from install:install-file</description>
+</project>

src/PamUtils/worker/filelist/FileListWorker.java

@@ -180,6 +180,7 @@ public abstract class FileListWorker<T extends File> implements PamWorkWrapper<F
 				T newFile = createFile(moreFiles[i]);
 				eachFileTask(newFile);
 				newFileList.addFile(newFile);
+				Debug.out.println("Adding file " + newFile.getAbsolutePath());
 				if (i%100 == 0) {
 					sayProgress(pamWorker, newFileList, folder);
 				}

src/PamguardMVC/PamDataBlock.java

@@ -2078,6 +2078,9 @@ public class PamDataBlock<Tunit extends PamDataUnit> extends PamObservable {
 		/*
 		 * Doesnt notify it's own parent to avoid an infinite loop
 		 */
+		if (Float.isNaN(sampleRate)) {
+			System.out.println("NaN sample rate being set in " + getLongDataName());
+		}
 		if (notify) {
 			for (int i = 0; i < countObservers(); i++) {
 				if (getPamObserver(i).getObserverObject() != parentProcess) {

src/clickDetector/ClickControl.java

@@ -1086,6 +1086,9 @@ public class ClickControl extends PamControlledUnit implements PamSettings {
 	}
 
 	public ClickDisplayManager getDisplayManager(){
+		if (tabPanelControl == null) {
+			return null;
+		}
 		return tabPanelControl.clickDisplayManager;
 	}
 

src/soundtrap/STAcquisitionControl.java

@@ -28,6 +28,7 @@ import java.awt.Component;
 
 import Acquisition.AcquisitionControl;
 import Acquisition.DaqSystem;
+import PamController.PamControlledUnitSettings;
 
 /**
  * @author SCANS
@@ -102,6 +103,18 @@ public class STAcquisitionControl extends AcquisitionControl {
 		return stDaqSystem;
 	}
 
+	@Override
+	public boolean restoreSettings(PamControlledUnitSettings pamControlledUnitSettings) {
+		// TODO Auto-generated method stub
+		boolean ok =  super.restoreSettings(pamControlledUnitSettings);
+		if (Float.isNaN(this.getAcquisitionParameters().sampleRate)) {
+			System.out.println("Nan sample rate read back in sound trap data control. ");
+			this.getAcquisitionParameters().sampleRate = 384000.f;
+		}
+		
+		return ok;
+	}
+
 	
 
 }

src/soundtrap/STAcquisitionProcess.java

@@ -88,6 +88,12 @@ public class STAcquisitionProcess extends AcquisitionProcess {
 		}
 	}
 	
+	@Override
+	public float getSampleRate() {
+		float fs = super.getSampleRate();
+		return fs;
+	}
+
 	@Override
 	/**
 	 * Override the AcquisitionProcess version of this, because it sets the 
@@ -156,4 +162,5 @@ public class STAcquisitionProcess extends AcquisitionProcess {
 	
 	
 
+
 }

src/soundtrap/STClickControl.java

@@ -146,6 +146,10 @@ public class STClickControl extends ClickControl {
 	 */
 	public void updateDisplayScrollers(long timeMillis) {
 		ClickDisplayManager dispManager = getDisplayManager();
+		if (dispManager == null) {
+			// happens in -nogui operation. 
+			return;
+		}
 		ArrayList<ClickDisplay> dispList = dispManager.getWindowList();
 		for (ClickDisplay display : dispList) {
 			if (display instanceof ClickBTDisplay) {