diff --git a/README.html b/README.html index 477cee62..1a037634 100644 --- a/README.html +++ b/README.html @@ -368,8 +368,8 @@ should be something like:

-Xms384m -Xmx4096m -Djava.library.path=lib64 -jar Pamguard_xxxxxx.jar

The -Xms384m -Xmx4096m specify the initial and maximum heap -size for the JVM being used to run Pamguard i.e. how much memory it gets to -use. The default max size usually being too low.

+size for the JVM being used to run Pamguard i.e. how much memory it gets to use. +The default max size usually being too low.

The -Djava.library.path=lib64 tells the JVM that it should look in the folder called "lib64" for the required shared libraries (change @@ -381,8 +381,8 @@ a "-m" or "-v" to the list of java arguments. On Windows just run the appropriately named executable (e.g. PamguardBeta_MixedMode.exe or PamguardBeta_ViewerMode.exe):

-

java -Xms384m --Xmx4096m -Djava.library.path=lib64 -jar PamguardBeta_xxxxxx.jar -v

+

java +-Xms384m -Xmx4096m -Djava.library.path=lib64 -jar PamguardBeta_xxxxxx.jar -v

 

@@ -452,9 +452,8 @@ lang=EN-US>Latest Version 2.02.05 October 2022

Changes to GUI to make dialog shorter for low DPI screens.

- -

Complete rewrite of the classification system -to have nested classifiers which can be enabled or disabled.

+

Complete rewrite of the classification +system to have nested classifiers which can be enabled or disabled.

Changes to classification GUI to accommodate the new classification system.

@@ -535,7 +534,7 @@ running in real time. Added template names based on file names.

#13 Merging files when offline processing file folders: Had an error introduced in last release which caused it to fail to recognise gaps between files, meaning that some output data (i.e. after a gap) would have an -incorrect time stamp. This did not affect data if the ‘merge contiguous files’ +incorrect time stamp. This did not affect data if the ‘merge contiguous files’ option was not selected.

#14 Logger forms data were not plotting correctly. This was @@ -609,7 +608,7 @@ href="http://www.pamguard.org/downloads.php?cat_id=3">here.

Detection Group Localiser

-

This module has been renamed “Detection Grouper”, so as to +

This module has been renamed “Detection Grouper”, so as to avoid confusion with the Group 3D localizer. This is because the Detection Grouper is more for organizing data into groups to be localized than it is for doing localization.

@@ -730,9 +729,9 @@ included in a future release.

17.        An implementation of the Generalized Power Law Detector, developed by Tyler -Helble ([Helble et al., ‘A generalized power-law detection algorithm for humpback -whale vocalizations’, The Journal of the Acoustical Society of America, vol. -131, no. 4, pp. 2682–2699, 2012) is now available. For details, see the online +Helble ([Helble et al., ‘A generalized power-law detection algorithm for humpback +whale vocalizations’, The Journal of the Acoustical Society of America, vol. +131, no. 4, pp. 2682–2699, 2012) is now available. For details, see the online help

18.

+UID’s are also added to PAMGuard database tables.

Converting Old Data

@@ -2004,13 +2003,13 @@ UID’s are also added to PAMGuard database tables.

viewer they will automatically be converted. For safety, the original binary files will not be overwritten and the new data will be placed in a new folder on your computer with the same path as the old data, but suffixed with -‘_WithUID’, e.g. if your binary data were previously stored in the folder +‘_WithUID’, e.g. if your binary data were previously stored in the folder C:\MySurvey\binarydata the new data will be written to C:\MySurvey\binarydata_WithUID.

The additional UID column will be added to all database tables and populated with unique values. For data which are stored -in both the binary files and in database tables, the same UID’s will be used in +in both the binary files and in database tables, the same UID’s will be used in both data stores.

New Displays

@@ -2245,7 +2244,7 @@ November 2016

1.       Bug 303. Some ASIO sound cards not working with either ASIO system in PAMGuard. For the PAMGuard ASIO system, this was due to a data format used by some sound -cards never being properly implemented. For the “New ASIO system” which is +cards never being properly implemented. For the “New ASIO system” which is based on jAsioHost, the unpacking of that format contained a bug which returned incorrect numbers, so data were swamped with noise. Both systems are now fixed. By preference, users should use the PAMGuard ASIO system since the JAsioHost diff --git a/src/hfDaqCard/SmruDaqSystem.java b/src/hfDaqCard/SmruDaqSystem.java index 1d78e824..c6af0d72 100644 --- a/src/hfDaqCard/SmruDaqSystem.java +++ b/src/hfDaqCard/SmruDaqSystem.java @@ -17,6 +17,7 @@ import Acquisition.DaqSystem; import Acquisition.AudioDataQueue; import PamController.PamControlledUnitSettings; import PamController.PamController; +import PamController.PamGUIManager; import PamController.PamSettingManager; import PamController.PamSettings; import PamDetection.RawDataUnit; @@ -192,7 +193,12 @@ public class SmruDaqSystem extends DaqSystem implements PamSettings { + " in another instance of PAMGuard. \n" + "Check that no other instances of PAMGuard are open and try again. \nIf no other instances of PAMGuard are open " + "then you should cycle the power on the card(s) and restart PAMGuard"); - JOptionPane.showMessageDialog(daqControl.getGuiFrame(), msg, daqControl.getUnitName() + " Error", JOptionPane.ERROR_MESSAGE); + if (PamGUIManager.getGUIType() == PamGUIManager.NOGUI) { + System.out.println(msg); + } + else { + JOptionPane.showMessageDialog(daqControl.getGuiFrame(), msg, daqControl.getUnitName() + " Error", JOptionPane.ERROR_MESSAGE); + } PamController.getInstance().stopLater(); return false; }