nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2024-11-25 00:22:27 +00:00
Code Issues Packages Projects Releases Wiki Activity
ba9f7a35d9
PAMGuard/README.files/colorschememapping.xml
Jamie Mac f4844e8fcd Squashed commit of the following: 
commit 34ba7ebceb
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Aug 23 09:15:40 2024 +0100

    Merge from DG (#150)

    * Localization output

    * update localiser output

    * Start effort management system

    * Start of Effort plotting

    Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

    * Logger forms update

    Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

    * Update LoggerFormGraphics.java

    add in correct symbol managemet to forms graphics.

    * Effort lines on map

    Sort of working OK in real time mode.

    * Working effort system

    Currently only for map, but seems to work OK

    * Update Tethys to latest nilus schema

    * Raven importer

    Start of a system for a raven importer. Not quite working yet.

    * Raven import

    Basic functionality working. Not nice to use though.

    * Tethys Localization work

    Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

    * updated Nilus

    A few updates around track and target motion measures.

    * FX Plot for raven data

    Also sorted out symbols a bit and improved symbol selector in Generic plots.

    * Update spectrogram mark bearing display

    Remove the 90-angle bit

    * Raven extra columns

    Logging of data from additional Raven table columns

commit cb1b28423e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Aug 19 15:55:25 2024 +0100

    updates ready for 2.2.12

commit 4829b46b36
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Aug 19 11:54:24 2024 +0100

    Merge from DG (#149)

    * Localization output

    * update localiser output

    * Start effort management system

    * Start of Effort plotting

    Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

    * Logger forms update

    Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

    * Update LoggerFormGraphics.java

    add in correct symbol managemet to forms graphics.

    * Effort lines on map

    Sort of working OK in real time mode.

    * Working effort system

    Currently only for map, but seems to work OK

    * Update Tethys to latest nilus schema

    * Raven importer

    Start of a system for a raven importer. Not quite working yet.

    * Raven import

    Basic functionality working. Not nice to use though.

    * Tethys Localization work

    Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

    * updated Nilus

    A few updates around track and target motion measures.

    * FX Plot for raven data

    Also sorted out symbols a bit and improved symbol selector in Generic plots.

    * Update spectrogram mark bearing display

    Remove the 90-angle bit

commit 507ff9e28d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Sat Aug 17 14:34:54 2024 +0100

    Merge from DG (#148)

    * Localization output

    * update localiser output

    * Start effort management system

    * Start of Effort plotting

    Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

    * Logger forms update

    Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

    * Update LoggerFormGraphics.java

    add in correct symbol managemet to forms graphics.

    * Effort lines on map

    Sort of working OK in real time mode.

    * Working effort system

    Currently only for map, but seems to work OK

    * Update Tethys to latest nilus schema

    * Raven importer

    Start of a system for a raven importer. Not quite working yet.

    * Raven import

    Basic functionality working. Not nice to use though.

    * Tethys Localization work

    Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

    * updated Nilus

    A few updates around track and target motion measures.

    * FX Plot for raven data

    Also sorted out symbols a bit and improved symbol selector in Generic plots.

commit 51757499d4
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Aug 16 10:44:54 2024 +0100

    Merge from DG (#147)

    * Localization output

    * update localiser output

    * Start effort management system

    * Start of Effort plotting

    Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

    * Logger forms update

    Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

    * Update LoggerFormGraphics.java

    add in correct symbol managemet to forms graphics.

    * Effort lines on map

    Sort of working OK in real time mode.

    * Working effort system

    Currently only for map, but seems to work OK

    * Update Tethys to latest nilus schema

    * Raven importer

    Start of a system for a raven importer. Not quite working yet.

    * Raven import

    Basic functionality working. Not nice to use though.

    * Tethys Localization work

    Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

    * updated Nilus

    A few updates around track and target motion measures.

commit 46bd88c197
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Aug 16 10:40:00 2024 +0100

    Merge Tethys updates from DG (#146)

    * Localization output

    * update localiser output

    * Start effort management system

    * Start of Effort plotting

    Strat of effort plotting on map. Framework for using Effort data in other areas (such as Tethys output).

    * Logger forms update

    Effort and Symbol selectors working with Logger forms. Also functions to add, edit and delete form rows in Viewer mode.

    * Update LoggerFormGraphics.java

    add in correct symbol managemet to forms graphics.

    * Effort lines on map

    Sort of working OK in real time mode.

    * Working effort system

    Currently only for map, but seems to work OK

    * Update Tethys to latest nilus schema

    * Raven importer

    Start of a system for a raven importer. Not quite working yet.

    * Raven import

    Basic functionality working. Not nice to use though.

    * Tethys Localization work

    Abstracting out writing of localization objects and document header information so that individual localisers can give fine scale control of this stuff.

    * updated Nilus

    A few updates around track and target motion measures.

commit bea4a544d0
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Aug 8 14:27:05 2024 +0100

    Merge from DG (#145)

    * Localization output

    * update localiser output

commit adf4c87781
Merge: 62121bdb 29293725
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Aug 8 09:29:24 2024 +0100

    Merge branch 'main' into main

commit 2929372533
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Aug 5 17:58:08 2024 +0100

    Tethys Localisation output

    Not all types, but getting there.

commit 62121bdbbd
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Sun Aug 4 11:41:08 2024 +0100

    update jserialcom to 2.11.0

commit 82adc06e3d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Aug 2 15:26:49 2024 +0100

    Merge DG branch (#144)

    * Refactoring Tethys

    A lot of refactoring of Nilus wrappers with more useful Objects for PAMGUard to work with.

    * Improved document handling

    Abstracted wrapper around nilus documents which allows easyish calling of internal functions in Localize and Detections document without a common base class.

    * Fix doc deletion in detector output panel

commit 36455153a2
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Tue Jul 30 16:34:35 2024 +0100

    Fix doc deletion in detector output panel

commit bc686c0fe6
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 26 16:12:54 2024 +0100

    Improved document handling

    Abstracted wrapper around nilus documents which allows easyish calling of internal functions in Localize and Detections document without a common base class.

commit 4f87b7b661
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 16:07:33 2024 +0100

    Refactoring Tethys

    A lot of refactoring of Nilus wrappers with more useful Objects for PAMGUard to work with.

commit 3abaff0379
Merge: a3f41e22 9eee7434
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 13:50:49 2024 +0100

    Merge pull request #86 from PAMGuard/main

    Merge from main

commit 9eee7434de
Merge: 32c7c9b2 a3f41e22
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 13:50:38 2024 +0100

    Merge branch 'main' into main

commit 32c7c9b263
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 11:55:06 2024 +0100

    Merge from Jamie (#143)

    * Working on the exporter

    * Working out on exporter

    * Working on new symbol options for deep learning and sud file options in SoundAcquisition GUI

    * Add zero pad option for sud files.

    * Updates to sud zero pad options on FX GUI

    * Implementing a data selector for the deep learning module

    * Bug fix to data transforms if the wave data and sample length are different

    * Updated POm to ignore test resources and updates to DL data selector

    * Updates to DL data selector and POM

    * Work on the data selector for the deep learning module.

    * Working on the exporter

    * Working out on exporter

    * Working on new symbol options for deep learning and sud file options in SoundAcquisition GUI

    * Add zero pad option for sud files.

    * Updates to sud zero pad options on FX GUI

    * Implementing a data selector for the deep learning module

    * Updated POm to ignore test resources and updates to DL data selector

    * Bug fix to data transforms if the wave data and sample length are different

    * Updates to DL data selector and POM

    * Work on the data selector for the deep learning module.

    * Data selectors for deep learning models now working with FX

    Still have to be implemented in Swing

    * Update deep_learning_help.md

    Updated help values to have some info on data selectors and symbol managers.

    * Updates to deep learning symbol options for swing and data selector panel for swing

    Made tooltips last longer on TD display  FX

    * Update deep_learning_help.md

    * Swing symbol modifiers for DL and peak freq

    * Squashed commit of the following:

    commit bad2255710
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Thu Jul 18 09:47:47 2024 +0100

        Better symbol options

        Add clearer options button to multi option symbol manager panel.

    * Fix bugs in detection display

    * Bug fix to hiding panes

    * Squashed commit of the following:

    commit 8b5b5b2f18
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Fri Jul 19 17:14:28 2024 +0100

        Updated data selectors for BT display

        Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

    commit bad2255710
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Thu Jul 18 09:47:47 2024 +0100

        Better symbol options

        Add clearer options button to multi option symbol manager panel.

    * Deep learning bug fix

    * Ignore the class path

    * Squashed commit of the following:

    commit 577670ccd0
    Merge: 6510d226 8b5b5b2f
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Mon Jul 22 09:35:01 2024 +0100

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

    commit 6510d2260e
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Mon Jul 22 09:34:58 2024 +0100

        Remove unnecessary text output

    commit 3da8401756
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Mon Jul 22 09:29:38 2024 +0100

        updates to Daq

        New DLL, and some LED control, but hasn't fixed stalling problem.

    commit 8b5b5b2f18
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Fri Jul 19 17:14:28 2024 +0100

        Updated data selectors for BT display

        Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

    commit bad2255710
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Thu Jul 18 09:47:47 2024 +0100

        Better symbol options

        Add clearer options button to multi option symbol manager panel.

    * Squashed commit of the following:

    commit 687220dad5
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Mon Jul 22 11:42:19 2024 +0100

        Change click data selector

        Change Click BT display so it can handle CompoundDataSelectors

    commit 577670ccd0
    Merge: 6510d226 8b5b5b2f
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Mon Jul 22 09:35:01 2024 +0100

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

    commit 6510d2260e
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Mon Jul 22 09:34:58 2024 +0100

        Remove unnecessary text output

    commit 3da8401756
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Mon Jul 22 09:29:38 2024 +0100

        updates to Daq

        New DLL, and some LED control, but hasn't fixed stalling problem.

    commit 8b5b5b2f18
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Fri Jul 19 17:14:28 2024 +0100

        Updated data selectors for BT display

        Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

    commit bad2255710
    Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
    Date:   Thu Jul 18 09:47:47 2024 +0100

        Better symbol options

        Add clearer options button to multi option symbol manager panel.

    ---------

    Co-authored-by: Jamie Mac <macster110@gmail.com>

commit 687220dad5
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 11:42:19 2024 +0100

    Change click data selector

    Change Click BT display so it can handle CompoundDataSelectors

commit 577670ccd0
Merge: 6510d226 8b5b5b2f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:35:01 2024 +0100

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

commit 6510d2260e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:34:58 2024 +0100

    Remove unnecessary text output

commit 3da8401756
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jul 22 09:29:38 2024 +0100

    updates to Daq

    New DLL, and some LED control, but hasn't fixed stalling problem.

commit 8b5b5b2f18
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 19 17:14:28 2024 +0100

    Updated data selectors for BT display

    Merging old status bar and new DataSelector options so that they work more consistently on the BT display.

commit bad2255710
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Thu Jul 18 09:47:47 2024 +0100

    Better symbol options

    Add clearer options button to multi option symbol manager panel.

commit a3f41e22e6
Merge: 0165982a f7be084e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Tue Jul 16 10:58:25 2024 +0100

    Merge pull request #85 from PAMGuard/main

    Fix vector error

commit 0165982a22
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 12 16:57:28 2024 +0100

    Work on localisation export

    Not ready to rock yet.

commit f24dd9bb91
Merge: 07f4398a 3f23474e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Fri Jul 12 16:38:11 2024 +0100

    Merge pull request #84 from PAMGuard/main

    Merge from main

commit 07f4398a1d
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Tue Jun 25 09:25:10 2024 +0100

    Update .classpath

    Fix classpath file

commit 32ab9f7ead
Merge: 3a42eabd 7accb79f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jun 24 15:43:47 2024 +0100

    Merge pull request #83 from PAMGuard/main

    V2.02.12

commit 3a42eabd74
Merge: 18a507b5 f7b4f44e
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
Date:   Mon Jun 24 13:58:16 2024 +0100

    Merge pull request #82 from PAMGuard/main

    Merge from main
2024-08-23 10:55:40 +01:00

2 lines
313 B
XML
Raw Blame History

<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<a:clrMap xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" bg1="lt1" tx1="dk1" bg2="lt2" tx2="dk2" accent1="accent1" accent2="accent2" accent3="accent3" accent4="accent4" accent5="accent5" accent6="accent6" hlink="hlink" folHlink="folHlink"/>
Reference in New Issue View Git Blame Copy Permalink