nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-25 08:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Douglas Gillespie 2023-10-26 15:50:26 +01:00
commit bff8eeebc5
5 changed files with 101 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dependency-reduced-pom.xml
View File

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

8
pom.xml
View File

@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.pamguard</groupId>
<artifactId>Pamguard</artifactId>
<version>2.02.09a</version>
<version>2.02.09b</version>
<name>Pamguard Java12+</name>
<description>Pamguard for Java 12+, using Maven to control dependcies</description>
<url>www.pamguard.org</url>
@ -782,14 +782,14 @@
<!-- not in Maven repository
you may need to copy files from your downloaded PAMGuard source code, e.g. C:\Users\*yourreposfolder*\source\repos\PAMGuardPAMGuard\repo\pamguard\org\x3\2.2.2 to
C:\Users\*yourusername*\.m2\repository\pamguard\org\x3\2.2.2
-->
C:\Users\*yourusername*\.m2\repository\pamguard\org\x3\2.2.2-->
<dependency>
<groupId>pamguard.org</groupId>
<artifactId>x3</artifactId>
<version>2.2.2</version>
<version>2.2.3</version>
</dependency>
<!-- https://mvnrepository.com/artifact/it.sauronsoftware/jave -->
<dependency>
<groupId>it.sauronsoftware</groupId>

11
src/Acquisition/pamAudio/WavAudioFile.java
View File

