mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-22 07:02:29 +00:00
Remove a few terminal outputs
Mostly with file analysis, to reduce junk on terminal
This commit is contained in:
parent
6f6f7407ca
commit
3203a0a50f
2
pom.xml
2
pom.xml
@ -4,7 +4,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.pamguard</groupId>
|
<groupId>org.pamguard</groupId>
|
||||||
<artifactId>Pamguard</artifactId>
|
<artifactId>Pamguard</artifactId>
|
||||||
<version>2.02.06</version>
|
<version>2.02.06a</version>
|
||||||
<name>Pamguard Java12+</name>
|
<name>Pamguard Java12+</name>
|
||||||
<description>Pamguard for Java 12+, using Maven to control dependcies</description>
|
<description>Pamguard for Java 12+, using Maven to control dependcies</description>
|
||||||
<url>www.pamguard.org</url>
|
<url>www.pamguard.org</url>
|
||||||
|
@ -167,6 +167,8 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
|
|||||||
|
|
||||||
private SudListener sudListener;
|
private SudListener sudListener;
|
||||||
|
|
||||||
|
private boolean fullyStopped;
|
||||||
|
|
||||||
public FileInputSystem(AcquisitionControl acquisitionControl) {
|
public FileInputSystem(AcquisitionControl acquisitionControl) {
|
||||||
this.acquisitionControl = acquisitionControl;
|
this.acquisitionControl = acquisitionControl;
|
||||||
PamSettingManager.getInstance().registerSettings(this);
|
PamSettingManager.getInstance().registerSettings(this);
|
||||||
@ -739,6 +741,8 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
|
|||||||
|
|
||||||
dontStop = true;
|
dontStop = true;
|
||||||
|
|
||||||
|
fullyStopped = false;
|
||||||
|
|
||||||
theThread.start();
|
theThread.start();
|
||||||
|
|
||||||
setStreamStatus(STREAM_RUNNING);
|
setStreamStatus(STREAM_RUNNING);
|
||||||
@ -780,6 +784,9 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
|
|||||||
}
|
}
|
||||||
|
|
||||||
public void systemHasStopped(boolean wasRunning) {
|
public void systemHasStopped(boolean wasRunning) {
|
||||||
|
if (fullyStopped) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
long stopTime = System.currentTimeMillis();
|
long stopTime = System.currentTimeMillis();
|
||||||
if (getCurrentFile() == null) {
|
if (getCurrentFile() == null) {
|
||||||
return;
|
return;
|
||||||
@ -788,6 +795,7 @@ public class FileInputSystem extends DaqSystem implements ActionListener, PamSe
|
|||||||
double analSecs = (stopTime - fileStartTime) / 1000.;
|
double analSecs = (stopTime - fileStartTime) / 1000.;
|
||||||
System.out.println(String.format("File %s, SR=%dHz, length=%3.1fs took %3.1fs = %3.1fx real time",
|
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));
|
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
|
* PamDataUnits from them. Once a unit is created, tell this thread
|
||||||
* to wait until it has been used by the main 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
|
* File should have been opened in the constructor so just read it
|
||||||
* in in chunks and pass to datablock
|
* in in chunks and pass to datablock
|
||||||
|
@ -150,7 +150,7 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
|
|||||||
|
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
|
||||||
System.out.println("Restart later time action");
|
// System.out.println("Restart later time action");
|
||||||
newFileTimer.stop();
|
newFileTimer.stop();
|
||||||
PamController.getInstance().startLater(false); //don't save settings on restarts
|
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()) {
|
if (currentFile < allFiles.size()) {
|
||||||
// only restart if the file ended - not if it stopped
|
// only restart if the file ended - not if it stopped
|
||||||
if (getStreamStatus() == STREAM_ENDED) {
|
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();
|
newFileTimer.start();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -778,7 +778,7 @@ public class FolderInputSystem extends FileInputSystem implements PamSettings{
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public boolean startSystem(AcquisitionControl daqControl) {
|
public boolean startSystem(AcquisitionControl daqControl) {
|
||||||
System.out.println("Start system");
|
// System.out.println("Start system");
|
||||||
setFolderProgress();
|
setFolderProgress();
|
||||||
return super.startSystem(daqControl);
|
return super.startSystem(daqControl);
|
||||||
}
|
}
|
||||||
|
@ -1225,8 +1225,9 @@ public class PamController implements PamControllerInterface, PamSettings {
|
|||||||
if (PamCalendar.isSoundFile() == false) {
|
if (PamCalendar.isSoundFile() == false) {
|
||||||
PamCalendar.setSessionStartTime(PamCalendar.getTimeInMillis());
|
PamCalendar.setSessionStartTime(PamCalendar.getTimeInMillis());
|
||||||
}
|
}
|
||||||
|
if (PamCalendar.isSoundFile() == false) {
|
||||||
System.out.printf("PAMGUARD Startup took %d milliseconds at time %s\n", startDelay, PamCalendar.formatDateTime(PamCalendar.getSessionStartTime()));
|
System.out.printf("PAMGUARD Startup took %d milliseconds at time %s\n", startDelay, PamCalendar.formatDateTime(PamCalendar.getSessionStartTime()));
|
||||||
|
}
|
||||||
guiFrameManager.pamStarted();
|
guiFrameManager.pamStarted();
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
|
@ -31,7 +31,7 @@ public class PamguardVersionInfo {
|
|||||||
* Version number, major version.minorversion.sub-release.
|
* Version number, major version.minorversion.sub-release.
|
||||||
* Note: can't go higher than sub-release 'f'
|
* 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
|
* Release date
|
||||||
|
Loading…
Reference in New Issue
Block a user