Data Map: “Scroll To Data” pop-up menu, +which didn’t always scroll to the correct place, is now fixed.
+ +Bearing Localiser offline: If reprocessing +bearings, the localizer was not correctly loading required raw or FFT data to +input to the cross correlation algorithm. This is now fixed so that you can +reprocess bearings in viewer mode.
+ +Map files: Added additional exception +handlers to handle corrupt map files.
+Restart Options: When you restart -processing of offline files, if output data already exist (binary data of -within database tables) you will be asked if you want to overwrite the data, cancel, +processing of offline files, if output data already exist (binary data of within +database tables) you will be asked if you want to overwrite the data, cancel, or try to continue from where to left off.
Updated SoundTrap sud file interface so
@@ -486,13 +497,12 @@ angle offsets applied to static hydrophones in viewer mode. This is now fixed. <
Click tool bar: Correctly shows event
selection options even if no species classification options are in place. Fixed Landmarks: Earlier versions were
-‘losing’ these every time PAMGuard started or new data were loaded in viewer
-mode. Now fixed. Fixed Landmarks: Earlier versions were ‘losing’
+these every time PAMGuard started or new data were loaded in viewer mode. Now
+fixed. ROCCA: Fixed (another) memory leak which
-caused PAMGuard to crash when processing large data sets with the ROCCA classifier.
- ROCCA: Fixed (another) memory leak which caused
+PAMGuard to crash when processing large data sets with the ROCCA classifier. Ishmael Modules: Fixed bug which
occasionally caused crashes when processing many files offline.
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.
+Changes to classification GUI to accommodate +the new classification system.
Addition of data selectors to the minimum number of clicks accepted by the classifier. This allows the click-by-click @@ -581,8 +591,8 @@ description of the algorithm, screen grabs and examples.
Help documentation for Matched Click Classifier
-Database logging of offline tasks (such as -click re-classification, bearing calculation, etc.)
+Database logging of offline tasks (such as click +re-classification, bearing calculation, etc.)
Data selector for Whistle Classifier module
@@ -657,9 +667,8 @@ the TF FX display to crash if no data were displayed.See major release notes for V 2.02.01 below.
-Bug 495: TD FX display throws -NullPointerException if user has removed all data units and then moves mouse -over display area.
+Bug 495: TD FX display throws NullPointerException +if user has removed all data units and then moves mouse over display area.
Changes have been made to the binary file format to support -the output of additional noise outputs for certain detectors (See below). -Binary files created with this version will not be compatible with earlier -versions 2.01.### and below. This version will read and may convert earlier -format binary files.
+Changes have been made to the binary file format to support the +output of additional noise outputs for certain detectors (See below). Binary +files created with this version will not be compatible with earlier versions +2.01.### and below. This version will read and may convert earlier format +binary files.
@@ -816,20 +825,20 @@ decimating/upsampling by a non-integer amount
16. Noise Level Outputs - as an aid to performance diagnosis, some detectors -(currently the GPL, Click Detector and Whistle and Moan Detector) are outputting -additional noise metrics to their binary output files. These can be read with -the PAMGuard -Matlab library and used to diagnose system performance in varying noise -conditions. Improved displays within PAMGuard for these noise metrics will be -included in a future release.
+(currently the GPL, Click Detector and Whistle and Moan Detector) are +outputting additional noise metrics to their binary output files. These can be +read with the PAMGuard +Matlab library and used to diagnose system performance in varying noise conditions. +Improved displays within PAMGuard for these noise metrics will be 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 help
+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 help18. @@ -941,9 +950,10 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> &nb lang=EN-US> Better auto-scaling in Ishmael Detector graphics window.
7. -Change to Windows temporary folder location, to get around Windows Security -settings that were preventing some modules from working properly.
+lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> Change to Windows temporary folder location, to get around +Windows Security settings that were preventing some modules from working +properly. @@ -1171,8 +1181,8 @@ lang=EN-US> Bug 436. Bug in Serial Port interface was occassionally causing PAMGuard to crash without error message.5. -Bug 437. Right whale detector crashing if no input was set.
+lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> Bug 437. Right whale detector crashing if no input was set.6. @@ -1244,8 +1254,8 @@ classify clicks.
2. Added option in Sound Acquisition settings dialog to -override filename time stamp and use PC local time instead.
+lang=EN-US> Added option in Sound Acquisition settings dialog to override +filename time stamp and use PC local time instead.3. Added adaptive noise filter to Ishmael Detectors.
5. Many upgrades to the Sound Playback module, including a -high-pass filter, gain control, and the ability to mix wavefrom and envelope -data together to listen to high-frequency clicks and dolphin whistles at the -same time.
+lang=EN-US> Many upgrades to the Sound Playback module, including a high-pass +filter, gain control, and the ability to mix wavefrom and envelope data +together to listen to high-frequency clicks and dolphin whistles at the same +time.6. @@ -1621,9 +1631,9 @@ lang=EN-US> Added decimal degrees option to latitude/longitude dialog.
2. Added option in the Click Delay parameters to restrict the -number of initial samples used in the calculation. This can be useful for -cleaning up delays in the presence of echoes and small time delays. +lang=EN-US> Added option in the Click Delay parameters to restrict the number +of initial samples used in the calculation. This can be useful for cleaning up +delays in the presence of echoes and small time delays.3. @@ -1721,10 +1731,10 @@ lang=EN-US> Better way of coupling scrollers in User Display panels - see new options in main menu.
2. -Added Matched Template Click Classifier. Classifies clicks based on an ideal -template to match and a template to reject. An example of this is to classify -beaked whale clicks in an environment with dolphin clicks.
+lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> Added Matched Template Click Classifier. Classifies clicks +based on an ideal template to match and a template to reject. An example of +this is to classify beaked whale clicks in an environment with dolphin clicks.3. @@ -1736,10 +1746,10 @@ lang=EN-US> Added ability to read differential GPS data.
5. Added check for duplicate settings in the psf file when -exiting Pamguard. If duplicate settings are found, user is given the option to -leave them in the psf or get rid of them. Duplicate settings are ignored by -Pamguard, but can cause the psf file to grow large over time.
+lang=EN-US> Added check for duplicate settings in the psf file when exiting +Pamguard. If duplicate settings are found, user is given the option to leave +them in the psf or get rid of them. Duplicate settings are ignored by Pamguard, +but can cause the psf file to grow large over time.6. @@ -1884,8 +1894,8 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> &nb
5. -Bug 359. Pamguard crashes when selecting auto-scale option in Noise -Monitor module
+Bug 359. Pamguard crashes when selecting auto-scale option in Noise Monitor +module6. @@ -1912,8 +1922,8 @@ Beta versions
11. -Bug 366. Rocca manual whistle contour extraction throws error when -trying to classify a boxed whistle
+Bug 366. Rocca manual whistle contour extraction throws error when trying +to classify a boxed whistleUpgrades
@@ -1988,8 +1998,8 @@ invalid parameters. Have added diagnostics to prevent this.Upgrades
1. -User is now able to specify Soundtrap date/time format
+lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> User is now able to specify Soundtrap date/time format @@ -2035,8 +2045,8 @@ Upgraded jFLAC library to fix.7. -Bug 332. Fixed problem with secondary maps (those not in the main -display) not displaying detections.
+Bug 332. Fixed problem with secondary maps (those not in the main display) +not displaying detections.8. @@ -2161,10 +2171,10 @@ so they will no longer work with older PAMGuard versions.
2. -Display colour options will be lost and most data displayed -on the map may default to black. This is due to the above changes to how -colours are managed. Changing back to the colours of your choice is relatively -simple through the PAMGuard GUI.
+Display colour options will be lost and most data +displayed on the map may default to black. This is due to the above changes to +how colours are managed. Changing back to the colours of your choice is +relatively simple through the PAMGuard GUI.@@ -2324,8 +2334,8 @@ both 64 bit and 32 bit installations. PAMGuard psf files are now registered in the Windows Registry, so double-clicking on a psf file should run PAMGuard in normal mode (as opposed to Viewer or Mixed modes). Note that the Windows Registry can only hold a single executable reference for psf files; therefore, -for users with multiple installations of PAMGuard, double-clicking on a psf -will run the most-recently installed version of PAMGuard on the system. +for users with multiple installations of PAMGuard, double-clicking on a psf will +run the most-recently installed version of PAMGuard on the system.
2. -Bug 305. Date and Time not being correctly -extracted from wav files created using SoundTrap recorders. Fixed by correctly -finding and unpacking information in the accompanying xml log files that come -with SoundTrap files.
+Bug 305. Date and Time not being correctly extracted +from wav files created using SoundTrap recorders. Fixed by correctly finding +and unpacking information in the accompanying xml log files that come with +SoundTrap files.4. @@ -2591,9 +2601,9 @@ changes in future releases. New PAMGuard releases will always be able to open older binary files, however, with previous PAMGuard releases if a newer file format was opened, then PAMGuard was unable to check that the file format was newer and would attempt to read the files and might even corrupt them. Now it -will recognise that it cannot open the files, display appropriate error -messages and not attempt to read the files. NOTE that at this time there are no -planned file format changes and that this is purely a future proofing exercise.
+will recognise that it cannot open the files, display appropriate error messages +and not attempt to read the files. NOTE that at this time there are no planned +file format changes and that this is purely a future proofing exercise.7. @@ -2719,8 +2729,8 @@ same click multiple times
1. -Bug 253. Database import fails when Access database -contains queries. Fixed.
+Bug 253. Database import fails when Access database contains +queries. Fixed.2. @@ -2794,13 +2804,13 @@ for details.
3. -GPS Loading into PAMGuard Viewer. This has been -modified so that the rules governing GPS data collection and storage also apply -when loading data from the database. For instance, if you've stored all GPS -data, you've probably got a record every second in the database which can -create memory overflows if you try to load a lot of data in the viewer. You can -now tell PAMGuard to only load a data point every n seconds which will reduce -the number of points loaded. Useful when making large scale overview maps of a +GPS Loading into PAMGuard Viewer. This has been modified +so that the rules governing GPS data collection and storage also apply when +loading data from the database. For instance, if you've stored all GPS data, +you've probably got a record every second in the database which can create +memory overflows if you try to load a lot of data in the viewer. You can now +tell PAMGuard to only load a data point every n seconds which will reduce the +number of points loaded. Useful when making large scale overview maps of a survey.
4.http://dev.mysql.com/downloads/mysq
6.
-Changed Rocca Measurement menu item to open a window
-containing click events, instead of a submenu listing click events. Using
-a window simplifies multiple event selections
7. @@ -3099,8 +3109,9 @@ to read on a time. Fixed
Menu Layout
-The PAMGuard menus have been rearranged into a more intuitive -grouping which we believe will help users find functionality more easily.
+The PAMGuard menus have been rearranged into a more +intuitive grouping which we believe will help users find functionality more +easily.
'Detection' menu has been renamed to 'Settings' since many menu items within this menu were not directly to do with 'Detection'.
@@ -3172,8 +3183,8 @@ correctly calculated in real world coordinates.Wild ArcGIS Interface (Maps and Mapping group)
This module, developed by Michael Oswald / SWFSC, allows -PAMGuard to output data in a format suitable for display in the WILD ArcGIS marine -mammal survey package. See online help for details.
+PAMGuard to output data in a format suitable for display in the WILD ArcGIS +marine mammal survey package. See online help for details.Alarms (Utilities Group)
@@ -3230,9 +3241,9 @@ different. Details are available in the online help.Can now read raw audio data direct from FLAC files. FLAC is a lossless compression -algorithm for audio data. Files, or folders of files are accessed in the same -way as WAV and AIFF files in the Sound Acquisition module. In a future release -we also hope to provide support for writing FLAC files from the sound recorder +algorithm for audio data. Files, or folders of files are accessed in the same way +as WAV and AIFF files in the Sound Acquisition module. In a future release we +also hope to provide support for writing FLAC files from the sound recorder module.
Sound Recorder Module
@@ -3290,8 +3301,8 @@ whistle.Better control of data in viewer -mode, making is easy to scroll through and view data for short time periods.
+Better control of data in viewer mode, +making is easy to scroll through and view data for short time periods.
GPS
@@ -3475,9 +3486,9 @@ have implemented database storage for output of these modules.' -Radar Display: A bug which stopped the radar display from correctly displaying -bearings to whistles from arrays containing more than two hydrophone elements -has been fixed.
+Radar Display: A bug which stopped the radar display from correctly +displaying bearings to whistles from arrays containing more than two hydrophone +elements has been fixed.' @@ -3589,8 +3600,8 @@ Symbol'>'' -Bearings can be calculated using the envelope of the waveform rather than -the full waveform. The waveform or envelope can also be filtered prior to +Bearings can be calculated using the envelope of the waveform rather +than the full waveform. The waveform or envelope can also be filtered prior to bearing calculation.
' -Whistle classifier has some new features in the classifier training -panel. It is also now possible to export training data files directly from -binary data files.
+Whistle classifier has some new features in the classifier training panel. +It is also now possible to export training data files directly from binary data +files.'
@@ -3746,8 +3757,8 @@ frequency division (i.e. previous versions would convert well from 96kHz to
Bug fixes 1. Placement of axes on some displays (array manager and depth
-side panel). Problem in 1.9.01 Beta now fixed. 1. Placement of axes on some displays (array manager and
+depth side panel). Problem in 1.9.01 Beta now fixed. 2. Fixed problems of NMEA read out not restarting after a
serial drop out. NMEA now restarts correctly.
Windows Installer now sets permissions on PAMGUARD folder so -that don't need to be an administrator in order to create new files in that -directory. Prevents problems especially under Vista/Windows 7 when saving psfs -and recording sounds to the default directory.
+that don't need to be an administrator in order to create new files in that directory. +Prevents problems especially under Vista/Windows 7 when saving psfs and +recording sounds to the default directory.' -Play back of high frequency wav files through National Instruments (NI) -cards: When analysing wav files, sound can be output at high frequency -(depending on the specification of the NI card). The primary motivation for -this has been to develop a test bed for high frequency sound acquisition -whereby we can play 500kHz recordings of harbour porpoise out of an NI card on -one machine, into NI cards on a different machine which are testing high -frequency versions of the click detector.
+Play back of high frequency wav files through National Instruments (NI) cards: +When analysing wav files, sound can be output at high frequency (depending on +the specification of the NI card). The primary motivation for this has been to +develop a test bed for high frequency sound acquisition whereby we can play +500kHz recordings of harbour porpoise out of an NI card on one machine, into NI +cards on a different machine which are testing high frequency versions of the +click detector.' @@ -4022,10 +4033,10 @@ synchronisation.
' -Wigner time-frequency plot for the click detector. Clicks are NOT automatically -displayed in the Winger window as they are for the waveform and spectrum -windows since the Wigner transformation is very time consuming. Clicks will be -displayed if you select them with the mouse.
+Wigner time-frequency plot for the click detector. Clicks are NOT +automatically displayed in the Winger window as they are for the waveform and +spectrum windows since the Wigner transformation is very time consuming. Clicks +will be displayed if you select them with the mouse.' @@ -4039,13 +4050,13 @@ Symbol'>''' -Channel lists in output data streams of Decimator and other modules fixed, -so that when channel numbers change, downstream modules configurations get the -correct list of available channels.
+Channel lists in output data streams of Decimator and other modules +fixed, so that when channel numbers change, downstream modules configurations +get the correct list of available channels.' @@ -4701,7 +4712,8 @@ Symbol'>''1.0Beta 22 Jan 2008 - Pamguard -starts two releases, core and beta release,
+class=Heading2Char>1.0Beta 22 Jan 2008 - +Pamguard starts two releases, core and beta release,this is the beta release
@@ -4763,8 +4775,8 @@ Symbol'>'' -Multi animal click tracking with least squares fit calculation of position -on map +Multi animal click tracking with least squares fit calculation of +position on map' @@ -4819,10 +4831,10 @@ configurable user displays which support real time scrolling spectrograms and radar displays. Detection and localisation information can be optionally displayed on the map display.Map enhancements include improved scrolling whereby the user can click and drag to pan the area. PamGuard can now interface -with MySQL database servers and users can easily select which information is -logged. (This replaces the previous 'flat-file' logging feature). A simulation -module allows virtual vocalising animals to be placed on the map to assist in -training and development. Extensive online user help has been added to PamGuard +with MySQL database servers and users can easily select which information is logged. +(This replaces the previous 'flat-file' logging feature). A simulation module +allows virtual vocalising animals to be placed on the map to assist in training +and development. Extensive online user help has been added to PamGuard Application
" + "This plug-in will not be available for loading"; String help = null; - int ans = WarnOnce.showWarning(PamController.getMainFrame(), title, msg, WarnOnce.WARNING_MESSAGE, help, e1); + int ans = WarnOnce.showWarning(PamController.getInstance().getGuiFrameManager().getFrame(0), title, msg, WarnOnce.WARNING_MESSAGE, help, e1); System.err.println("Exception while loading " + className); - System.err.println(e1.getMessage()); continue; } } @@ -1269,7 +1243,7 @@ final public class PamModel implements PamModelInterface, PamSettings { "for help.
" + "This plug-in will not be available for loading"; String help = null; - int ans = WarnOnce.showWarning(PamController.getMainFrame(), title, msg, WarnOnce.WARNING_MESSAGE, help, ex); + int ans = WarnOnce.showWarning(PamController.getInstance().getGuiFrameManager().getFrame(0), title, msg, WarnOnce.WARNING_MESSAGE, help, ex); System.err.println("Exception while loading " + jarList.get(i).getName()); continue; } @@ -1294,7 +1268,7 @@ final public class PamModel implements PamModelInterface, PamSettings { // instantiate the plugin control class using the custom class loader try { - File classFile = new File(pf.getJarFile()); +// File classFile = new File(pf.getJarFile()); //URLClassLoader cl = new URLClassLoader(new URL[]{classFile.toURI().toURL()}); // mi = PamModuleInfo.registerControlledUnit(pf.getClassName(), pf.getDescription(),cl); mi = PamModuleInfo.registerControlledUnit(pf.getClassName(), pf.getDescription(),classLoader); @@ -1360,7 +1334,7 @@ final public class PamModel implements PamModelInterface, PamSettings { "for help.
" + "This plug-in will not be available for loading"; String help = null; - int ans = WarnOnce.showWarning(PamController.getMainFrame(), title, msg, WarnOnce.WARNING_MESSAGE, help, e1); + int ans = WarnOnce.showWarning(PamController.getInstance().getGuiFrameManager().getFrame(0), title, msg, WarnOnce.WARNING_MESSAGE, help, e1); System.err.println("Exception while loading " + pf.getDefaultName()); pluginList.remove(pf); continue; From a8699086cee8eaadf8d8ddc8e0dbae410afe4c20 Mon Sep 17 00:00:00 2001 From: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Tue, 30 May 2023 14:59:53 +0100 Subject: [PATCH 3/6] GPS NMEA Initials Add a wildcard option so that GPS will use any valid RMC or GGA string irrespective of the first to characters of the string name. --- src/Acquisition/filetypes/SUDFileType.java | 2 +- src/GPS/GPSControl.java | 25 +++++++++++++ src/GPS/GPSParameters.java | 2 ++ src/GPS/GPSParametersDialog.java | 34 ++++++++++++------ src/GPS/ProcessNmeaData.java | 21 +++++------ src/GPS/UpdateClockDialog.java | 5 +-- .../mapping/NMEA/docs/ConfiguringGPS.html | 5 ++- .../mapping/NMEA/docs/images/GPSOptions1.png | Bin 16360 -> 13783 bytes 8 files changed, 70 insertions(+), 24 deletions(-) diff --git a/src/Acquisition/filetypes/SUDFileType.java b/src/Acquisition/filetypes/SUDFileType.java index 80fd0a36..ef1d8a7a 100644 --- a/src/Acquisition/filetypes/SUDFileType.java +++ b/src/Acquisition/filetypes/SUDFileType.java @@ -22,7 +22,7 @@ public class SUDFileType extends SoundFileType { if (isShown) { return; } - WarnOnce.showWarning("SoundTrap SUD Files", sudInfoText, WarnOnce.OK_OPTION); +// WarnOnce.showWarning("SoundTrap SUD Files", sudInfoText, WarnOnce.OK_OPTION); isShown = true; } diff --git a/src/GPS/GPSControl.java b/src/GPS/GPSControl.java index d4434f5a..4bbca604 100644 --- a/src/GPS/GPSControl.java +++ b/src/GPS/GPSControl.java @@ -245,6 +245,31 @@ public class GPSControl extends PamControlledUnit implements PamSettings, Positi public GpsDataUnit getShipPosition(long timeMilliseconds) { return getGpsDataBlock().getClosestUnitMillis(timeMilliseconds); } + /** + * Do we want this string ? It will be either RMC or GGA and may want wildcarding + * @param stringId + * @return + */ + public boolean wantString(String stringId) { + if (stringId == null || stringId.length() < 6) { + return false; + } + if (gpsControl.gpsParameters.allowWildcard) { + String lastBit = stringId.substring(3, 6); + switch (gpsControl.gpsParameters.mainString) { + case GPSParameters.READ_RMC: + return lastBit.equals("RMC"); + case GPSParameters.READ_GGA: + return lastBit.equals("GGA"); + default: + return false; + } + } + else { + String wantedString = gpsControl.getWantedString(); + return stringId.equals(wantedString); + } + } /** * Get the name of the string we're wanting. diff --git a/src/GPS/GPSParameters.java b/src/GPS/GPSParameters.java index 1046907f..719a59ca 100644 --- a/src/GPS/GPSParameters.java +++ b/src/GPS/GPSParameters.java @@ -59,6 +59,8 @@ public class GPSParameters implements Serializable, Cloneable, ManagedParameters public String rmcInitials = "GP"; public String ggaInitials = "GP"; + public boolean allowWildcard = true; + /** * Attempt to read true heading information */ diff --git a/src/GPS/GPSParametersDialog.java b/src/GPS/GPSParametersDialog.java index 73180239..6c54f139 100644 --- a/src/GPS/GPSParametersDialog.java +++ b/src/GPS/GPSParametersDialog.java @@ -149,9 +149,9 @@ public class GPSParametersDialog extends PamDialog { } } public static GPSParameters showDialog(Frame parentFrame, GPSParameters gpsParameters) { - if (parentFrame != lastFrame || gpsParametersDialog == null) { +// if (parentFrame != lastFrame || gpsParametersDialog == null) { gpsParametersDialog = new GPSParametersDialog(parentFrame); - } +// } gpsParametersDialog.gpsParameters = gpsParameters.clone(); gpsParametersDialog.setParams(); gpsParametersDialog.setVisible(true); @@ -335,6 +335,7 @@ public class GPSParametersDialog extends PamDialog { JRadioButton ggaString; JTextField rmcInitials; JTextField ggaInitials; + JCheckBox allowWildcard; public MainStringPanel() { super(); setBorder(new TitledBorder("Main Nav' data string")); @@ -344,9 +345,17 @@ public class GPSParametersDialog extends PamDialog { c.fill = GridBagConstraints.HORIZONTAL; ButtonGroup buttonGroup = new ButtonGroup(); - + + c.gridx = 0; + c.gridy++; + c.gridwidth = 5; + this.add(allowWildcard = new JCheckBox("Allow any string initials"), c); + allowWildcard.setToolTipText("Use RMC or GGA data from any source independent of the string initials (e.g. GP, GN, etc.)"); + c.gridy ++; + c.gridwidth = 1; + c.gridx=0; addComponent(this, new JLabel("RMC String"), c); - c.gridx++; + c.gridx ++; addComponent(this, rmcString = new JRadioButton(""), c); c.gridx++; addComponent(this, rmcInitials = new JTextField(2), c); @@ -355,6 +364,7 @@ public class GPSParametersDialog extends PamDialog { c.gridx = 0; c.gridy ++; + c.gridwidth = 1; addComponent(this, new JLabel("GGA String"), c); c.gridx++; addComponent(this, ggaString = new JRadioButton(""), c); @@ -363,6 +373,7 @@ public class GPSParametersDialog extends PamDialog { c.gridx++; addComponent(this, new JLabel(" GGA"), c); + allowWildcard.addActionListener(this); rmcString.addActionListener(this); ggaString.addActionListener(this); buttonGroup.add(rmcString); @@ -374,10 +385,12 @@ public class GPSParametersDialog extends PamDialog { ggaString.setSelected(gpsParameters.mainString == GPSParameters.READ_GGA); rmcInitials.setText(gpsParameters.rmcInitials); ggaInitials.setText(gpsParameters.ggaInitials); + allowWildcard.setSelected(gpsParameters.allowWildcard); enableControls(); } public boolean getParams() { + gpsParameters.allowWildcard = allowWildcard.isSelected(); if (ggaString.isSelected()) { gpsParameters.mainString = GPSParameters.READ_GGA; } @@ -385,12 +398,12 @@ public class GPSParametersDialog extends PamDialog { gpsParameters.mainString = GPSParameters.READ_RMC; } gpsParameters.rmcInitials = rmcInitials.getText(); - if (gpsParameters.rmcInitials.length() != 2) { - return false; + if (gpsParameters.rmcInitials.length() != 2 && !gpsParameters.allowWildcard) { + return showWarning("Expecting a two character identifier for RMC strings"); } gpsParameters.ggaInitials = ggaInitials.getText(); - if (gpsParameters.ggaInitials.length() != 2) { - return false; + if (gpsParameters.ggaInitials.length() != 2 && !gpsParameters.allowWildcard) { + return showWarning("Expecting a two character identifier for GGA strings"); } return true; } @@ -400,8 +413,9 @@ public class GPSParametersDialog extends PamDialog { } private void enableControls() { - rmcInitials.setEnabled(rmcString.isSelected()); - ggaInitials.setEnabled(ggaString.isSelected()); + boolean wild = allowWildcard.isSelected(); + rmcInitials.setEnabled(rmcString.isSelected() & !wild); + ggaInitials.setEnabled(ggaString.isSelected() & !wild); } diff --git a/src/GPS/ProcessNmeaData.java b/src/GPS/ProcessNmeaData.java index ca1d4cd3..b293a0c6 100644 --- a/src/GPS/ProcessNmeaData.java +++ b/src/GPS/ProcessNmeaData.java @@ -57,7 +57,7 @@ public class ProcessNmeaData extends PamProcess { private GpsLogger gpsLogger; - private String wantedString = "$GPRMC"; +// private String wantedString = "$GPRMC"; private GpsDataUnit previousUnit = null; @@ -161,7 +161,7 @@ public class ProcessNmeaData extends PamProcess { @Override public void noteNewSettings() { findNMEADataBlock(); - setWantedString(); +// setWantedString(); double minRate = Math.max(.2, 1./gpsController.gpsParameters.readInterval); processCheck.getOutputCounter().setMinRate(minRate); } @@ -179,7 +179,8 @@ public class ProcessNmeaData extends PamProcess { StringBuffer nmeaString = nmeaData.getCharData(); String stringId = NMEADataBlock.getSubString(nmeaString, 0); - if (stringId.equalsIgnoreCase(wantedString)) { +// if (stringId.equalsIgnoreCase(wantedString)) { + if (gpsController.wantString(stringId)) { gpsData = new GpsData(nmeaString, gpsController.gpsParameters.mainString); // GpsData constructor which // unpacks the string. if (gpsData.isDataOk()) { @@ -316,13 +317,13 @@ public class ProcessNmeaData extends PamProcess { super.clearOldData(); } - public String getWantedString() { - return wantedString; - } - - public void setWantedString() { - wantedString = gpsController.getWantedString(); - } +// public String getWantedString() { +// return wantedString; +// } +// +// public void setWantedString() { +// wantedString = gpsController.getWantedString(); +// } public GPSControl getGpsController() { return gpsController; diff --git a/src/GPS/UpdateClockDialog.java b/src/GPS/UpdateClockDialog.java index 9c266b64..03a33bf1 100644 --- a/src/GPS/UpdateClockDialog.java +++ b/src/GPS/UpdateClockDialog.java @@ -221,9 +221,8 @@ public class UpdateClockDialog extends JDialog implements ActionListener, PamObs // NMEADataBlock nmeaDataBlock = (NMEADataBlock) o; NMEADataUnit nmeaDataUnit = (NMEADataUnit) arg; StringBuffer nmeaData = nmeaDataUnit.getCharData(); - String wantedString = gpsControl.getWantedString(); String stringId = NMEADataBlock.getSubString(nmeaData, 0); - if (wantedString.equals(stringId) == false) { + if (gpsControl.wantString(stringId) == false) { return; } if (gpsControl.gpsParameters.mainString == GPSParameters.READ_GGA) { @@ -232,6 +231,8 @@ public class UpdateClockDialog extends JDialog implements ActionListener, PamObs newRMCData(nmeaData); } } + + @Override public void updateData(PamObservable observable, PamDataUnit pamDataUnit) { // TODO Auto-generated method stub diff --git a/src/help/mapping/NMEA/docs/ConfiguringGPS.html b/src/help/mapping/NMEA/docs/ConfiguringGPS.html index 29bc1eda..6c2e9ce6 100644 --- a/src/help/mapping/NMEA/docs/ConfiguringGPS.html +++ b/src/help/mapping/NMEA/docs/ConfiguringGPS.html @@ -36,7 +36,10 @@ From the Detection Menu, select GPS>GPS Options
On very rare occasions, if the GPS data have been multiplexed through some other instruments, the first two characters of the string identifier are changed. If this is the case, it may also be necessary to set these -so that the GPS module can identify the appropriate data. +so that the GPS module can identify the appropriate data. As an alternative, select the "Allow and string initials" option +which will use any valid RMC or GGA string. Note however, that with a complex NMEA system there may be more than one GPS and +it is better to select only strings from the most accurate
+Three options for reading and storing GPS data are available.
diff --git a/src/help/mapping/NMEA/docs/images/GPSOptions1.png b/src/help/mapping/NMEA/docs/images/GPSOptions1.png index 02f26ec156b1d66c02ef0421d82a2d6354d65d81..339640518e6b0a1fff47b881a8c73d595c475d28 100644 GIT binary patch literal 13783 zcmcJ$XIzub);<~p1w}wb1*A&=>4-cay-2UpJE0dLAfW~+Dkw-NH0eqekSd)(RB8yl z2ogF0gbMap files: Added additional exception -handlers to handle corrupt map files.
+Map files: Added additional exception handlers +to handle corrupt map files.
Restart Options: When you restart -processing of offline files, if output data already exist (binary data of within -database tables) you will be asked if you want to overwrite the data, cancel, -or try to continue from where to left off.
+processing of offline files, if output data already exist (binary data of +within database tables) you will be asked if you want to overwrite the data, +cancel, or try to continue from where to left off.Updated SoundTrap sud file interface so that PAMGuard now extracts and stores the Click Detector settings from the sud files and stores them within the PAMGuard configuration. This does not affect processing, but is important for record keeping.
+GPS options to use any valid RMC or GGA +string. Not all GPS receivers output their RMC data as GPRMC – e.g. some may +output as GNRMC. A new option allows the GPS module to use any string, whatever +the first two characters of the string name may be.
+Use of localization sensor and orientation -data for static hydrophones had a bug whereby it would continually ‘forget’ -angle offsets applied to static hydrophones in viewer mode. This is now fixed.
+data for static hydrophones had a bug whereby it would continually ‘forget’ angle +offsets applied to static hydrophones in viewer mode. This is now fixed.Click tool bar: Correctly shows event selection options even if no species classification options are in place.
-Fixed Landmarks: Earlier versions were ‘losing’ -these every time PAMGuard started or new data were loaded in viewer mode. Now -fixed.
+Fixed Landmarks: Earlier versions were +‘losing’ these every time PAMGuard started or new data were loaded in viewer +mode. Now fixed.
-ROCCA: Fixed (another) memory leak which caused -PAMGuard to crash when processing large data sets with the ROCCA classifier.
+ROCCA: Fixed (another) memory leak which +caused PAMGuard to crash when processing large data sets with the ROCCA +classifier.
Ishmael Modules: Fixed bug which occasionally caused crashes when processing many files offline.
@@ -519,10 +525,10 @@ generates random chirps between around 200 and 800Hz, roughly the frequency you’d expect sound from higher frequency baleen whales, such as humpbacks, to vocalise at. -Hiding tool tips. A menu item to -permanently turn off all tool tips, or tap the ‘Esc’ key to turn them off for 6 -seconds if they are getting in the way, particularly when trying to interact -with displays using the mouse.
+Hiding tool tips. A menu item to permanently +turn off all tool tips, or tap the ‘Esc’ key to turn them off for 6 seconds if +they are getting in the way, particularly when trying to interact with displays +using the mouse.
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.
+Changes to classification GUI to +accommodate the new classification system.
Addition of data selectors to the minimum number of clicks accepted by the classifier. This allows the click-by-click @@ -591,8 +597,8 @@ description of the algorithm, screen grabs and examples.
Help documentation for Matched Click Classifier
-Database logging of offline tasks (such as click -re-classification, bearing calculation, etc.)
+Database logging of offline tasks (such as +click re-classification, bearing calculation, etc.)
Data selector for Whistle Classifier module
@@ -667,8 +673,9 @@ the TF FX display to crash if no data were displayed.See major release notes for V 2.02.01 below.
-Bug 495: TD FX display throws NullPointerException -if user has removed all data units and then moves mouse over display area.
+Bug 495: TD FX display throws +NullPointerException if user has removed all data units and then moves mouse +over display area.
This version of PAMGuard has been bundled with Java 16 -(OpenJDK release), so you will not need to install a java runtime engine -separately. PSFX files generated in previous beta releases (2.xx.xx) should be -compatible with this version, and vice-versa. PSF files generated in core -releases (1.15.xx) can be loaded in this version, but will be converted to PSFX -files when PAMGuard exits.
+This version of PAMGuard has been bundled with Java 16 (OpenJDK +release), so you will not need to install a java runtime engine separately. +PSFX files generated in previous beta releases (2.xx.xx) should be compatible +with this version, and vice-versa. PSF files generated in core releases +(1.15.xx) can be loaded in this version, but will be converted to PSFX files +when PAMGuard exits.
Changes have been made to the binary file format to support the -output of additional noise outputs for certain detectors (See below). Binary -files created with this version will not be compatible with earlier versions -2.01.### and below. This version will read and may convert earlier format -binary files.
+Changes have been made to the binary file format to support +the output of additional noise outputs for certain detectors (See below). +Binary files created with this version will not be compatible with earlier +versions 2.01.### and below. This version will read and may convert earlier +format binary files.
@@ -732,8 +739,8 @@ params
3. Bug - 492. Data Model does not update button//tooltip text when underlying -data changes
+ 492. Data Model does not update button//tooltip text when underlying data +changes4. Bug @@ -809,9 +816,9 @@ Update whistle and moan detector to better handle small stubs or spurs coming off the side of whistles
13. -Extend the Hyperbolic Localiser to handle 2D planar arrays (previously limited -to 3D volumetric arrays)
+lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> Extend the Hyperbolic Localiser to handle 2D planar arrays +(previously limited to 3D volumetric arrays)14. @@ -828,17 +835,17 @@ Noise Level Outputs - as an aid to performance diagnosis, some detectors (currently the GPL, Click Detector and Whistle and Moan Detector) are outputting additional noise metrics to their binary output files. These can be read with the PAMGuard -Matlab library and used to diagnose system performance in varying noise conditions. -Improved displays within PAMGuard for these noise metrics will be included in a -future release.
+Matlab library and used to diagnose system performance in varying noise +conditions. Improved displays within PAMGuard for these noise metrics will be +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 help
+lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> 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 help18. @@ -859,11 +866,11 @@ understand the notes listed for Beta Version 2.00.10 before proceeding with installation and use of this version.
-This version of PAMGuard has been bundled with Java 13 -(release 13.0.1). PSFX files generated in previous beta releases (2.xx.xx) -should be compatible with this version, and vice-versa. PSF files generated in -core releases (1.15.xx) can be loaded in this version, but will be converted to -PSFX files when PAMGuard exits.
+This version of PAMGuard has been bundled with Java 13 (release +13.0.1). PSFX files generated in previous beta releases (2.xx.xx) should be +compatible with this version, and vice-versa. PSF files generated in core +releases (1.15.xx) can be loaded in this version, but will be converted to PSFX +files when PAMGuard exits.
Bug Fixes
@@ -951,9 +958,8 @@ lang=EN-US> Better auto-scaling in Ishmael Detector graphics window.7. Change to Windows temporary folder location, to get around -Windows Security settings that were preventing some modules from working -properly.
+lang=EN-US> Change to Windows temporary folder location, to get around Windows +Security settings that were preventing some modules from working properly. @@ -1009,8 +1015,8 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> &nb8. Bug - 460. Click Detector BT Display vertical axis shows all zeroes when -zooming out
+ 460. Click Detector BT Display vertical axis shows all zeroes when zooming +out9. Bug @@ -1254,8 +1260,8 @@ classify clicks.
2. Added option in Sound Acquisition settings dialog to override -filename time stamp and use PC local time instead.
+lang=EN-US> Added option in Sound Acquisition settings dialog to +override filename time stamp and use PC local time instead.3.
10. Add option to the Map module's Plot Overlay Options dialog,
-to show events occuring in the future (look
+lang=EN-US> Add option to the Map module's Plot Overlay Options dialog, to
+show events occuring in the future (look
ahead) instead of the default display of events which have already
occurred. Can make it easier to match up the map with clicks seen in the Click
Detector display.
5. Many upgrades to the Sound Playback module, including a high-pass -filter, gain control, and the ability to mix wavefrom and envelope data -together to listen to high-frequency clicks and dolphin whistles at the same -time.
+lang=EN-US> Many upgrades to the Sound Playback module, including a +high-pass filter, gain control, and the ability to mix wavefrom and envelope +data together to listen to high-frequency clicks and dolphin whistles at the +same time.6. @@ -1615,9 +1621,9 @@ from many channels.
3. -Bugs 398 and 399. Click Detector, FFT Engine and Filter modules were -losing source during startup, if the source selected was not the first raw data -source in the list.
+Bugs 398 and 399. Click Detector, FFT Engine and Filter modules were losing +source during startup, if the source selected was not the first raw data source +in the list.4. @@ -1631,9 +1637,9 @@ lang=EN-US> Added decimal degrees option to latitude/longitude dialog.
2. Added option in the Click Delay parameters to restrict the number -of initial samples used in the calculation. This can be useful for cleaning up -delays in the presence of echoes and small time delays. +lang=EN-US> Added option in the Click Delay parameters to restrict the +number of initial samples used in the calculation. This can be useful for +cleaning up delays in the presence of echoes and small time delays.3. @@ -1732,9 +1738,9 @@ see new options in main menu.
2. Added Matched Template Click Classifier. Classifies clicks -based on an ideal template to match and a template to reject. An example of -this is to classify beaked whale clicks in an environment with dolphin clicks.
+lang=EN-US> Added Matched Template Click Classifier. Classifies clicks based +on an ideal template to match and a template to reject. An example of this is +to classify beaked whale clicks in an environment with dolphin clicks.3. @@ -1746,10 +1752,10 @@ lang=EN-US> Added ability to read differential GPS data.
5. Added check for duplicate settings in the psf file when exiting -Pamguard. If duplicate settings are found, user is given the option to leave -them in the psf or get rid of them. Duplicate settings are ignored by Pamguard, -but can cause the psf file to grow large over time.
+lang=EN-US> Added check for duplicate settings in the psf file when +exiting Pamguard. If duplicate settings are found, user is given the option to +leave them in the psf or get rid of them. Duplicate settings are ignored by +Pamguard, but can cause the psf file to grow large over time.6. @@ -1894,8 +1900,8 @@ lang=EN-US style='font-size:7.0pt;font-family:"Times New Roman",serif'> &nb
5. -Bug 359. Pamguard crashes when selecting auto-scale option in Noise Monitor -module
+Bug 359. Pamguard crashes when selecting auto-scale option in Noise +Monitor module6. @@ -1922,8 +1928,8 @@ Beta versions
11. -Bug 366. Rocca manual whistle contour extraction throws error when trying -to classify a boxed whistle
+Bug 366. Rocca manual whistle contour extraction throws error when +trying to classify a boxed whistleUpgrades
@@ -2045,8 +2051,8 @@ Upgraded jFLAC library to fix.7. -Bug 332. Fixed problem with secondary maps (those not in the main display) -not displaying detections.
+Bug 332. Fixed problem with secondary maps (those not in the main +display) not displaying detections.8. @@ -2091,9 +2097,9 @@ Added circular movement option to source simulation
PAMGuard Version 2 contains major updates.
-You should read and understand these notes before proceeding with installation
-and use of this version. These changes have been funded under contract to NOAA
+ PAMGuard Version 2 contains major updates. You
+should read and understand these notes before proceeding with installation and
+use of this version. These changes have been funded under contract to NOAA
Fisheries, contract no. WE-133F-16-SE-1126.Binary File Structural Changes
@@ -2230,14 +2236,14 @@ switches/parameters to be included in *.ini files.
1. -Bug 308. Map Overlay Control. Storage of data -saying what get's plotted on each map and for how long became corrupted and the -list grew to a ridiculous size. Code has been put in place to a) stop it -happening again and b) to repair any configuration files which are corrupted. -Corrupted files will be slow to load, slow to save and will be > several -megabytes in size. It may be necessary to delete the PamguardSettings table in -any databases since these too may have become oversized which will slow down -viewer mode PAMGuard start-up.
+Bug 308. Map Overlay Control. Storage of data saying +what get's plotted on each map and for how long became corrupted and the list +grew to a ridiculous size. Code has been put in place to a) stop it happening +again and b) to repair any configuration files which are corrupted. Corrupted +files will be slow to load, slow to save and will be > several megabytes in +size. It may be necessary to delete the PamguardSettings table in any databases +since these too may have become oversized which will slow down viewer mode +PAMGuard start-up.2. @@ -2334,8 +2340,8 @@ both 64 bit and 32 bit installations. PAMGuard psf files are now registered in the Windows Registry, so double-clicking on a psf file should run PAMGuard in normal mode (as opposed to Viewer or Mixed modes). Note that the Windows Registry can only hold a single executable reference for psf files; therefore, -for users with multiple installations of PAMGuard, double-clicking on a psf will -run the most-recently installed version of PAMGuard on the system.
+for users with multiple installations of PAMGuard, double-clicking on a psf +will run the most-recently installed version of PAMGuard on the system.2. -Bug 305. Date and Time not being correctly extracted -from wav files created using SoundTrap recorders. Fixed by correctly finding -and unpacking information in the accompanying xml log files that come with -SoundTrap files.
+Bug 305. Date and Time not being correctly +extracted from wav files created using SoundTrap recorders. Fixed by correctly +finding and unpacking information in the accompanying xml log files that come +with SoundTrap files.Logger Form Design
-A GUI driven system for designing Logger forms has been -released. Currently, this feature has no online help, but is reasonably -intuitive compared to the old method of typing directly into the database.
+A GUI driven system for designing Logger forms has been released. +Currently, this feature has no online help, but is reasonably intuitive +compared to the old method of typing directly into the database.
Improved Number handling
@@ -2601,9 +2607,9 @@ changes in future releases. New PAMGuard releases will always be able to open older binary files, however, with previous PAMGuard releases if a newer file format was opened, then PAMGuard was unable to check that the file format was newer and would attempt to read the files and might even corrupt them. Now it -will recognise that it cannot open the files, display appropriate error messages -and not attempt to read the files. NOTE that at this time there are no planned -file format changes and that this is purely a future proofing exercise. +will recognise that it cannot open the files, display appropriate error +messages and not attempt to read the files. NOTE that at this time there are no +planned file format changes and that this is purely a future proofing exercise.7. @@ -2804,13 +2810,13 @@ for details.
3. -GPS Loading into PAMGuard Viewer. This has been modified -so that the rules governing GPS data collection and storage also apply when -loading data from the database. For instance, if you've stored all GPS data, -you've probably got a record every second in the database which can create -memory overflows if you try to load a lot of data in the viewer. You can now -tell PAMGuard to only load a data point every n seconds which will reduce the -number of points loaded. Useful when making large scale overview maps of a +GPS Loading into PAMGuard Viewer. This has been +modified so that the rules governing GPS data collection and storage also apply +when loading data from the database. For instance, if you've stored all GPS +data, you've probably got a record every second in the database which can +create memory overflows if you try to load a lot of data in the viewer. You can +now tell PAMGuard to only load a data point every n seconds which will reduce +the number of points loaded. Useful when making large scale overview maps of a survey.
4.
3. -Bug 248. Crash in hydrophone array manager. Bug in -array manager would crash PAMGuard when the click detector was configured with -more channels than the sound acquisition system (almost impossible to achieve, -but someone managed it).
+Bug 248. Crash in hydrophone array manager. Bug in array +manager would crash PAMGuard when the click detector was configured with more +channels than the sound acquisition system (almost impossible to achieve, but +someone managed it).4. @@ -2907,8 +2913,8 @@ writing results files. Fixed.
7. -Bug 237. Logger forms not saving data to database after sound -acquisition starts. Fixed.
+Bug 237. Logger forms not saving data to database after sound acquisition +starts. Fixed.8. @@ -2951,22 +2957,22 @@ which is useful when using PAMGuard for demonstration purposes.
lang=EN-US>4. The sound File and Folder audio input systems now have an optional time zone setting. Note that PAMGuard analysis should still all be taking place in -UTC and that this option is intended to allow the conversion of file times -which were not recorded as UTC into UTC and not the other way around. Use the -option with caution ! +UTC and that this option is intended to allow the conversion of file times which +were not recorded as UTC into UTC and not the other way around. Use the option +with caution !5. -The Open Office Database system has been removed from the list of -available options since it is not reliable. If you require a free database -solution we recommend you use the MySql Community Server The Open Office Database system has been removed from the list of available +options since it is not reliable. If you require a free database solution we +recommend you use the MySql Community Server http://dev.mysql.com/downloads/mysql/
6. -Changed Rocca Measurement menu item to open a window containing -click events, instead of a submenu listing click events. Using a window -simplifies multiple event selections
+Changed Rocca Measurement menu item to open a window +containing click events, instead of a submenu listing click events. Using +a window simplifies multiple event selections7. @@ -3109,9 +3115,8 @@ to read on a time. Fixed
Menu Layout
-The PAMGuard menus have been rearranged into a more -intuitive grouping which we believe will help users find functionality more -easily.
+The PAMGuard menus have been rearranged into a more intuitive +grouping which we believe will help users find functionality more easily.
'Detection' menu has been renamed to 'Settings' since many menu items within this menu were not directly to do with 'Detection'.
@@ -3241,9 +3246,9 @@ different. Details are available in the online help.Can now read raw audio data direct from FLAC files. FLAC is a lossless compression -algorithm for audio data. Files, or folders of files are accessed in the same way -as WAV and AIFF files in the Sound Acquisition module. In a future release we -also hope to provide support for writing FLAC files from the sound recorder +algorithm for audio data. Files, or folders of files are accessed in the same +way as WAV and AIFF files in the Sound Acquisition module. In a future release +we also hope to provide support for writing FLAC files from the sound recorder module.
Sound Recorder Module
@@ -3301,8 +3306,8 @@ whistle.Better control of data in viewer mode, -making is easy to scroll through and view data for short time periods.
+Better control of data in viewer +mode, making is easy to scroll through and view data for short time periods.
GPS
@@ -3391,9 +3396,9 @@ other data sources for the PAMGuard viewer.Database
-Can now copy data from binary -storage to the database offline for any module having both binary and database -storage.
+Can now copy data from binary storage +to the database offline for any module having both binary and database storage. +
Can create a blank MS Access database (2007 and later *.accdb formats only).
@@ -3544,8 +3549,8 @@ start-up.' Bug in Noise Monitor. Version 1.11.01 would crash if only a subset of -channels were selected, e.g. if you only measured noise on channel 0 of a two -channel configuration. This bug is now fixed
+channels were selected, e.g. if you only measured noise on channel 0 of a two channel +configuration. This bug is now fixed' -Whistle classifier has some new features in the classifier training panel. -It is also now possible to export training data files directly from binary data -files.
+Whistle classifier has some new features in the classifier training +panel. It is also now possible to export training data files directly from +binary data files.' @@ -3793,9 +3798,9 @@ become too bit to fit on a screen.
PAMGUARD display.Windows Installer now sets permissions on PAMGUARD folder so -that don't need to be an administrator in order to create new files in that directory. -Prevents problems especially under Vista/Windows 7 when saving psfs and -recording sounds to the default directory.
+that don't need to be an administrator in order to create new files in that +directory. Prevents problems especially under Vista/Windows 7 when saving psfs +and recording sounds to the default directory.Other Changes / new features
@@ -3908,8 +3912,8 @@ existing configurations.Sound acquisition
-Changes made for a previous Mac build now incorporated into -main Beta branch. This should allow for basic 2 channel sound acquisition using +
Changes made for a previous Mac build now incorporated into main +Beta branch. This should allow for basic 2 channel sound acquisition using Macs.
Bug Fixes
@@ -3959,13 +3963,13 @@ channels are assigned to a hydrophone.' -Play back of high frequency wav files through National Instruments (NI) cards: -When analysing wav files, sound can be output at high frequency (depending on -the specification of the NI card). The primary motivation for this has been to -develop a test bed for high frequency sound acquisition whereby we can play -500kHz recordings of harbour porpoise out of an NI card on one machine, into NI -cards on a different machine which are testing high frequency versions of the -click detector.
+Play back of high frequency wav files through National Instruments (NI) +cards: When analysing wav files, sound can be output at high frequency +(depending on the specification of the NI card). The primary motivation for +this has been to develop a test bed for high frequency sound acquisition +whereby we can play 500kHz recordings of harbour porpoise out of an NI card on +one machine, into NI cards on a different machine which are testing high +frequency versions of the click detector.' @@ -4050,13 +4054,13 @@ Symbol'>'''1.0Beta 22 Jan 2008 - -Pamguard starts two releases, core and beta release,
+class=Heading2Char>1.0Beta 22 Jan 2008 - Pamguard +starts two releases, core and beta release,this is the beta release
@@ -4831,10 +4833,10 @@ configurable user displays which support real time scrolling spectrograms and radar displays. Detection and localisation information can be optionally displayed on the map display.Map enhancements include improved scrolling whereby the user can click and drag to pan the area. PamGuard can now interface -with MySQL database servers and users can easily select which information is logged. -(This replaces the previous 'flat-file' logging feature). A simulation module -allows virtual vocalising animals to be placed on the map to assist in training -and development. Extensive online user help has been added to PamGuard +with MySQL database servers and users can easily select which information is +logged. (This replaces the previous 'flat-file' logging feature). A simulation +module allows virtual vocalising animals to be placed on the map to assist in +training and development. Extensive online user help has been added to PamGuard Application