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

Remove a few terminal outputs

Browse Source 
Mostly with file analysis, to reduce junk on terminal
This commit is contained in:
Douglas Gillespie 2022-11-18 10:52:50 +00:00
parent 6f6f7407ca
commit 3203a0a50f
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

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

10
src/Acquisition/FileInputSystem.java
View File

@ -167,6 +167,8 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
private SudListener sudListener;
private boolean fullyStopped;
public FileInputSystem(AcquisitionControl acquisitionControl) {
this.acquisitionControl = acquisitionControl;
PamSettingManager.getInstance().registerSettings(this);
@ -738,6 +740,8 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
if (audioStream == null) return false;
dontStop = true;
fullyStopped = false;
theThread.start();
@ -780,6 +784,9 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
}
public void systemHasStopped(boolean wasRunning) {
if (fullyStopped) {
return;
}
long stopTime = System.currentTimeMillis();
if (getCurrentFile() == null) {
return;
@ -788,6 +795,7 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
double analSecs = (stopTime - fileStartTime) / 1000.;
System.out.println(String.format("File %s, SR=%dHz, length=%3.1fs took %3.1fs = %3.1fx real time",
getCurrentFile().getName(), (int)getSampleRate(), fileSecs, analSecs, fileSecs / analSecs));
fullyStopped = true;
}
/**
@ -933,7 +941,7 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
* PamDataUnits from them. Once a unit is created, tell this thread
* to wait until it has been used by the main thread.
*/
System.out.println("File system start processing");
// System.out.println("File system start processing");
/*
* File should have been opened in the constructor so just read it
* in in chunks and pass to datablock

6
src/Acquisition/FolderInputSystem.java
View File

@ -150,7 +150,7 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
public void actionPerformed(ActionEvent e) {
System.out.println("Restart later time action");
// System.out.println("Restart later time action");
newFileTimer.stop();
PamController.getInstance().startLater(false); //don't save settings on restarts
@ -655,7 +655,7 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
if (currentFile < allFiles.size()) {
// only restart if the file ended - not if it stopped
if (getStreamStatus() == STREAM_ENDED) {
System.out.println(String.format("Start new file timer (file %d/%d)",currentFile+1,allFiles.size()));
// System.out.println(String.format("Start new file timer (file %d/%d)",currentFile+1,allFiles.size()));
newFileTimer.start();
}
}
@ -778,7 +778,7 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
@Override
public boolean startSystem(AcquisitionControl daqControl) {
System.out.println("Start system");
// System.out.println("Start system");
setFolderProgress();
return super.startSystem(daqControl);
}

5
src/PamController/PamController.java
View File

@ -1225,8 +1225,9 @@ public class PamController implements PamControllerInterface, PamSettings {
if (PamCalendar.isSoundFile() == false) {
PamCalendar.setSessionStartTime(PamCalendar.getTimeInMillis());
}
System.out.printf("PAMGUARD Startup took %d milliseconds at time %s\n", startDelay, PamCalendar.formatDateTime(PamCalendar.getSessionStartTime()));
if (PamCalendar.isSoundFile() == false) {
System.out.printf("PAMGUARD Startup took %d milliseconds at time %s\n", startDelay, PamCalendar.formatDateTime(PamCalendar.getSessionStartTime()));
}
guiFrameManager.pamStarted();
return true;

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.06";
static public final String version = "2.02.06a";
/**
* Release date