Merge branch 'main' of https://github.com/douggillespie/PAMGuard.git into main

dependency-reduced-pom.xml

@@ -4,7 +4,7 @@
   <groupId>org.pamguard</groupId>
   <artifactId>Pamguard</artifactId>
   <name>Pamguard Java12+</name>
-  <version>2.02.04</version>
+  <version>2.02.04a</version>
   <description>Pamguard for Java 12+, using Maven to control dependcies</description>
   <url>www.pamguard.org</url>
   <organization>

pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.pamguard</groupId>
   <artifactId>Pamguard</artifactId>
-  <version>2.02.04</version>
+  <version>2.02.04a</version>
   <name>Pamguard Java12+</name>
   <description>Pamguard for Java 12+, using Maven to control dependcies</description>
 	<url>www.pamguard.org</url>

src/PamController/PamguardVersionInfo.java

@@ -31,12 +31,12 @@ public class PamguardVersionInfo {
 	 * Version number, major version.minorversion.sub-release.
 	 * Note: can't go higher than sub-release 'f'
 	 */
-	static public final String version = "2.02.04";
+	static public final String version = "2.02.04a";
 	
 	/**
 	 * Release date
 	 */
-	static public final String date = "11 June 2022";
+	static public final String date = "23 June 2022";
 	
 //	/**
 //	 * Release type - Beta or Core

src/PamView/dialog/PamDialog.java

@@ -257,15 +257,22 @@ abstract public class PamDialog extends JDialog {
 		// check we're not going too far off the screen. 
 		Dimension sz = getPreferredSize();
 		Dimension screen = null;
+		int w, h;
 		if (getOwner() != null) {
+			Window owner = getOwner();
+			Rectangle bounds = owner.getBounds();
+			w = bounds.x+bounds.width;
+			h = bounds.y+bounds.height;
 			screen = getOwner().getSize();
 		}
 		else {
 			screen = Toolkit.getDefaultToolkit().getScreenSize();
+			w = screen.width;
+			h = screen.height;
 		}
-		point.y = Math.min(point.y, screen.height-sz.height-10);
+		point.y = Math.min(point.y, h-sz.height-10);
 		point.y = Math.max(point.y, 0);
-		point.x = Math.min(point.x, screen.width-sz.width-10);
+		point.x = Math.min(point.x, w-sz.width-10);
 		point.x = Math.max(point.x, 0);
 
 		setLocation(point);

src/PamView/paneloverlay/OverlayCheckboxMenuSelect.java

@@ -48,6 +48,9 @@ public class OverlayCheckboxMenuSelect implements ActionListener {
 				return;
 			}
 			DataSelectDialog dataSelectDialog = new DataSelectDialog(javaFrame, dataBlock, dataSelector, symbolChooser);
+			if (javaFrame == null) {
+				dataSelectDialog.moveToMouseLocation();
+			}
 			boolean ok = dataSelectDialog.showDialog();
 			if (ok) {
 				menuItem.setSelected(true);

src/clickTrainDetector/layout/dataselector/CTDataSelectPanel.java

@@ -293,7 +293,7 @@ public class CTDataSelectPanel implements PamDialogPanel {
 			int used = 0;
 			for (int i=0; i<classifierCheckBoxes.length; i++) {
 				if (classifierCheckBoxes[i].isSelected()) {
-					currentParams.classifier[used++] = classifiers.get(i).getSpeciesID(); 				
+					currentParams.classifier[used++] = classifiers.get(i).getSpeciesID(); 	
 				}
 			}
 		

src/rocca/RoccaSidePanel.java

@@ -115,8 +115,11 @@ public class RoccaSidePanel extends PamObserverAdapter implements PamSidePanel
                 (roccaControl.roccaProcess,
                 roccaControl.roccaParameters.getChannelMap());
         
-        // this one probably OK to never delete ? 
-        rsdb.setNaturalLifetimeMillis(Integer.MAX_VALUE);
+        /*
+         *  this one probably OK to never delete ? Nope lots of stuff goes in 
+         *  here, so it seems it will eventually bring the system down. 
+         */
+        rsdb.setNaturalLifetimeMillis(roccaControl.getMaxDataKeepTime());
         
         rdl = new RoccaDetectionLogger(this, rsdb);
         rsdb.SetLogging(rdl);

src/simulatedAcquisition/SimProcess.java

@@ -304,7 +304,7 @@ public class SimProcess extends DaqSystem implements PamSettings {
 			/* simulate the noise, need to divide fs by 2 to only generate for 0 to Nyquist to get correct values out.
 			 * that match the results of the noise band monitor modules.  
 			 */
-			double dbNse = simParameters.backgroundNoise + 10*Math.log10(getSampleRate()/2);
+			double dbNse = simParameters.backgroundNoise + 10*Math.log10(getSampleRate()/2.);
 			nse = daqControl.getDaqProcess().dbMicropascalToSignal(i, dbNse);
 			generateNoise(channelData, nse);
 //			generateNoiseQuickly(channelData, nse, i);

src/simulatedAcquisition/sounds/SimSignals.java

@@ -27,6 +27,9 @@ public class SimSignals  {
 		simSignalList.add(new ClickSound("Click", 3000, 3000, 2e-3, WINDOWTYPE.DECAY));
 		simSignalList.add(new ClickSound("Chirp", 3000, 6000, 0.1, WINDOWTYPE.TAPER10));
 		simSignalList.add(new ClickSound("Chirp", 3000, 8000, 0.5, WINDOWTYPE.TAPER10));
+		simSignalList.add(new ClickSound("Dolphin Click", 60000, 60000, 20.e-6, WINDOWTYPE.DECAY));
+		simSignalList.add(new ClickSound("Fin 20Hz", 20, 20, 0.5, WINDOWTYPE.HANN));
+		simSignalList.add(new ClickSound("Fin 40Hz", 40, 40, 0.5, WINDOWTYPE.HANN));
 //		simSignalList.add(new LinearChirp(simProcess.getSampleRate(), 3000, 6000, 0.1));
 //		simSignalList.add(new LinearChirp(simProcess.getSampleRate(), 3000, 8000, .5));
 		simSignalList.add(new RandomWhistles());