Squashed commit of the following:

commit c64fa8fe9d90b29d4afabc5f967453d9635e8126
Author: Douglas Gillespie <[email protected]>
Date:   Thu Mar 7 11:24:20 2024 +0000

    opt to easily turn off restart debug output

commit 48c5387291a02018d48d7f214653d1a799cee173
Author: Douglas Gillespie <[email protected]>
Date:   Thu Mar 7 09:22:45 2024 +0000

    binary store count (#129)

    Fix issue in binary store object count

commit 769193703a6b0024cfc15eb830884706b5ae14f6
Merge: 308442f2 23062c3f
Author: Douglas Gillespie <[email protected]>
Date:   Thu Mar 7 09:16:45 2024 +0000

    Merge branch 'restart' into main

commit 308442f201bf7843fe9e22c8bf63545179fb723f
Author: Douglas Gillespie <[email protected]>
Date:   Thu Mar 7 09:14:33 2024 +0000

    Merge from dg dev main (#128)

    * updating Tethys help

    * added help details server connection & calibration

    * Reporting outputs to user

    Use Pamguard WarnOnce system to show a message of success or failure
    after attempting to output to Tethys.

    * Removing empty fields

    Start of implementation of code that can remove empty fields from
    objects before they are written.

    * More help documentation

    Continued writing general export help.
    Added new css style
    Added image

    * Fix type in Deployment export

    * Prevent single deployment export

    For now, disable the option to export a single Deployment document for
    multiple recording periods.

    * System to search species codes

    Search the ITIS species codes in Tethys to find ITIS codes. Search can
    be on a common or scientific name.

    * Data blocks help + species codes

    More help documentation on exporting detections/localization as well as mapping detection species codes to TSNs.  Includes supporting images

    * Improved dialog for finding species codes

    Now has a progress bar to block GUI while searching database.

    * Add species codes TOC in help

    * Documented new species search in help

    * Nilus Checker

    Can check a Nilus class to see if it's missing required objects and be
    used to remove empty fields (e.g. zero length strings) from an object.

    * fixed anchor html problem

    * Messing around with checking of required fields in nilus objects.

    * split Tethys help files into smaller chunks

    * Update button enablers

    And reinstate output of a single deployment document, with non-recording
    periods stores in the QA section

    And update help TOC for latest help documents.

    ---------

    Co-authored-by: Marie <[email protected]>

commit 23062c3ff4924f55d79c30e919d2e05242df6f17
Author: Douglas Gillespie <[email protected]>
Date:   Mon Mar 4 13:59:09 2024 +0000

    Update PamController.java

    add in debug output at start and stop

commit 85b47c86af95875d07809e72e4fe1ba63e13645a
Author: Douglas Gillespie <[email protected]>
Date:   Mon Mar 4 13:05:56 2024 +0000

    exception handling

    A bit more exception handling in click train detector and output of a version 10aa/other

commit e3ffd56f697d6998732a8f186c9aefa12b953336
Merge: 1200b13f e6c2f325
Author: Douglas Gillespie <[email protected]>
Date:   Mon Mar 4 12:28:42 2024 +0000

    Merge branch 'restart' of https://github.com/douggillespie/PAMGuard into restart

commit e6c2f325b2b67bab59e95715eb23531b43b2b492
Author: Douglas Gillespie <[email protected]>
Date:   Sat Mar 2 10:43:41 2024 +0000

    Binary store

    Fix err in binary footer where count of objects also included the count
    of noise measurements.

commit 45b99273fa4392bd75a6f323aab25fc61910e0f5
Author: Douglas Gillespie <[email protected]>
Date:   Tue Feb 27 19:09:58 2024 +0000

    Restore single param call into PamParameterSet.autoGenerate

commit c36ad2a33a5eef6215c6f5e7bf7865c36877d0b5
Author: Douglas Gillespie <[email protected]>
Date:   Tue Feb 27 15:55:02 2024 +0000

    Fix settings load.

    Problems in viewer mode with long (>50char) settings names which don't
    get fully stored in the database. Fixed by only looking at the start of
    the name. Better to not use such long names.

commit 2721095a033f37f27a17fdb6b0299779889d32af
Author: Douglas Gillespie <[email protected]>
Date:   Tue Feb 27 14:08:22 2024 +0000

    Fix compound data selector V2.02.10b

    also a bug in logger forms if malformed UDF's

commit 1200b13f956ca24436bbf148702d743964c69a4d
Author: Douglas Gillespie <[email protected]>
Date:   Fri Feb 23 15:53:00 2024 +0000

    Exception handling in CTD

commit 156952bafe13295ed8e29ca492f5a9984ba20f0a
Author: Douglas Gillespie <[email protected]>
Date:   Thu Feb 22 17:40:45 2024 +0000

    Update MHTClickTrainAlgorithm.java

    Synchronize calls into MHT Algorithm across threads (can mess up during restarts otherwise)

commit e491028ef73f60011ca8fc7fddf10508d181a71a
Merge: d2263bbb 21b4bc13
Author: Douglas Gillespie <[email protected]>
Date:   Thu Feb 15 16:52:29 2024 +0000

    Merge pull request #66 from PAMGuard/main

    merge from main

commit d2263bbba5efb7f31618a4d167544d99982ab7ef
Author: Douglas Gillespie <[email protected]>
Date:   Thu Feb 15 16:48:33 2024 +0000

    Functions for better restarting after buffer overflow.

commit 21b4bc130dbb350da0a58d9d87612f21d87cf7e2
Author: Douglas Gillespie <[email protected]>
Date:   Fri Feb 9 11:53:35 2024 +0000

    Hydrophone data loading

    Change how hydrophone data are loaded in viewer. Don't load ALL data.
    Load the loading period + some before the load period which will be one
    minute of data PLUS an extra n*2 data before that extra minute where n
    is the number of hydrophones.

commit e52701353a8ad266d078bfb4326143b6c34071e8
Author: Douglas Gillespie <[email protected]>
Date:   Mon Feb 5 13:34:15 2024 +0000

    Fix data integrity bug

    Fix of bug that 'fixed' event start and end times in database for linked
    parent / child event tables. Error was caused by a mix up between
    ParentID and ParentUID fields.

commit 66b73c45e2084cf7b37100d4cb5a089f9cde66a3
Merge: 0dc47fcb 9fe8e353
Author: Douglas Gillespie <[email protected]>
Date:   Fri Feb 2 09:08:19 2024 +0000

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

commit 0dc47fcb0b144559f363bcbeddb0101f9057f3e5
Author: Douglas Gillespie <[email protected]>
Date:   Fri Feb 2 09:07:55 2024 +0000

    click display arrangement

    Added options to NOT automatically rearrange all the windows in the
    click display every time the display size changes

commit 9609546602e58d0b6bddab27e5983968a2ceca4d
Merge: 82e02a21 67e58416
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 15:01:04 2024 +0000

    Merge pull request #65 from douggillespie/Tethys

    Tethys

commit 67e5841668d54d9dd352c5ddcc8e9b025ee2fced
Merge: 6b184529 9fe8e353
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 15:00:00 2024 +0000

    Merge pull request #64 from PAMGuard/main

    Merge from main

commit 9fe8e353220986bdee00d3563969872c7a44e5da
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 14:58:50 2024 +0000

    MErge from dg (#127)

    * updating Tethys help

    * added help details server connection & calibration

    * Reporting outputs to user

    Use Pamguard WarnOnce system to show a message of success or failure
    after attempting to output to Tethys.

    * Removing empty fields

    Start of implementation of code that can remove empty fields from
    objects before they are written.

    * More help documentation

    Continued writing general export help.
    Added new css style
    Added image

    * Fix type in Deployment export

    * Prevent single deployment export

    For now, disable the option to export a single Deployment document for
    multiple recording periods.

    * System to search species codes

    Search the ITIS species codes in Tethys to find ITIS codes. Search can
    be on a common or scientific name.

    * Data blocks help + species codes

    More help documentation on exporting detections/localization as well as mapping detection species codes to TSNs.  Includes supporting images

    * Improved dialog for finding species codes

    Now has a progress bar to block GUI while searching database.

    * Add species codes TOC in help

    * Documented new species search in help

    * Nilus Checker

    Can check a Nilus class to see if it's missing required objects and be
    used to remove empty fields (e.g. zero length strings) from an object.

    * fixed anchor html problem

    * Messing around with checking of required fields in nilus objects.

    * split Tethys help files into smaller chunks

    * Update button enablers

    And reinstate output of a single deployment document, with non-recording
    periods stores in the QA section

    And update help TOC for latest help documents.

    ---------

    Co-authored-by: Marie <[email protected]>

commit 1c532906ca126d914ba087682453769919879297
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 14:57:38 2024 +0000

    Merge from dg (#126)

    * updating Tethys help

    * added help details server connection & calibration

    * Reporting outputs to user

    Use Pamguard WarnOnce system to show a message of success or failure
    after attempting to output to Tethys.

    * Removing empty fields

    Start of implementation of code that can remove empty fields from
    objects before they are written.

    * More help documentation

    Continued writing general export help.
    Added new css style
    Added image

    * Fix type in Deployment export

    * Prevent single deployment export

    For now, disable the option to export a single Deployment document for
    multiple recording periods.

    * System to search species codes

    Search the ITIS species codes in Tethys to find ITIS codes. Search can
    be on a common or scientific name.

    * Data blocks help + species codes

    More help documentation on exporting detections/localization as well as mapping detection species codes to TSNs.  Includes supporting images

    * Improved dialog for finding species codes

    Now has a progress bar to block GUI while searching database.

    * Add species codes TOC in help

    * Documented new species search in help

    * Nilus Checker

    Can check a Nilus class to see if it's missing required objects and be
    used to remove empty fields (e.g. zero length strings) from an object.

    * fixed anchor html problem

    * Messing around with checking of required fields in nilus objects.

    * split Tethys help files into smaller chunks

    * Update button enablers

    And reinstate output of a single deployment document, with non-recording
    periods stores in the QA section

    And update help TOC for latest help documents.

    ---------

    Co-authored-by: Marie <[email protected]>

commit 82e02a21b3bbbe5ef123932d257c8c68d40b8b05
Merge: 8b57a398 c4192a73
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 14:56:43 2024 +0000

    Merge pull request #63 from PAMGuard/main

    MErge from main

commit c4192a7323e93ec61adef46975d6ae0dd2c431ba
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 14:51:29 2024 +0000

    Version 2.02.10

    final commit of updated version info for release

commit 5466914d4ebe65c67f1a66ac82c17e5956da470b
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 11:55:34 2024 +0000

    Merge from dev branch (#125)

    * updating Tethys help

    * added help details server connection & calibration

    * Reporting outputs to user

    Use Pamguard WarnOnce system to show a message of success or failure
    after attempting to output to Tethys.

    * Removing empty fields

    Start of implementation of code that can remove empty fields from
    objects before they are written.

    * More help documentation

    Continued writing general export help.
    Added new css style
    Added image

    * Fix type in Deployment export

    * Prevent single deployment export

    For now, disable the option to export a single Deployment document for
    multiple recording periods.

    * System to search species codes

    Search the ITIS species codes in Tethys to find ITIS codes. Search can
    be on a common or scientific name.

    * Data blocks help + species codes

    More help documentation on exporting detections/localization as well as mapping detection species codes to TSNs.  Includes supporting images

    * Improved dialog for finding species codes

    Now has a progress bar to block GUI while searching database.

    * Add species codes TOC in help

    * Documented new species search in help

    * Nilus Checker

    Can check a Nilus class to see if it's missing required objects and be
    used to remove empty fields (e.g. zero length strings) from an object.

    * fixed anchor html problem

    * Messing around with checking of required fields in nilus objects.

    * split Tethys help files into smaller chunks

    * Update button enablers

    And reinstate output of a single deployment document, with non-recording
    periods stores in the QA section

    And update help TOC for latest help documents.

    ---------

    Co-authored-by: Marie <[email protected]>

commit 8b57a3982a643a6d680a41be34a2aa02a447ea93
Merge: f4993425 cb0d191c
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 11:54:17 2024 +0000

    Merge pull request #62 from PAMGuard/main

    Update README.html

commit f4993425b50a3d08debda955fcb7c2fd7c13db2c
Merge: dacfab07 6b184529
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 30 11:52:32 2024 +0000

    Merge pull request #61 from douggillespie/Tethys

    TethysMerge in from Tetthys

commit cb0d191c08ab5c659b03886a13e8752f8a47e7b7
Author: Douglas Gillespie <[email protected]>
Date:   Mon Jan 29 20:50:07 2024 +0000

    Update README.html

    Fix problems of weird characters in readme.html

commit 6b1845293c0ed7123cc8ca9b0b4c536e9c80e78b
Author: Douglas Gillespie <[email protected]>
Date:   Mon Jan 29 16:54:24 2024 +0000

    Update button enablers

    And reinstate output of a single deployment document, with non-recording
    periods stores in the QA section

    And update help TOC for latest help documents.

commit 810ec67077806fb65757807aa1f944a1a3db196e
Author: Marie <[email protected]>
Date:   Fri Jan 26 19:56:45 2024 -0800

    split Tethys help files into smaller chunks

commit dacfab07f52ffc47d2d94484b4043866ba7edd5a
Merge: a6765d72 53ca798f
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 26 10:02:00 2024 +0000

    Merge pull request #60 from PAMGuard/main

    Correct sorting of input sound files

commit 53ca798f1b97b49800c312f2a92aa06ba36b827e
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 26 09:57:57 2024 +0000

    Correct sorting of input sound files

commit 88be6ffe2e6865434675031f62fe9754a9bcbee9
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jan 25 18:04:57 2024 +0000

    Messing around with checking of required fields in nilus objects.

commit fe33930ca85cc0e3257d08bed19bf0b78f6a610c
Author: Marie <[email protected]>
Date:   Wed Jan 24 11:50:20 2024 -0800

    fixed anchor html problem

commit fdfa9a20d8cdf65ab8f0f85909136c9940569f56
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 24 16:32:30 2024 +0000

    Nilus Checker

    Can check a Nilus class to see if it's missing required objects and be
    used to remove empty fields (e.g. zero length strings) from an object.

commit b78bbe8b9e300e8348e1a976357c4221162df68a
Merge: c0080ae4 a6765d72
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 24 14:50:22 2024 +0000

    Merge pull request #59 from douggillespie/main

    merge from main

commit a6765d72b12a35a462d8b97c6b2d04c7ba6d0089
Merge: efdf17f6 5fcd3607
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 24 14:46:39 2024 +0000

    Merge pull request #58 from PAMGuard/main

    Remove comments in split positioner

commit 5fcd36073722bd1bab5b4e151e62e830bb3b1b12
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 24 14:46:05 2024 +0000

    Remove comments in split positioner

commit c0080ae4f431d2c2b5ae6a07d4585964de03f8e9
Merge: f1bb6e4c efdf17f6
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 24 14:37:24 2024 +0000

    Merge remote-tracking branch 'origin/main' into Tethys

    Conflicts:
    	src/help/JavaHelpSearch/DOCS
    	src/help/JavaHelpSearch/DOCS.TAB
    	src/help/JavaHelpSearch/OFFSETS
    	src/help/JavaHelpSearch/POSITIONS
    	src/help/JavaHelpSearch/SCHEMA
    	src/help/JavaHelpSearch/TMAP
    	src/help/utilities/tethys/docs/tethys_quickstart.html

commit f1bb6e4c0c159cfc8385947950e14b5d6be3249a
Author: Marie <[email protected]>
Date:   Tue Jan 23 14:33:50 2024 -0800

    Documented new species search in help

commit 971165b72e72a128728efa91db9012001c6bc5f2
Author: Douglas Gillespie <[email protected]>
Date:   Tue Jan 23 11:12:54 2024 +0000

    Add species codes TOC in help

commit 3d7224eb937746fd8cea51fbe46a1731ba949a99
Author: Douglas Gillespie <[email protected]>
Date:   Mon Jan 22 18:04:57 2024 +0000

    Improved dialog for finding species codes

    Now has a progress bar to block GUI while searching database.

commit 7d30b303e78d2217be03081a54893f31abcc0176
Author: Marie <[email protected]>
Date:   Sun Jan 21 15:24:13 2024 -0800

    Data blocks help + species codes

    More help documentation on exporting detections/localization as well as mapping detection species codes to TSNs.  Includes supporting images

commit baff8d140c5794fd8be942d89328716044a9af22
Author: Douglas Gillespie <[email protected]>
Date:   Sun Jan 21 21:35:34 2024 +0000

    System to search species codes

    Search the ITIS species codes in Tethys to find ITIS codes. Search can
    be on a common or scientific name.

commit 54cb0d1b08cac63966df9666db055a95b5ff9ec5
Author: Douglas Gillespie <[email protected]>
Date:   Sun Jan 21 17:01:10 2024 +0000

    Prevent single deployment export

    For now, disable the option to export a single Deployment document for
    multiple recording periods.

commit 522253b489f3cf9e12666dc53ac93da131ffe7b2
Author: Douglas Gillespie <[email protected]>
Date:   Sun Jan 21 16:25:03 2024 +0000

    Fix type in Deployment export

commit 98bc7587b53d5e0915f50f477f928ac174c99a9d
Merge: c8bc943f e0392de9
Author: Marie <[email protected]>
Date:   Sat Jan 20 20:01:19 2024 -0800

    Merge branch 'Tethys' of https://github.com/douggillespie/PAMGuard into Tethys

commit c8bc943ff72dd8f2390a650eb682b66ca420a43d
Author: Marie <[email protected]>
Date:   Sat Jan 20 20:01:05 2024 -0800

    More help documentation

    Continued writing general export help.
    Added new css style
    Added image

commit e0392de9c7de29ce4594f92b15280a392c3be2fa
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 19 17:29:12 2024 +0000

    Removing empty fields

    Start of implementation of code that can remove empty fields from
    objects before they are written.

commit 65300d719ad611f6da54e51de120fcfa7676c174
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 19 16:29:41 2024 +0000

    Reporting outputs to user

    Use Pamguard WarnOnce system to show a message of success or failure
    after attempting to output to Tethys.

commit fa02c9826cfb9005cab86de50474bdf85e43cc63
Merge: 3f2e4239 7efc8242
Author: Marie <[email protected]>
Date:   Thu Jan 18 19:37:29 2024 -0800

    Merge branch 'Tethys' of https://github.com/douggillespie/PAMGuard into Tethys

commit 3f2e4239b012601e6c3fa75a7d06912f0f69ecfb
Author: Marie <[email protected]>
Date:   Thu Jan 18 19:37:17 2024 -0800

    added help details server connection & calibration

commit efdf17f6516c18dd75c1d28228d45ce2c5f38b72
Merge: 02f1889e e5fda7f7
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jan 18 09:39:55 2024 +0000

    Merge pull request #57 from PAMGuard/main

    merge from main

commit e5fda7f72a19634572fafc7fd8e1076d63d7869f
Merge: 3ed9be4b 02f1889e
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jan 18 09:39:45 2024 +0000

    Merge branch 'main' into main

commit 3ed9be4bfdb1d6849fa39e0b205b886fde1b3ee9
Merge: 42b72960 43811c1f
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jan 18 09:36:56 2024 +0000

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

commit 42b72960755f52864579e8c81d44cb912f22e56e
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jan 18 09:36:10 2024 +0000

    Hide Tethys module

    and remove text output in splitpanepositioner

commit 02f1889e3939d85311753e18ef90937da679c85e
Merge: 0bc3968d 52bbff36
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jan 18 09:33:26 2024 +0000

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

    Conflicts:
    	src/binaryFileStorage/BinaryStore.java

commit 43811c1f9b0d19bc59a5f6e45b960dfeffa6fe6f
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jan 18 09:31:00 2024 +0000

    Merge from DG  (#124)

    * claspath update

    * Batch processing

    Adding functionality for offline task batch processing.

commit 52bbff36e59af92a0cb8aeb2bb69435f5f425cea
Merge: 0c035aa0 b373e169
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jan 18 09:29:50 2024 +0000

    Merge pull request #56 from PAMGuard/main

    Merge from main

commit 0bc3968dc86eb5edd418a7fb01b842c0c241f588
Merge: 52cc8c71 a3a74adb
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 17 21:28:02 2024 +0000

    Fix err in binary store

commit 0c035aa0fecf75c4df28c9cfa673f23aca17b249
Merge: 52cc8c71 a3a74adb
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 17 21:28:02 2024 +0000

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

commit 52cc8c71775ce6e13d1ea500ccd60e0b04fed860
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 17 21:24:04 2024 +0000

    Batch processing

    Adding functionality for offline task batch processing.

commit b373e169f2ed822ad29c4620b61ce64cf4b3d818
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 17 21:13:14 2024 +0000

    updating Tethys help (#123)

commit 5d83af1d4283f1628cdec1350580c2aef915d4bd
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 17 21:11:31 2024 +0000

    updating Tethys help (#122)

commit 7efc82422640203566894bc53402d225fd135e63
Merge: d05cecaf bb17d384
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 17 21:11:13 2024 +0000

    Merge branch 'main' into Tethys

commit a3a74adb7873da24d91dc4dc03cd76fb9121f958
Merge: ac1a7f87 bb17d384
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jan 17 14:37:30 2024 +0000

    Merge pull request #55 from PAMGuard/main

    MErge from main

commit d05cecaf8b475fbbe21f1ccf5d66a5ae33d9ec2d
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 18:57:38 2024 +0000

    updating Tethys help

commit 7a1c697319ead5d6d86cb75e7d16da0cb2e110cf
Merge: 21fa4aff ac1a7f87
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 15:41:54 2024 +0000

    Merge remote-tracking branch 'origin/main' into Tethys

    Conflicts:
    	pom.xml
    	src/PamController/PamguardVersionInfo.java

commit bb17d384b34760e769316df72c8db3b0fa85e795
Merge: 031f4c7a 21fa4aff
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 15:34:05 2024 +0000

    Merge branch 'Tethys' into main

commit ac1a7f87ac614114e782b765d8154c35323f22db
Merge: 133da119 031f4c7a
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 15:29:05 2024 +0000

    Merge pull request #53 from PAMGuard/main

    changes from main

commit 031f4c7ab4dd97ee94ec4fe022b4ebee88314ab5
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 15:28:23 2024 +0000

    V 2.02.09aa with click marking bug fix

commit 217283c704a4a5523a47ca7519df1f66f006a9cf
Merge: 4856a827 46d01e62
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 11:58:31 2024 +0000

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

commit 4856a827dfe3cfb0c15a6124d16ca66308c7f7b6
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 11:57:11 2024 +0000

    click labelling

    fixed a couple of problems in click labelling (Viewer mode) when clics
    were reassigned to different events.

commit df178a41220a2ee4782231abe567528bf7c13fe2
Merge: 782057c0 133da119
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 10:16:35 2024 +0000

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

commit 133da119e0c8a4c1c96c2157077d70c3a51ac1cc
Merge: f097ddce 46d01e62
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 10:16:12 2024 +0000

    Merge pull request #52 from PAMGuard/main

    Merge from main

commit 46d01e62db84bfc25a6b2447b46887e66a2a6d6e
Merge: 0e5bca51 f097ddce
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 10:16:00 2024 +0000

    Merge branch 'main' into main

commit 0e5bca51983aaaa1b8b82b251034afd6f7793f04
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jan 12 10:11:21 2024 +0000

    Update X3 lib to 2.2.7

commit 21fa4aff078475202b5e7a7daaccae85cff854e2
Merge: 73810b85 716eb1fa
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 18:50:58 2023 +0000

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

    Conflicts:
    	src/tethys/swing/TethysMainPanel.java

commit 73810b85bf8fc1ebf5756f9ca9425005f87be5d8
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 18:48:24 2023 +0000

    use new diider location memory

commit 7a5e8f103105b158b7aebe7fbc1902adc8510e52
Merge: e48eb002 f097ddce
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 17:39:28 2023 +0000

    Merge branch 'main' into Tethys

    Conflicts:
    	pom.xml
    	src/PamController/PamguardVersionInfo.java

commit e48eb002043691be805ecf0fc71121e3fa1539ef
Merge: 70fbeaaf 1b8bb14e
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 17:37:02 2023 +0000

    Merge remote-tracking branch 'upstream/main' into Tethys

    Conflicts:
    	pom.xml
    	src/loggerForms/FormsDataDisplayTable.java

commit 70fbeaafdea7ff8c2c72dd8964a3a457797efc07
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 17:32:57 2023 +0000

    work on deployment wizards

commit 782057c020a26dbb8845124bcb43283d2f6b5a7d
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 17:28:23 2023 +0000

    claspath update

commit 716eb1faa7fcceb0eaad95c4281d43917f407091
Merge: c63fb3f3 e29f6f05
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 17:26:43 2023 +0000

    Merge branch 'Tethys' of https://github.com/douggillespie/PAMGuard into Tethys

commit c63fb3f341481caaacaace8928a3a704630c885a
Merge: 56bab82b b7cbd259
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 17:07:17 2023 +0000

    Merge branch 'main' into Tethys

    Conflicts:
    	src/loggerForms/FormsDataDisplayTable.java

commit f097ddce45c03edf05b46e3e354a7baf4cdba44b
Author: Douglas Gillespie <[email protected]>
Date:   Sat Dec 30 17:01:46 2023 +0000

    Split pane positioner

    Handy little class for remembering and restoring the positions of
    jSplitPane's

commit f5c3ce06cef0063937436b5708d3b17eeeebf60d
Author: Douglas Gillespie <[email protected]>
Date:   Fri Dec 29 17:55:30 2023 +0000

    Database opening from Explorer

    Sorted so that a viewer database can be opened by right clicking on a
    sqlite3 file. Requires updated installer to make appropriate registry
    changes. Will be in 2.02.10

commit e29f6f0589f42950a0826769c909821a6c9ed82b
Author: Douglas Gillespie <[email protected]>
Date:   Fri Dec 22 13:38:18 2023 +0000

    Fix Effort null pointers

    Trap a coupld of null pointer exceptions which get thrown when there are
    no acoustic data.

commit 56bab82be37e55d5fda86518c4ff087f22c13276
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 21 18:34:58 2023 +0000

    POM Excludes signature files

    Updated POM file to correctly exclude signature files which prevented
    PAMGuard from running from the installed version (unless these were
    manually removed from the jar file).

commit 99aa3f342c33bdc67034a8231e1c25b2741c96ef
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 21 17:07:23 2023 +0000

    Update nilus and javaclient

    Updated java client and nilus jar builds for Maven.

commit f4a42d2bb2922120219889b9eacad6bf3ba8570e
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 21 11:22:01 2023 +0000

    update pom to groupid tethys

commit 1b8bb14e9d26f111df5eafc868454ccbf6e0c2da
Author: Douglas Gillespie <[email protected]>
Date:   Wed Dec 20 16:47:18 2023 +0000

    Pre release V2.02.09f

    With release notes for V2.02.10 which is coming soon ...

commit f9a0716c0f66e569a8c10c1e422f994744ffd641
Author: Douglas Gillespie <[email protected]>
Date:   Wed Dec 20 14:51:10 2023 +0000

    Updates from DG (#120)

    * Stop command

    small change so command is available as a constant

    * Lots of small updates to enable opening of a secondary configuration for
    batch processing control.

    * Fix user input bug in viewer

    which created exponential copies of user comments!

    * Adding TAST trigger alarm action

    To be competed when GW provide correct string for interface

    * Echo offline detection

    Fix up affected datablocks for offline echo detection

    * fix module import

    System for importing modules from other psfx files was not working.
    Probably wasn't working for quite some time. Now fixed.

    * Bug fixes to Match Template classifier

    1) When a large template was imported only 1: fftLength of the mathc waveform was used and so clicks would be correlated with noise. The peak of the template is now used when the peak search function is selected.
    2) The plus button in the tab pane had disappeared.
    3) Seems like the decimators were the wrong round. So the waveforms were using an up sample function when they should have been using a decimator function. and vice versa...major bug when using different sample rates!

    * Fix merge

    Merged in a single commit from Jamies fork that had updates to the
    template classifier. Then had to make a few changes to get it working
    with other changes J had made that must have been in other commits.

    * Logger forms viewer

    Viewer display of logger forms was throwing exceptions on Boolean values
    which had been stored as a String or Integer 0 or 1 in some databases.
    Now fixed to turn these into a sensible boolean value for the data table

    * Logger form plotting

    Fixed logger form plotting in Viewer so that points can find their
    correct GPS position (based on time)

    * Fix small bugs

    * Fix settings import

    not all imports working. Now seems fixed.

    ---------

    Co-authored-by: Jamie Mac <[email protected]>

commit b7cbd2592fb2bdca4ca4aee0b1031811b3875410
Merge: ae8839e7 639f3360
Author: Douglas Gillespie <[email protected]>
Date:   Wed Dec 20 14:48:30 2023 +0000

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

commit ae8839e7566e06877ab2d476f41efdf23f410335
Author: Douglas Gillespie <[email protected]>
Date:   Wed Dec 20 14:48:15 2023 +0000

    Fix settings import

    not all imports working. Now seems fixed.

commit 639f33607e5fb2619a4d576c21daba50782e1bd3
Author: Douglas Gillespie <[email protected]>
Date:   Wed Dec 20 09:05:33 2023 +0000

    Fix small bugs

commit 3e4dd77908f3e28689471b5ed21103fb23daa92e
Author: Douglas Gillespie <[email protected]>
Date:   Tue Dec 19 16:41:57 2023 +0000

    Logger form plotting

    Fixed logger form plotting in Viewer so that points can find their
    correct GPS position (based on time)

commit 1d9768b8c102fe4f6fecaf78f109b65e545a524b
Author: Douglas Gillespie <[email protected]>
Date:   Tue Dec 19 16:41:57 2023 +0000

    Logger form plotting

    Fixed logger form plotting in Viewer so that points can find their
    correct GPS position (based on time)

commit 2fa91d69a5dde9ae72a08c216883bcd1adb40938
Author: Douglas Gillespie <[email protected]>
Date:   Tue Dec 19 16:41:57 2023 +0000

    Logger form plotting

    Fixed logger form plotting in Viewer so that points can find their
    correct GPS position (based on time)

commit 1461808b1487378fab601df992af3aef7da30b29
Author: Douglas Gillespie <[email protected]>
Date:   Tue Dec 19 16:41:57 2023 +0000

    Logger form plotting

    Fixed logger form plotting in Viewer so that points can find their
    correct GPS position (based on time)

commit 54f5a5f0fb9c10f2b79774b167b9e7561ac999bf
Author: Douglas Gillespie <[email protected]>
Date:   Tue Dec 19 15:54:38 2023 +0000

    Logger forms viewer

    Viewer display of logger forms was throwing exceptions on Boolean values
    which had been stored as a String or Integer 0 or 1 in some databases.
    Now fixed to turn these into a sensible boolean value for the data table

commit 0085215eff2f850a3b98e2bbf202bbf1110ff985
Author: Douglas Gillespie <[email protected]>
Date:   Tue Dec 19 15:54:38 2023 +0000

    Logger forms viewer

    Viewer display of logger forms was throwing exceptions on Boolean values
    which had been stored as a String or Integer 0 or 1 in some databases.
    Now fixed to turn these into a sensible boolean value for the data table

commit ea6caecc679a40acc170c28ee4c86e414b1459c0
Merge: d200e5c2 bfbb58ea
Author: Douglas Gillespie <[email protected]>
Date:   Tue Dec 19 12:45:56 2023 +0000

    Updated POM

    working POM for build with Tethys. Note though that it's failing to get
    rid of all signature files in the \META-INF\ folder, so the two files
    META-INF\ECLIPSE_.SF and META-INF\ECLIPSE_.RSA must be removed before
    the jar file can be used.

commit d200e5c2df101600324fb86943826a92fed3b7da
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 18:30:41 2023 +0000

    Maven stuff for nilus and javaclient

commit bfbb58ea5afeee61e66447eef112d66c47dd0921
Merge: 480f55f6 d1b40c1d
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 18:25:29 2023 +0000

    Merge pull request #51 from PAMGuard/main

    get whistle det fix

commit d1b40c1d86651d5f10e1638a866977351736eb1a
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 16:48:36 2023 +0000

    Release V2.02.09e

    fixes to WMD stub removal to make it a lot faster.

commit 3cf0a4e1e6fcc377be8cfeb6526388bc50599d16
Merge: 25d10d54 480f55f6
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 15:27:24 2023 +0000

    Merge remote-tracking branch 'origin/main' into Tethys

commit 291b00e1b1c5484a9fcc8be8caed7d8c04183a71
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 15:19:22 2023 +0000

    Merge from DG with fixes to MatchedTemplate classifier.  (#119)

    * Stop command

    small change so command is available as a constant

    * Lots of small updates to enable opening of a secondary configuration for
    batch processing control.

    * Fix user input bug in viewer

    which created exponential copies of user comments!

    * Adding TAST trigger alarm action

    To be competed when GW provide correct string for interface

    * Echo offline detection

    Fix up affected datablocks for offline echo detection

    * fix module import

    System for importing modules from other psfx files was not working.
    Probably wasn't working for quite some time. Now fixed.

    * Bug fixes to Match Template classifier

    1) When a large template was imported only 1: fftLength of the mathc waveform was used and so clicks would be correlated with noise. The peak of the template is now used when the peak search function is selected.
    2) The plus button in the tab pane had disappeared.
    3) Seems like the decimators were the wrong round. So the waveforms were using an up sample function when they should have been using a decimator function. and vice versa...major bug when using different sample rates!

    * Fix merge

    Merged in a single commit from Jamies fork that had updates to the
    template classifier. Then had to make a few changes to get it working
    with other changes J had made that must have been in other commits.

    ---------

    Co-authored-by: Jamie Mac <[email protected]>

commit 480f55f6e9b629f64cf6716e141033581e26bb58
Merge: 2f41c986 667b68e2
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 15:18:18 2023 +0000

    Merge pull request #50 from PAMGuard/main

    merge from main (#118)

commit 2f41c986f47bb00a89aae1b281ebcc240415fb2d
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 14:58:24 2023 +0000

    Fix merge

    Merged in a single commit from Jamies fork that had updates to the
    template classifier. Then had to make a few changes to get it working
    with other changes J had made that must have been in other commits.

commit 1b9d80b0ebbab36b19ed1340d75097cbd34a7a57
Author: Jamie Mac <[email protected]>
Date:   Thu Dec 14 12:06:51 2023 +0000

    Bug fixes to Match Template classifier

    1) When a large template was imported only 1: fftLength of the mathc waveform was used and so clicks would be correlated with noise. The peak of the template is now used when the peak search function is selected.
    2) The plus button in the tab pane had disappeared.
    3) Seems like the decimators were the wrong round. So the waveforms were using an up sample function when they should have been using a decimator function. and vice versa...major bug when using different sample rates!

commit 667b68e231e538a3ddad567eddc7299e84cf9930
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 14:09:30 2023 +0000

    merge from main (#118)

    * Stop command

    small change so command is available as a constant

    * Lots of small updates to enable opening of a secondary configuration for
    batch processing control.

    * Fix user input bug in viewer

    which created exponential copies of user comments!

    * Adding TAST trigger alarm action

    To be competed when GW provide correct string for interface

    * Echo offline detection

    Fix up affected datablocks for offline echo detection

    * fix module import

    System for importing modules from other psfx files was not working.
    Probably wasn't working for quite some time. Now fixed.

commit be88f4b2969c48670cf902c5d1d4c2d0c8203040
Merge: 0039ff74 7a321f6d
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 14:07:19 2023 +0000

    # WARNING: head commit changed in the meantime

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

commit 7a321f6d95b01a842af84f6c735bc58a353f20ba
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 13:28:38 2023 +0000

    Revert "Merge branch 'main' of https://github.com/PAMGuard/PAMGuard"

    This reverts commit f52a27ccf22f3abdb2665a56eea06972730d3443, reversing
    changes made to 4a5c6fe52ef9c4263fb5bcf75d40d3afff62fee9.

commit f52a27ccf22f3abdb2665a56eea06972730d3443
Merge: 4a5c6fe5 f8d2de44
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 12:45:53 2023 +0000

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

commit 4a5c6fe52ef9c4263fb5bcf75d40d3afff62fee9
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 18 12:45:49 2023 +0000

    small fix in histograms

    small fix in histograms to avoid null

commit 25d10d54b44dddd0aeb7d0da63fae882e363457a
Author: Douglas Gillespie <[email protected]>
Date:   Sun Dec 17 19:28:03 2023 +0000

    Start Tethys Help

commit a761100ba776a68278dedf1ca572e5c16cc626d9
Merge: c3edae51 0039ff74
Author: Douglas Gillespie <[email protected]>
Date:   Sun Dec 17 12:52:36 2023 +0000

    Merge remote-tracking branch 'origin/main' into Tethys

commit c3edae516b8a08e62dcea118bdfbc983c02451f4
Author: Douglas Gillespie <[email protected]>
Date:   Sun Dec 17 12:52:06 2023 +0000

    Small error handling

commit f8d2de448274558e517f7fd4173bd6825b8e69d0
Author: Douglas Gillespie <[email protected]>
Date:   Sun Dec 17 12:27:31 2023 +0000

    Settings import (#117)

    * Stop command

    small change so command is available as a constant

    * Lots of small updates to enable opening of a secondary configuration for
    batch processing control.

    * Fix user input bug in viewer

    which created exponential copies of user comments!

    * Adding TAST trigger alarm action

    To be competed when GW provide correct string for interface

    * Echo offline detection

    Fix up affected datablocks for offline echo detection

    * fix module import

    System for importing modules from other psfx files was not working.
    Probably wasn't working for quite some time. Now fixed.

commit 0039ff742287ab70bedab39735163a99800c3e9e
Author: Douglas Gillespie <[email protected]>
Date:   Sun Dec 17 12:19:18 2023 +0000

    fix module import

    System for importing modules from other psfx files was not working.
    Probably wasn't working for quite some time. Now fixed.

commit 2e29e9cd95b47320eecbb57633756d5716f96e0f
Author: Douglas Gillespie <[email protected]>
Date:   Fri Dec 15 17:49:39 2023 +0000

    Deployment and Detections work

    Big tidy up of Deployment and Detections output. Think it' spretty close
    to a functional system now.

commit 75d349e33c9051e9fdd7e722ed95f61a536f031b
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 18:52:17 2023 +0000

    Echo offline detection

    Fix up affected datablocks for offline echo detection

commit f55311ea36523828d1f04fc5723fae5a01ba1873
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 18:51:42 2023 +0000

    Adding TAST trigger alarm action

    To be competed when GW provide correct string for interface

commit 760b9769d720f46357aea4b098f7e9f46c14a83a
Merge: 4297afdc 951e3116
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 12:43:07 2023 +0000

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

commit 4297afdc51acf0b4cadb225b237be48851976965
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 12:42:41 2023 +0000

    Fix user input bug in viewer

    which created exponential copies of user comments!

commit 3059e087acf7ecbf6abeb7abf0dffe6192600788
Merge: 9a000586 87813746
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 12:27:14 2023 +0000

    Merge branch 'Tethys' of C:\Users\dg50\source\repos\PAMGuardTethys into
    Tethys

commit 9a0005861cd3b82c976b7331d242d70b6c7b1c25
Merge: 951e3116 5b649edc
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 12:14:44 2023 +0000

    Merge branch 'Tethys' of C:\Users\dg50\source\repos\PAMGuardTethys into
    Tethys

commit 878137468563c855f05623f77664bca157613800
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 11:57:44 2023 +0000

    Small changes to deployment table

commit ef92e1eea98ea24fa2341eb68061297793f4739b
Merge: 02ad66db 951e3116
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 10:53:46 2023 +0000

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

commit 951e3116a5ea872153b978064513f4e0fd2b624b
Merge: 2dd90f6a b12ccf9c
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 10:51:17 2023 +0000

    Merge pull request #48 from PAMGuard/main

    Merge from main

commit b12ccf9c6706ca223ce963c279a5f72958188285
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 10:50:29 2023 +0000

    Merge with main (#116)

    * Stop command

    small change so command is available as a constant

    * Lots of small updates to enable opening of a secondary configuration for
    batch processing control.

commit 02ad66db3b0dab92886df4199822b7dfca13e5f7
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 14 10:33:46 2023 +0000

    User input viewer bug

    PAMGuard was marking multiline comments as changed and then relogging
    them. Led to exponential increase in database size!

commit 03483ded18b3834cfa24a54e9bca6954e4e1a61e
Author: Douglas Gillespie <[email protected]>
Date:   Wed Dec 13 17:31:35 2023 +0000

    Deployment export

    Improved deployment export interface and options.

commit 860d1bec179cac7b57ef62adcaec67f69448a278
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 7 20:08:17 2023 +0000

    Update Calibration export

    Stop repeating hydrophones and add two addresses to Calibrations docs

commit 9c86b41027116936c683c374b20c01d2399fce1d
Author: Douglas Gillespie <[email protected]>
Date:   Thu Dec 7 15:10:45 2023 +0000

    Project info dialog

    More wrapping of nilus objects to make a general project info tab in
    PAMGuard. This is global and can share basic project informatin with the
    Tethys module.

commit 7721d7f1c01ff80edaeba7bd418ea56145b30901
Author: Douglas Gillespie <[email protected]>
Date:   Wed Dec 6 17:35:57 2023 +0000

    Global metadata

    Reorganised how global meta data for a PAMGuard dataset is managed by
    wrapping a nilus deployment object so that PAMGuard settings can
    serialise and unpack the xml version of a nilus Deployment object.

commit bafe93e7f54ceb38859b610d6aa1bc7ee13be501
Author: Douglas Gillespie <[email protected]>
Date:   Wed Dec 6 12:20:40 2023 +0000

    SQLLogging revert

    Revert main table definition class used by SQLLogging to
    PamTableDefinition, back from EmptyTableDefinition, to maintain
    compatibility with existing plugin modules.

commit 9939e8aa859b537685e07ede21c2898622c8fc62
Author: Douglas Gillespie <[email protected]>
Date:   Mon Dec 4 21:27:00 2023 +0000

    Calibrations Export

    Functional Calibrations export wizard and display

commit 275a53c042d0ced3761433a11b2783bc3d05878f
Author: Douglas Gillespie <[email protected]>
Date:   Sun Dec 3 18:21:09 2023 +0000

    Calibrations display

    display of calibrations documents + some general tidying up of document
    management and display.

commit 840e6c89a1fe2a1029b1b8c5c1d5419e7baec581
Author: Douglas Gillespie <[email protected]>
Date:   Thu Nov 16 20:36:14 2023 +0000

    R2.02.09d

    Fix matched template classifier import
    fix azigram help file image display

commit 2dd90f6a32b218648d89dd778f615be6681311d1
Merge: 58fe0d77 acc806d3
Author: Douglas Gillespie <[email protected]>
Date:   Wed Nov 15 15:02:50 2023 +0000

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

commit 58fe0d7754e03a2e69bfd4269c09e9a206c61460
Author: Douglas Gillespie <[email protected]>
Date:   Wed Nov 15 15:02:18 2023 +0000

    Lots of small updates to enable opening of a secondary configuration for
    batch processing control.

commit acc806d375b484323e23ccfd02435a3b667ff7b3
Author: Douglas Gillespie <[email protected]>
Date:   Wed Nov 15 13:08:02 2023 +0000

    Updated X3 library to 2.2.6

commit a4f484c76c17c761d779f52c1a8dddafdc03dcd5
Merge: 8e60ad2e d7c4c278
Author: Douglas Gillespie <[email protected]>
Date:   Wed Nov 15 09:44:09 2023 +0000

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

commit 8e60ad2eff108c29bcb024a5f9ca3b2ef4fe20ae
Author: Douglas Gillespie <[email protected]>
Date:   Wed Nov 15 09:43:39 2023 +0000

    update to array diagnostics and sensor control

commit d7c4c278d806b3ab4effe45153079fc4792ce764
Author: m2oswald <[email protected]>
Date:   Wed Nov 15 09:17:49 2023 +0000

    Added code to Rocca for training/testing classifier (#114)

    * allow Rocca to run without classifiers

    Fixed bug that threw an error if no classifier files were specified in Rocca Params dialog

    * add rocca switch to enable dev mode

    currently only shows/hides extra buttons in the Params dialog, but will
    extend to more options in the future

    * Fix memory issue with RoccaContourDataBlocks not being released for
    garbage collection

    Set RoccaContourDataBlock objects to null and stop PamObserver Timer to
    force release

    * Fix problem tracing whistles in Rocca spectrogram pop-up

    Whistle and raw data were being cleared before the user had time to trace out the whistle, causing PAMGuard to throw an exception.  Both were already being cleared when the pop-up window is closed, so no need to do it here.

    * updated for training/testing classifiers

commit d5f504dcd1a28fcf88d18b7624826e0e1d325ab9
Author: Douglas Gillespie <[email protected]>
Date:   Fri Nov 10 18:08:31 2023 +0000

    Bearing localiser offline save

    Bug stopping it correctly saving data from the offline task to the
    database fixed.

commit 6cc01fe77a4c0d6dd8ae5c386ae1522c02218d01
Merge: 1f8e790a 9fca879c
Author: Douglas Gillespie <[email protected]>
Date:   Fri Oct 27 10:06:52 2023 +0100

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

commit 9fca879c3967243b32abe8e581eacb4aedc249c9
Merge: bff8eeeb 7a44d49e
Author: Douglas Gillespie <[email protected]>
Date:   Fri Oct 27 10:02:47 2023 +0100

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

commit 7a44d49e27189d2a1049662ae9f6e1dce81a098f
Author: Douglas Gillespie <[email protected]>
Date:   Fri Oct 27 09:59:28 2023 +0100

    X3 Version 2.2.3

    Add maven jar files for X3/SUD version 2.2.3

commit bff8eeebc56d636a5dfa3f87f7b0e2ed754b0ab8
Merge: 3da3f31b fa5fe994
Author: Douglas Gillespie <[email protected]>
Date:   Thu Oct 26 15:50:26 2023 +0100

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

commit fa5fe9943db6b10a64f563b8a05917f12341182c
Author: Douglas Gillespie <[email protected]>
Date:   Thu Oct 26 14:44:41 2023 +0100

    update sud file management to more efficiently skip to the correct part
    of a sud file when reading data offline.

commit 1f8e790ae5c8008df4967146d4977ec82d2c8a0d
Author: Douglas Gillespie <[email protected]>
Date:   Fri Sep 29 13:43:49 2023 +0100

    Collection enum

    Made an enum for the different collections. More robust than passing the
    names around as strings. Contains functions for converting between the
    collection name and the documents names within those collections.

commit 773f1f542b3d41842df6aa2cb77c857fa686705c
Author: Douglas Gillespie <[email protected]>
Date:   Sun Sep 24 21:59:15 2023 +0100

    Species map i/o

commit 8257122d140f1834cfbb2dfdf8d223a385a0515c
Author: Douglas Gillespie <[email protected]>
Date:   Thu Sep 21 18:01:41 2023 +0100

    Log Tethys output and include instrumentid in Deployment queries

commit 4d294b56a8673a3f938f87b6be3237e234804a17
Author: Douglas Gillespie <[email protected]>
Date:   Tue Sep 19 16:55:33 2023 +0100

    Click event output

commit 5fe0927c107da95ad53674f3d1986bb4f1e5e579
Author: Douglas Gillespie <[email protected]>
Date:   Mon Sep 18 12:49:39 2023 +0100

    Noise logging

commit 415ec87938d5e7d76e2d9c7735826d3e42738695
Author: Douglas Gillespie <[email protected]>
Date:   Sun Sep 17 21:10:23 2023 +0100

    noise output

commit 158eedce8c06d47719c49a97f6ea6d2f8446ce7c
Author: Douglas Gillespie <[email protected]>
Date:   Fri Sep 15 15:15:28 2023 +0100

    Detections output

    more work on detections output.

commit db1cc75bc1f96e39f49eaf0278b38fea801e6846
Author: Douglas Gillespie <[email protected]>
Date:   Wed Sep 13 17:28:47 2023 +0100

    More output

    More changes to Detections output.

commit 85fd84d18ace66f4c675ea7c0e07db794ebf3c96
Author: Douglas Gillespie <[email protected]>
Date:   Mon Sep 11 21:52:46 2023 +0100

    Fix binned output

    couple of fixes in binned output

commit 65dfb5688b7fb8374dd0bb6b48dec2c565fe8c16
Author: Douglas Gillespie <[email protected]>
Date:   Mon Sep 11 17:47:50 2023 +0100

    More on granularity

    Nice format of granularity in display tables.

commit c221d78aa276cd9d63f560b77c8c5925121bd197
Author: Douglas Gillespie <[email protected]>
Date:   Mon Sep 11 17:07:15 2023 +0100

    Added bin granularity

    binned granularity in place. TODO Encounter granularity.

commit baca001ed87f467512f5ff08f050d7ba106b1449
Author: Douglas Gillespie <[email protected]>
Date:   Fri Sep 8 16:31:00 2023 +0100

    Param output only if not display

commit 74652431692c47a6ed41f5b4a304ac06f8f87599
Merge: fb00a757 3da3f31b
Author: Douglas Gillespie <[email protected]>
Date:   Fri Sep 8 13:32:22 2023 +0100

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

commit 3da3f31b33525132b53b2dd4275417c64fa5a9ca
Merge: dbeaa668 3385935a
Author: Douglas Gillespie <[email protected]>
Date:   Fri Sep 8 13:29:37 2023 +0100

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

commit dbeaa66821a049a597eb43c63fec49e785998520
Merge: 1b5454be 60435e56
Author: Douglas Gillespie <[email protected]>
Date:   Fri Sep 8 13:26:11 2023 +0100

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

commit 60435e567a9e38a7c47c2f0df21f3147e15d5e74
Author: Brian S Miller <[email protected]>
Date:   Fri Sep 8 21:54:40 2023 +1000

    Fixes issues #111 and fixes #112 (DIFAR module crashes and ability to use Deep Learning Detections in DIFAR module) (#110)

    * Bugfix for OverlayMarks

    Check for a null pointer exception in OverlayMarks that was causing a crash on startup.

    * Bugfix for null pointer in symbol manager

    Fix a bug that I found where the DIFAR module was crashing the symbol manager. Seems that this was due to this subclass of clip generator having a null value for it's uniqueName. I've fixed by checking for null values and assigning a generic symbol when null.

    * DeepLearning detections canGenerateClips=true

    Set flag in DeepLearning detector so that detections are considered 'clips' by Pamguard. This allows them to be processed automatically in the DIFAR Localisation module (and maybe others).

    * DIFAR: bugfix frequency limits for auto-detections

    Fix a bug in DIFAR module where the frequency limits of automated detections were not being set properly by the DIFAR module.

    * DeepLearning - Bugfix to detection duration

    Fix bug in deep learning detector where duration (in samples) was being set to number of samples in a hop instead of the number of samples in a segment.

commit fb00a757cd4e15b70dd87cdae759adea8b50f65b
Author: Douglas Gillespie <[email protected]>
Date:   Thu Sep 7 16:58:38 2023 +0100

    Data export

    A few fixes in Detections export.

commit 3688719e25b89f41add4182fdd6ef1fcf4a16660
Author: Douglas Gillespie <[email protected]>
Date:   Thu Aug 31 17:06:51 2023 +0100

    Working parameter output

    Only just and not complete, but working.

commit 07ced6ae6d8db75f95c7d3aec3a42eb8209fbe0f
Author: Douglas Gillespie <[email protected]>
Date:   Tue Aug 29 11:53:40 2023 +0100

    Species info

    Sort out of species info which hopefully now deals with all
    eventualities.

commit 74deebe446e3ccb1ac05b1834ed4e7bad6c2b49a
Author: Douglas Gillespie <[email protected]>
Date:   Tue Aug 8 18:29:45 2023 +0100

    Fixed queries

    Also added internal display of existing docuemtns (so they can be
    deleted)

commit 901817689910b6c39dcd3b780615f81527edc961
Author: Douglas Gillespie <[email protected]>
Date:   Thu Jul 20 19:06:42 2023 +0100

    ITIS Codes GUI

    Basic system in place for handling ITIS species codes.

commit 5c969d888975a4f2f79c9011f25ef6bfd5352c01
Author: Douglas Gillespie <[email protected]>
Date:   Wed Jul 19 13:56:39 2023 +0100

    work on species mapping

commit 527aeccbb8c44ec65f58570e9f67cdf74eff3da1
Merge: cd70026c 3385935a
Author: Douglas Gillespie <[email protected]>
Date:   Mon Jul 3 18:00:53 2023 +0100

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

commit cd70026cf8c6fd13c9a9ad3d031c47c007a072ef
Author: Douglas Gillespie <[email protected]>
Date:   Mon Jul 3 17:53:35 2023 +0100

    Starting to map species codes

commit 3385935aec458df2a1cfbda10b9c3ed234f0c936
Merge: 68b2f3bb c3c31c33
Author: Douglas Gillespie <[email protected]>
Date:   Mon Jul 3 17:48:41 2023 +0100

    Merge pull request #47 from PAMGuard/main

    pull from main

commit 75470b450b53f7c37b4a01655e993918ea20f563
Merge: f3944e35 68b2f3bb
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jun 9 13:01:35 2023 +0100

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

    Conflicts:
    	src/PamModel/PamModel.java

commit f3944e35361842672c7d35148cf76b2a45a1cf86
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jun 9 12:56:23 2023 +0100

    Update FolderInputSystem.java

commit 68b2f3bb538e70b53b8ad3f4e06f28376d67a769
Merge: 1b5454be b0a06300
Author: Douglas Gillespie <[email protected]>
Date:   Fri Jun 9 12:53:30 2023 +0100

    Merge pull request #46 from PAMGuard/main

    get V2.02.08 from main

commit 3df05c3ec61298b5058dcb05c0cb6a4aba0d8815
Author: Douglas Gillespie <[email protected]>
Date:   Mon May 29 15:27:21 2023 +0100

    Document export

commit 36da1bcbeb1770d96ca8d12532233d7a7574d7d9
Merge: 1ea20d80 1b5454be
Author: Douglas Gillespie <[email protected]>
Date:   Mon May 29 09:02:48 2023 +0100

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

commit 1b5454be9179f1ecce2e6b4796611f2fba5be79d
Author: Douglas Gillespie <[email protected]>
Date:   Fri May 26 10:27:25 2023 +0100

    Stop command

    small change so command is available as a constant

commit d8419591713f273baac411faa112d6996e247376
Merge: f97f967b d350d5a7
Author: Douglas Gillespie <[email protected]>
Date:   Fri May 26 09:53:08 2023 +0100

    Merge pull request #45 from PAMGuard/main

    pull from main

commit f97f967b237c8cc33b2dd26a723b019cbe9844e4
Merge: 508ca524 c17208d3
Author: Douglas Gillespie <[email protected]>
Date:   Tue May 23 15:46:57 2023 +0100

    Merge pull request #44 from PAMGuard/main

    Map file errors

commit 508ca524e8be4437598b8201be556d578c881c9c
Merge: becb24dc db037c6d
Author: Douglas Gillespie <[email protected]>
Date:   Fri May 12 15:38:04 2023 +0100

    Merge pull request #43 from PAMGuard/main

    update from main

commit 1ea20d80ed1702e6e58f6e6d3dd7c0e973b9816e
Merge: 49843b40 becb24dc
Author: Douglas Gillespie <[email protected]>
Date:   Mon May 8 15:46:04 2023 +0100

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

commit becb24dcc5907c56462e9ea849d48be969c33bf3
Merge: 2953d82b 29f0bf7e
Author: Douglas Gillespie <[email protected]>
Date:   Mon May 8 15:43:58 2023 +0100

    Merge pull request #42 from PAMGuard/main

    X3 updates

commit 49843b405fbdb8c502eaf3db805c71a0e8cc4489
Author: Douglas Gillespie <[email protected]>
Date:   Sun May 7 20:06:59 2023 +0100

    Some query changes

    Changes in server code required update of some of the json for existing
    queries.

commit 00410d20179a1ada8d87b1212b2c760902c510a2
Author: Douglas Gillespie <[email protected]>
Date:   Sun May 7 19:00:37 2023 +0100

    Exception handling

    Exception handling and warning messages on Tethys transactions

commit 71c8415bc87a32bb99c39f71c8948c902931792a
Author: Douglas Gillespie <[email protected]>
Date:   Sat May 6 19:26:04 2023 +0100

    Playing with export options

commit 38b05b13c54a0f86f80119123c4f757dc51be1c9
Merge: 8a9719b4 2953d82b
Author: Douglas Gillespie <[email protected]>
Date:   Sat May 6 11:15:48 2023 +0100

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

commit 8a9719b425144868f6807c711e556db75604d1eb
Author: Douglas Gillespie <[email protected]>
Date:   Mon May 1 18:55:35 2023 +0100

    Tethys working again

    And a bit more playing around with metadata handling for Deploymnet
    documents

commit 379cd61afa54dedfec45cad8b0de0e661c9015ab
Merge: 4f0f4a6c f74bb5eb
Author: Douglas Gillespie <[email protected]>
Date:   Mon Apr 24 13:35:51 2023…

.project

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
- <name>PamGuard Main DG</name>
+ <name>PamGuard Main Tethys</name>
  <comment></comment>
  <projects>
  </projects>

repo/org/pamguard/x3/2.2.5/_remote.repositories

@@ -1,6 +1,12 @@
 #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+<<<<<<<< HEAD:repo/org/pamguard/x3/2.2.5/_remote.repositories
 #Wed Aug 02 09:25:44 BST 2023
 X3-2.2.5-sources.jar>=
 X3-2.2.5-javadoc.jar>=
 X3-2.2.5.jar>=
 X3-2.2.5.pom>=
+========
+#Thu Dec 21 11:14:13 GMT 2023
+nilus-3.0.pom>=
+nilus-3.0.jar>=
+>>>>>>>> upstream/main:repo/tethys/org/nilus/3.0/_remote.repositories

repo/pamguard/org/x3/2.2.3/_remote.repositories

@@ -1,4 +1,10 @@
 #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/_remote.repositories
 #Thu Oct 26 14:35:14 BST 2023
 x3-2.2.3.jar>=
 x3-2.2.3.pom>=
+========
+#Fri Jan 12 10:06:13 GMT 2024
+x3-2.2.7.jar>=
+x3-2.2.7.pom>=
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/_remote.repositories

repo/pamguard/org/x3/2.2.3/x3-2.2.3-javadoc.jar.lastUpdated

@@ -1,12 +1,25 @@
 #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/x3-2.2.3-javadoc.jar.lastUpdated
 #Thu Oct 26 14:39:06 BST 2023
 @default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1698327545863
 file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.lastUpdated=1698327544361
+========
+#Fri Jan 12 10:09:16 GMT 2024
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1705054156080
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.lastUpdated=1705054154613
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/x3-2.2.7-javadoc.jar.lastUpdated
 https\://repo1.maven.org/maven2/.error=
 file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.error=
 https\://artifacts.unidata.ucar.edu/repository/unidata-all/.error=
 https\://nexus.bedatadriven.com/content/groups/public/.error=
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/x3-2.2.3-javadoc.jar.lastUpdated
 https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1698327545797
 https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1698327545616
 https\://repo1.maven.org/maven2/.lastUpdated=1698327546068
 https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact pamguard.org\:x3\:jar\:javadoc\:2.2.3 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com
+========
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1705054156060
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1705054155868
+https\://repo1.maven.org/maven2/.lastUpdated=1705054156344
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact pamguard.org\:x3\:jar\:javadoc\:2.2.7 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/x3-2.2.7-javadoc.jar.lastUpdated

repo/pamguard/org/x3/2.2.3/x3-2.2.3-sources.jar.lastUpdated

@@ -1,4 +1,5 @@
 #NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/x3-2.2.3-sources.jar.lastUpdated
 #Thu Oct 26 15:50:39 BST 2023
 @default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1698327461349
 file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.lastUpdated=1698327459306
@@ -12,3 +13,16 @@ https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not tran
 file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG/repo/.lastUpdated=1698331839687
 file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.error=
 https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1698327461288
+========
+#Fri Jan 12 10:06:49 GMT 2024
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1705054009062
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.lastUpdated=1705054007956
+https\://repo1.maven.org/maven2/.error=
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.error=
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1705054008945
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1705054008751
+https\://repo1.maven.org/maven2/.lastUpdated=1705054009308
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact pamguard.org\:x3\:jar\:sources\:2.2.7 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/x3-2.2.7-sources.jar.lastUpdated

repo/pamguard/org/x3/2.2.3/x3-2.2.3.pom

@@ -4,6 +4,10 @@
  <modelVersion>4.0.0</modelVersion>
  <groupId>pamguard.org</groupId>
  <artifactId>x3</artifactId>
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/x3-2.2.3.pom
  <version>2.2.3</version>
+========
+ <version>2.2.7</version>
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/x3-2.2.7.pom
  <description>POM was created from install:install-file</description>
 </project>

repo/pamguard/org/x3/2.2.7/_remote.repositories

@@ -0,0 +1,10 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/_remote.repositories
+#Thu Oct 26 14:35:14 BST 2023
+x3-2.2.3.jar>=
+x3-2.2.3.pom>=
+========
+#Fri Jan 12 10:06:13 GMT 2024
+x3-2.2.7.jar>=
+x3-2.2.7.pom>=
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/_remote.repositories

repo/pamguard/org/x3/2.2.7/m2e-lastUpdated.properties

@@ -0,0 +1,11 @@
+#Fri Jan 12 10:09:16 GMT 2024
+bedatadriven|https\://nexus.bedatadriven.com/content/groups/public/|javadoc=1705054156349
+repo|file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo|sources=1705054009341
+repo|file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo|javadoc=1705054156349
+talan|https\://nexus.talanlabs.com/content/repositories/releases/|javadoc=1705054156349
+central|https\://repo1.maven.org/maven2|sources=1705054009341
+unidata-all|https\://artifacts.unidata.ucar.edu/repository/unidata-all/|javadoc=1705054156349
+talan|https\://nexus.talanlabs.com/content/repositories/releases/|sources=1705054009341
+bedatadriven|https\://nexus.bedatadriven.com/content/groups/public/|sources=1705054009341
+unidata-all|https\://artifacts.unidata.ucar.edu/repository/unidata-all/|sources=1705054009341
+central|https\://repo1.maven.org/maven2|javadoc=1705054156349

repo/pamguard/org/x3/2.2.7/x3-2.2.7-javadoc.jar.lastUpdated

@@ -0,0 +1,25 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/x3-2.2.3-javadoc.jar.lastUpdated
+#Thu Oct 26 14:39:06 BST 2023
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1698327545863
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.lastUpdated=1698327544361
+========
+#Fri Jan 12 10:09:16 GMT 2024
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1705054156080
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.lastUpdated=1705054154613
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/x3-2.2.7-javadoc.jar.lastUpdated
+https\://repo1.maven.org/maven2/.error=
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.error=
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.error=
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/x3-2.2.3-javadoc.jar.lastUpdated
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1698327545797
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1698327545616
+https\://repo1.maven.org/maven2/.lastUpdated=1698327546068
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact pamguard.org\:x3\:jar\:javadoc\:2.2.3 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com
+========
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1705054156060
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1705054155868
+https\://repo1.maven.org/maven2/.lastUpdated=1705054156344
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact pamguard.org\:x3\:jar\:javadoc\:2.2.7 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/x3-2.2.7-javadoc.jar.lastUpdated

repo/pamguard/org/x3/2.2.7/x3-2.2.7-sources.jar.lastUpdated

@@ -0,0 +1,28 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/x3-2.2.3-sources.jar.lastUpdated
+#Thu Oct 26 15:50:39 BST 2023
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1698327461349
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.lastUpdated=1698327459306
+https\://repo1.maven.org/maven2/.error=
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG/repo/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.error=
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.error=
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1698327460817
+https\://repo1.maven.org/maven2/.lastUpdated=1698327461652
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact pamguard.org\:x3\:jar\:sources\:2.2.3 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG/repo/.lastUpdated=1698331839687
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1698327461288
+========
+#Fri Jan 12 10:06:49 GMT 2024
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1705054009062
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.lastUpdated=1705054007956
+https\://repo1.maven.org/maven2/.error=
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardPAMGuard/repo/.error=
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1705054008945
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1705054008751
+https\://repo1.maven.org/maven2/.lastUpdated=1705054009308
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact pamguard.org\:x3\:jar\:sources\:2.2.7 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/x3-2.2.7-sources.jar.lastUpdated

repo/pamguard/org/x3/2.2.7/x3-2.2.7.pom

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>pamguard.org</groupId>
+ <artifactId>x3</artifactId>
+<<<<<<<< HEAD:repo/pamguard/org/x3/2.2.3/x3-2.2.3.pom
+ <version>2.2.3</version>
+========
+ <version>2.2.7</version>
+>>>>>>>> upstream/main:repo/pamguard/org/x3/2.2.7/x3-2.2.7.pom
+ <description>POM was created from install:install-file</description>
+</project>

repo/tethys/org/javaclient/3.0/_remote.repositories

@@ -0,0 +1,4 @@
+#NOTE: This is an Aether internal implementation file, its format can be changed without prior notice.
+#Thu Dec 21 11:13:37 GMT 2023
+javaclient-3.0.jar>=
+javaclient-3.0.pom>=

repo/tethys/org/javaclient/3.0/javaclient-3.0.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>tethys.org</groupId>
+ <artifactId>javaclient</artifactId>
+ <version>3.0</version>
+ <description>POM was created from install:install-file</description>
+</project>

repo/tethys/org/javaclient/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>tethys.org</groupId>
+ <artifactId>javaclient</artifactId>
+ <versioning>
+ <release>3.0</release>
+ <versions>
+ <version>3.0</version>
+ </versions>
+ <lastUpdated>20231221111337</lastUpdated>
+ </versioning>
+</metadata>

repo/tethys/org/nilus/3.0/_remote.repositories

@@ -0,0 +1,12 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+<<<<<<<< HEAD:repo/org/pamguard/x3/2.2.5/_remote.repositories
+#Wed Aug 02 09:25:44 BST 2023
+X3-2.2.5-sources.jar>=
+X3-2.2.5-javadoc.jar>=
+X3-2.2.5.jar>=
+X3-2.2.5.pom>=
+========
+#Thu Dec 21 11:14:13 GMT 2023
+nilus-3.0.pom>=
+nilus-3.0.jar>=
+>>>>>>>> upstream/main:repo/tethys/org/nilus/3.0/_remote.repositories

repo/tethys/org/nilus/3.0/m2e-lastUpdated.properties

@@ -0,0 +1,11 @@
+#Thu Dec 21 16:45:12 GMT 2023
+bedatadriven|https\://nexus.bedatadriven.com/content/groups/public/|javadoc=1703177112968
+talan|https\://nexus.talanlabs.com/content/repositories/releases/|javadoc=1703177112968
+repo|file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG_2/repo|javadoc=1703177112968
+central|https\://repo1.maven.org/maven2|sources=1703157324238
+unidata-all|https\://artifacts.unidata.ucar.edu/repository/unidata-all/|javadoc=1703177112968
+repo|file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG_2/repo|sources=1703157324238
+talan|https\://nexus.talanlabs.com/content/repositories/releases/|sources=1703157324238
+bedatadriven|https\://nexus.bedatadriven.com/content/groups/public/|sources=1703157324238
+unidata-all|https\://artifacts.unidata.ucar.edu/repository/unidata-all/|sources=1703157324238
+central|https\://repo1.maven.org/maven2|javadoc=1703177112968

repo/tethys/org/nilus/3.0/nilus-3.0-javadoc.jar.lastUpdated

@@ -0,0 +1,12 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Thu Dec 21 16:45:12 GMT 2023
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1703177112601
+https\://repo1.maven.org/maven2/.error=
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG_2/repo/.error=
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG_2/repo/.lastUpdated=1703177110940
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1703177112519
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1703177112101
+https\://repo1.maven.org/maven2/.lastUpdated=1703177112965
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact tethys.org\:nilus\:jar\:javadoc\:3.0 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com

repo/tethys/org/nilus/3.0/nilus-3.0-sources.jar.lastUpdated

@@ -0,0 +1,12 @@
+#NOTE: This is a Maven Resolver internal implementation file, its format can be changed without prior notice.
+#Thu Dec 21 11:15:24 GMT 2023
+@default-talan-https\://nexus.talanlabs.com/content/repositories/releases/.lastUpdated=1703157323819
+https\://repo1.maven.org/maven2/.error=
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG_2/repo/.error=
+file\://C\:\\Users\\dg50\\source\\repos\\PAMGuardDG_2/repo/.lastUpdated=1703157322932
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.error=
+https\://nexus.bedatadriven.com/content/groups/public/.lastUpdated=1703157323770
+https\://artifacts.unidata.ucar.edu/repository/unidata-all/.lastUpdated=1703157323508
+https\://repo1.maven.org/maven2/.lastUpdated=1703157324237
+https\://nexus.talanlabs.com/content/repositories/releases/.error=Could not transfer artifact tethys.org\:nilus\:jar\:sources\:3.0 from/to talan (https\://nexus.talanlabs.com/content/repositories/releases/)\: nexus.talanlabs.com

repo/tethys/org/nilus/3.0/nilus-3.0.pom

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>tethys.org</groupId>
+ <artifactId>nilus</artifactId>
+ <version>3.0</version>
+ <description>POM was created from install:install-file</description>
+</project>

repo/tethys/org/nilus/maven-metadata-local.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metadata>
+ <groupId>tethys.org</groupId>
+ <artifactId>nilus</artifactId>
+ <versioning>
+ <release>3.0</release>
+ <versions>
+ <version>3.0</version>
+ </versions>
+ <lastUpdated>20231221111413</lastUpdated>
+ </versioning>
+</metadata>

src/AIS/AISParameters.java

@@ -5,6 +5,7 @@
 
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 
 public class AISParameters implements Serializable, Cloneable, ManagedParameters {
@@ -51,7 +52,7 @@ protected AISParameters clone() {
 
  @Override
  public PamParameterSet getParameterSet() {
- PamParameterSet ps = PamParameterSet.autoGenerate(this);
+ PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
  try {
  Field field = this.getClass().getDeclaredField("nmeaSource");
  ps.put(new PrivatePamParameterData(this, field) {

src/AIS/AISPositionReport.java

@@ -5,6 +5,7 @@
 import NMEA.NMEABitArray;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.LatLong;
 
 /**
@@ -160,7 +161,7 @@ public boolean hasTrueHeading() {
 
  @Override
  public PamParameterSet getParameterSet() {
- PamParameterSet ps = PamParameterSet.autoGenerate(this);
+ PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
  return ps;
  }
 

src/AIS/AISStaticData.java

@@ -6,6 +6,7 @@
 import NMEA.NMEABitArray;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamUtils.PamCalendar;
 
 public class AISStaticData extends AISReport implements Serializable, ManagedParameters{
@@ -393,7 +394,7 @@ public double getWidth() {
 
  @Override
  public PamParameterSet getParameterSet() {
- PamParameterSet ps = PamParameterSet.autoGenerate(this);
+ PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DISPLAY);
  return ps;
  }
 

src/Acquisition/AcquisitionControl.java

@@ -283,6 +283,16 @@ public static ArrayList<AcquisitionControl> getControllers() {
  return daqControllers;
  }
 
+ @Override
+ public String getDataLocation() {
+ if (offlineFileServer == null) {
+ return null;
+ }
+ else {
+ return offlineFileServer.getDataLocation();
+ }
+ }
+
  public AcquisitionProcess getDaqProcess() {
  return acquisitionProcess;
  }

src/Acquisition/AcquisitionDialog.java

@@ -151,6 +151,7 @@ static public AcquisitionParameters showDialog(Frame parentFrame, AcquisitionCon
  acquisitionParameters = oldParams.clone();
 
  acquisitionControl = daqControl;
+// singleInstance = null;
 
  if (singleInstance == null || singleInstance.getOwner() != parentFrame) {
  singleInstance = new AcquisitionDialog(parentFrame);

src/Acquisition/AcquisitionParameters.java

@@ -10,6 +10,7 @@
 import PamController.PamController;
 import PamModel.parametermanager.ManagedParameters;
 import PamModel.parametermanager.PamParameterSet;
+import PamModel.parametermanager.PamParameterSet.ParameterSetType;
 import PamModel.parametermanager.PrivatePamParameterData;
 import PamguardMVC.PamConstants;
 
@@ -320,7 +321,7 @@ public PPSParameters getPpsParameters() {
 
  @Override
  public PamParameterSet getParameterSet() {
- PamParameterSet ps = PamParameterSet.autoGenerate(this);
+ PamParameterSet ps = PamParameterSet.autoGenerate(this, ParameterSetType.DETECTOR);
  try {
  Field field = this.getClass().getDeclaredField("channelList");
  ps.put(new PrivatePamParameterData(this, field) {