@ -14,6 +14,7 @@ import javax.sound.sampled.UnsupportedAudioFileException;
import org.codehaus.plexus.util.FileUtils;
import Acquisition.offlineFuncs.AquisitionLoadPoint;
import PamDetection.RawDataUnit;
//import PamUtils.CPUMonitor;
import PamguardMVC.PamDataBlock;
import PamguardMVC.dataOffline.OfflineDataLoadInfo;
import dataMap.OfflineDataMap;
@ -70,9 +71,13 @@ public class WavAudioFile implements PamAudioFileLoader {
FileDataMapPoint mapPoint = offlineFileServer.findFirstMapPoint(mapIt, offlineDataLoadInfo.getStartMillis(), offlineDataLoadInfo.getEndMillis());
if (openSoundFile(mapPoint.getSoundFile()) == false) {
System.out.println("Could not open .wav sound file " + mapPoint.getSoundFile().getAbsolutePath());
System.out.println("Could not open sound file " + mapPoint.getSoundFile().getAbsolutePath());
return false;
}
if (offlineDataLoadInfo.cancel) {
return false;
}
File soundFile;
ByteConverter byteConverter = ByteConverter.createByteConverter(audioFormat);
@ -106,7 +111,11 @@ public class WavAudioFile implements PamAudioFileLoader {
try {
//System.out.println("Skipped " + skipped+ " " + skipBytes + " " + audioInputStream.available());
// CPUMonitor cpuMonitor = new CPUMonitor();
// cpuMonitor.start();
skipped = audioInputStream.skip(skipBytes);
// cpuMonitor.stop();
// System.out.println(cpuMonitor.getSummary("Sound skip: " + skipBytes + " bytes "));
//System.out.println("Offline " + (offlineDataLoadInfo.getStartMillis()-currentTime) + " ms : frame size: " + audioFormat.getFrameSize());
} catch (IOException e) {

2
src/PamController/PamguardVersionInfo.java
View File

@ -31,7 +31,7 @@ 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.09a";
static public final String version = "2.02.09b";
/**
* Release date

78
src/PamguardMVC/dataOffline/OfflineDataLoading.java
View File

@ -175,13 +175,13 @@ public class OfflineDataLoading<T extends PamDataUnit> {
long t4 = t2;
// String orderDates = String.format(" %s to %s",
// PamCalendar.formatDateTime(startMillis), PamCalendar.formatDateTime(endMillis));
// System.out.printf("Offline data order in %s %s from %s to %s\n", pamDataBlock.getDataName(), offlineDataInfo.toString(),
// PamCalendar.formatDBDateTime(offlineDataInfo.getStartMillis()),
// PamCalendar.formatDBDateTime(offlineDataInfo.getEndMillis()));
// if (offlineDataInfo.getEndMillis()-offlineDataInfo.getStartMillis() > 3600000L) {
// System.out.printf("Stupid long load time !");
// return;
// }
// System.out.printf("Offline data order in %s %s from %s to %s\n", pamDataBlock.getDataName(), offlineDataInfo.toString(),
// PamCalendar.formatDBDateTime(offlineDataInfo.getStartMillis()),
// PamCalendar.formatDBDateTime(offlineDataInfo.getEndMillis()));
// if (offlineDataInfo.getEndMillis()-offlineDataInfo.getStartMillis() > 3600000L) {
// System.out.printf("Stupid long load time !");
// return;
// }
try {
if (orderData != null) {
// System.out.println("order Data is not null");
@ -214,18 +214,18 @@ public class OfflineDataLoading<T extends PamDataUnit> {
t3 = System.currentTimeMillis();
waitingDataLoads.add(offlineDataInfo);
return;
// // System.out.println("Wait for old lot to complete " + orderDates);
// while (true) {
// if (orderData==null || orderData.isDone() || orderData.isCancelled()) {
// break;
// }
// waitCount++;
// try {
// Thread.sleep(10, 0);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
// }
// // System.out.println("Wait for old lot to complete " + orderDates);
// while (true) {
// if (orderData==null || orderData.isDone() || orderData.isCancelled()) {
// break;
// }
// waitCount++;
// try {
// Thread.sleep(10, 0);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
// }
}
t4 = System.currentTimeMillis() - t3;
}
@ -259,10 +259,13 @@ public class OfflineDataLoading<T extends PamDataUnit> {
* @param que
*/
public void cancelDataOrder(boolean que) {
// threadMessage("Calling cancelDataOrder");
synchronized (orderLock) {
// threadMessage("cancelDataOrder is in synchronized oderLock");
if (orderData != null) {
try {
orderData.cancelOrder();
boolean isCancelled = orderData.cancelOrder();
// threadMessage("candelDataOrder returned: isCancelled = " + isCancelled);
}
catch (NullPointerException e) {
System.err.println("Null pointer in Cancel data order " + e.getMessage());
@ -319,16 +322,19 @@ public class OfflineDataLoading<T extends PamDataUnit> {
@Override
protected Integer doInBackground() {
// threadMessage("Start background");
try {
// System.out.println("Enter get offline data " + pamDataBlock.getDataName() + " Thread " + Thread.currentThread().getName());
// System.out.println("Enter get offline data " + pamDataBlock.getDataName() + " Thread " + Thread.currentThread().getName());
clearAllFFTBlocks();
// threadMessage("Called clearAllFTBlocks");
int ans = getOfflineData(offlineDataInfo);
// System.out.println("Leave get offline data " + pamDataBlock.getDataName());
// System.out.println("Leave get offline data " + pamDataBlock.getDataName());
if (this == orderData) {
orderData = null;
}
// threadMessage("End background exit code " + ans);
return ans;
}
catch (Exception e) {
@ -338,9 +344,9 @@ public class OfflineDataLoading<T extends PamDataUnit> {
}
return 0;
}
}
@Override
protected void done() {
if (this == orderData) {
@ -354,7 +360,7 @@ public class OfflineDataLoading<T extends PamDataUnit> {
if (isCancelled()) {
status = REQUEST_INTERRUPTED;
//check whether the cancelled thread should be saved for later loading.
// System.out.println("The load has been cancelled: " + offlineDataInfo.getCurrentObserver().getObserverName());
// System.out.println("The load has been cancelled: " + offlineDataInfo.getCurrentObserver().getObserverName());
checkDataReloadQue(offlineDataInfo);
}
else {
@ -376,11 +382,11 @@ public class OfflineDataLoading<T extends PamDataUnit> {
}
// System.out.println("WAITING DATA LOAD");
// System.out.println("WAITING DATA LOAD");
for (int i=0; i<waitingDataLoads.size(); i++){
// System.out.println("OfflineDataLoading.Done(): " + waitingDataLoads.get(i).getCurrentObserver().getObserverName());
// System.out.println("OfflineDataLoading.Done(): " + waitingDataLoads.get(i).getCurrentObserver().getObserverName());
}
// System.out.println("WAITING DATA END");
// System.out.println("WAITING DATA END");
if (!isCancelled()) launchQuedReloadThread();
@ -394,11 +400,17 @@ public class OfflineDataLoading<T extends PamDataUnit> {
}
// private void threadMessage(String message) {
// String name = Thread.currentThread().getName();
// String now = PamCalendar.formatDBDateTime(System.currentTimeMillis(), true);
// System.out.printf("Thread %s load for %s at %s: %s\n", name, pamDataBlock.getDataName(), now, message);
// }
private void launchQuedReloadThread(){
// System.out.println(" launchQuedReloadThread(): ");
// System.out.println(" launchQuedReloadThread(): ");
if (waitingDataLoads.size()>=1){
OfflineDataLoadInfo offlineDataInfo=waitingDataLoads.get(0);
// System.out.println("Removing: " + offlineDataInfo.getCurrentObserver().getObserverName());
// System.out.println("Removing: " + offlineDataInfo.getCurrentObserver().getObserverName());
waitingDataLoads.remove(0);
this.orderOfflineData(offlineDataInfo);
}
@ -470,15 +482,15 @@ public class OfflineDataLoading<T extends PamDataUnit> {
pamDataBlock.clearAll();
// System.out.println("Start loading some offline data: from " + PamCalendar.formatDateTime(offlineDataInfo.getStartMillis() ) +" to "+
// PamCalendar.formatDateTime(offlineDataInfo.getEndMillis() ) + " "+offlineDataInfo.getCurrentObserver().getObserverName() +
// " "+offlineDataInfo.getLoadKeepLayers());
// System.out.println("Start loading some offline data: from " + PamCalendar.formatDateTime(offlineDataInfo.getStartMillis() ) +" to "+
// PamCalendar.formatDateTime(offlineDataInfo.getEndMillis() ) + " "+offlineDataInfo.getCurrentObserver().getObserverName() +
// " "+offlineDataInfo.getLoadKeepLayers());
lastRequestAnswer = pamDataBlock.getParentProcess().getOfflineData(offlineDataInfo);
// System.out.println(String.format("getOfflineData %s has %d units ",
// getDataName(), getUnitsCount()));
// System.out.println("Orderring done: " + offlineDataInfo.getCurrentObserver().getObserverName() + " " + offlineDataInfo.getLoadKeepLayers());
// System.out.println("Orderring done: " + offlineDataInfo.getCurrentObserver().getObserverName() + " " + offlineDataInfo.getLoadKeepLayers());
//reset some of the changeable variables in offline data info.
offlineDataInfo.reset();