mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-24 08:02:22 +00:00
211ca7ab91
* Update exporter_help.md Updated help for exporter * Update .gitignore * Bug fixes for deep learning classifier. Updated the symbol options to make sure opacity is passed through the symbol chooser. * Updates to the data map FX display * Updates to DelphinID and Data ModelFX Used a new writable image for much faster drawing in FX * bb * Delete C:\Users\Jamie Macaulay\MATLAB Drive\MATLAB\PAMGUARD\deep_learning\delphinID\whistle_image_example_java.mat * Updates to DelphinID * Updates to ReadMe and JavaFX GUI * Update readme.md Updates to ReadMe * Updates to CPOD module and also delphinID classifier * Fix colour scaling in FX data map * Create cpod_help.md * Update cpod_help.md * Update cpod_help.md * Updates to CPOD module Added ability to export CPOD clicks Added some extra features to data selector Swing GUI for data selector (in progress) * Updates to data map FX GUI * Updates to CPOD module * Added help files resources for CPOD * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Update cpod_help.md * Update cpod_help.md * Bug fixes for deep learning classifier. Updated the symbol options to make sure opacity is passed through the symbol chooser. * Updates to the data map FX display * Updates to DelphinID and Data ModelFX Used a new writable image for much faster drawing in FX * Updates to ReadMe and JavaFX GUI * bb * Delete C:\Users\Jamie Macaulay\MATLAB Drive\MATLAB\PAMGUARD\deep_learning\delphinID\whistle_image_example_java.mat * Updates to DelphinID * Update readme.md Updates to ReadMe * Fix colour scaling in FX data map * Updates to CPOD module and also delphinID classifier * Updates to CPOD module Added ability to export CPOD clicks Added some extra features to data selector Swing GUI for data selector (in progress) * Create cpod_help.md * Update cpod_help.md * Update cpod_help.md * Updates to data map FX GUI * Updates to CPOD module * Added help files resources for CPOD * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Update cpod_help.md * Update cpod_help.md * Bug fix to BT display The BT display was not selecting clicks properly. * Import bug fix * Updates to data map FX GUI * Updates to datamap FX * Got date axis working properly. * Added some arrows to the scroll bar for data map FX pane. * Working on getting datagrams in FX saving * Updates to DataMapFX and exporting annotations * Update MLAnnotationsManager.java * Working on adding annotations to exporter * Bug fix for processing files and annotations for exporter Rebase with main Bug fix for processing files - stops only the last file processing when "Start normally" selected on data processing R and MATLAB export of data annotation added. * Add a ttoltip to the exporter * Minor text change * X3 fix and building for MACOS * Update PAMGuard to build installer for MacOS * Some fixes to Sound Acquisition dialog layout. * Squashed commit of the following: commit1acddb4cc6
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Tue Oct 8 15:03:32 2024 +0100 MErge from DG (#168) * 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 * 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. * Effort lines on map Sort of working OK in real time mode. * Update Tethys to latest nilus schema * 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. * Ishmael Tethys output Added necessaries for Tethys output from Ishmael detectors. Also found a pretty major bug in the spectrogram correlation detector, where for each block of data it was only testing the first sample of each block, not all samples, for being over threshold. * Speed and algorithm improvements to Ish matched filter Seems to be errors in correlation, didn't support multiple channels and also used very old and slow FFT, so working to fix all three issues. * Updated matched filter Updated and working Matched filter, though still some thinking to do about how the scaling of this works, since currently scaled by the template, so whole thing is dependent on the input. Need to think of a better way to do this. * Update match filt normalisation Normalisation now correctly using both the template and the signal for normalisation so that it will be data amplitude independent. * invFFT improvements Use faster inverse FFT of real data in correlation / delay functions. * Improve ifft's in other modules to improve TDOA speeds * Sorting mess of spec plugin graphics Have got the Ishmael ones scrolling, but when scrolling, there is an offset in the data due to the lag of the correlation functions. Quite hard to fix with available timing data * Improve ish spectrogram plugin Sorted scaling and scrollling problems. * Improve startup checks Rethread startup checks so that a progress bar shows when PAMGuard is checking input and output files at start up. Also include single file processing in checks. * Apply all spectrogram overlays Apply to all function on spectrogram overlays so changes to overlays affect all panels. commitf2f9870b6f
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Wed Oct 2 15:13:12 2024 +0100 V2.02.13c Release for installation on teaching lab machines. commit7533a7cfbe
Author: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com> Date: Tue Oct 1 15:00:51 2024 +0100 Tethys output of Group3DLocalisations Output of Group3D localiser data. Localisations only, no Detections output for this one commitef494c0d0e
Author: Jamie Mac <macster110@gmail.com> Date: Mon Sep 30 13:10:59 2024 +0100 Sud bug fix and updates to CPOD module. (#162) * Update exporter_help.md Updated help for exporter * Update .gitignore * Bug fixes for deep learning classifier. Updated the symbol options to make sure opacity is passed through the symbol chooser. * Updates to the data map FX display * Updates to DelphinID and Data ModelFX Used a new writable image for much faster drawing in FX * bb * Delete C:\Users\Jamie Macaulay\MATLAB Drive\MATLAB\PAMGUARD\deep_learning\delphinID\whistle_image_example_java.mat * Updates to DelphinID * Updates to ReadMe and JavaFX GUI * Update readme.md Updates to ReadMe * Updates to CPOD module and also delphinID classifier * Fix colour scaling in FX data map * Create cpod_help.md * Update cpod_help.md * Update cpod_help.md * Updates to CPOD module Added ability to export CPOD clicks Added some extra features to data selector Swing GUI for data selector (in progress) * Updates to data map FX GUI * Updates to CPOD module * Added help files resources for CPOD * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Update cpod_help.md * Update cpod_help.md * Bug fixes for deep learning classifier. Updated the symbol options to make sure opacity is passed through the symbol chooser. * Updates to the data map FX display * Updates to DelphinID and Data ModelFX Used a new writable image for much faster drawing in FX * Updates to ReadMe and JavaFX GUI * bb * Delete C:\Users\Jamie Macaulay\MATLAB Drive\MATLAB\PAMGUARD\deep_learning\delphinID\whistle_image_example_java.mat * Updates to DelphinID * Update readme.md Updates to ReadMe * Fix colour scaling in FX data map * Updates to CPOD module and also delphinID classifier * Updates to CPOD module Added ability to export CPOD clicks Added some extra features to data selector Swing GUI for data selector (in progress) * Create cpod_help.md * Update cpod_help.md * Update cpod_help.md * Updates to data map FX GUI * Updates to CPOD module * Added help files resources for CPOD * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Add CPOD resources for help * Update cpod_help.md * Update cpod_help.md * Bug fix to BT display The BT display was not selecting clicks properly. * Import bug fix * Updates to data map FX GUI * Updates to datamap FX * Got date axis working properly. * Added some arrows to the scroll bar for data map FX pane. * Working on getting datagrams in FX saving * Updates to DataMapFX and exporting annotations * Update MLAnnotationsManager.java * Working on adding annotations to exporter * Bug fix for processing files and annotations for exporter Rebase with main Bug fix for processing files - stops only the last file processing when "Start normally" selected on data processing R and MATLAB export of data annotation added. * Add a ttoltip to the exporter * Minor text change * Small UI improvements for Sound Acquisition and MacOS * Bug fix to exporter * Update to help points Updated help points for following modules Deep learning CPOD Matched click classifier Exporter --------- Co-authored-by: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
243 lines
8.0 KiB
XML
243 lines
8.0 KiB
XML
<?xml version="1.0" encoding="UTF-8"?>
|
|
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
|
|
<modelVersion>4.0.0</modelVersion>
|
|
<groupId>org.pamguard</groupId>
|
|
<artifactId>Pamguard</artifactId>
|
|
<name>Pamguard</name>
|
|
<version>2.02.13c</version>
|
|
<description>Pamguard using Maven to control dependencies</description>
|
|
<url>www.pamguard.org</url>
|
|
<organization>
|
|
<name>Sea Mammal Research Unit, University of St. Andrews</name>
|
|
<url>http://www.smru.st-andrews.ac.uk</url>
|
|
</organization>
|
|
<build>
|
|
<sourceDirectory>${basedir}/src</sourceDirectory>
|
|
<testSourceDirectory>${basedir}/src/test</testSourceDirectory>
|
|
<resources>
|
|
<resource>
|
|
<directory>src</directory>
|
|
<excludes>
|
|
<exclude>META-INF/*.SF,META-INF/*.DSA,META-INF/*.RSA</exclude>
|
|
<exclude>**/*.java</exclude>
|
|
<exclude>jars/*.*</exclude>
|
|
</excludes>
|
|
</resource>
|
|
</resources>
|
|
<pluginManagement>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>org.eclipse.m2e</groupId>
|
|
<artifactId>lifecycle-mapping</artifactId>
|
|
<version>1.0.0</version>
|
|
<configuration>
|
|
<lifecycleMappingMetadata>
|
|
<pluginExecutions>
|
|
<pluginExecution>
|
|
<pluginExecutionFilter>
|
|
<groupId>org.apache.maven.plugins</groupId>
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
<versionRange>[3.1.1,)</versionRange>
|
|
<goals>
|
|
<goal>purge-local-repository</goal>
|
|
</goals>
|
|
</pluginExecutionFilter>
|
|
<action>
|
|
<ignore />
|
|
</action>
|
|
</pluginExecution>
|
|
</pluginExecutions>
|
|
</lifecycleMappingMetadata>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</pluginManagement>
|
|
<plugins>
|
|
<plugin>
|
|
<artifactId>maven-compiler-plugin</artifactId>
|
|
<version>3.12.1</version>
|
|
<dependencies>
|
|
<dependency>
|
|
<groupId>org.eclipse.tycho</groupId>
|
|
<artifactId>tycho-compiler-jdt</artifactId>
|
|
<version>1.5.1</version>
|
|
</dependency>
|
|
</dependencies>
|
|
<configuration>
|
|
<release>21</release>
|
|
<compilerId>jdt</compilerId>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>org.openjfx</groupId>
|
|
<artifactId>javafx-maven-plugin</artifactId>
|
|
<version>0.0.8</version>
|
|
</plugin>
|
|
<plugin>
|
|
<artifactId>maven-shade-plugin</artifactId>
|
|
<version>3.2.1</version>
|
|
<executions>
|
|
<execution>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>shade</goal>
|
|
</goals>
|
|
<configuration>
|
|
<transformers>
|
|
<transformer>
|
|
<manifestEntries>
|
|
<Main-Class>pamguard.Pamguard</Main-Class>
|
|
<Class-Path>.</Class-Path>
|
|
<SplashScreen-Image>Resources/pgBlankSplash.png</SplashScreen-Image>
|
|
</manifestEntries>
|
|
</transformer>
|
|
<transformer />
|
|
</transformers>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
<configuration>
|
|
<transformers>
|
|
<transformer />
|
|
</transformers>
|
|
<filters>
|
|
<filter>
|
|
<artifact>*:*</artifact>
|
|
<excludes>
|
|
<exclude>META-INF/*.SF</exclude>
|
|
<exclude>META-INF/*.DSA</exclude>
|
|
<exclude>META-INF/*.RSA</exclude>
|
|
<exclude>test/resources/**</exclude>
|
|
</excludes>
|
|
</filter>
|
|
</filters>
|
|
</configuration>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>com.github.marschall</groupId>
|
|
<artifactId>jdeps-maven-plugin</artifactId>
|
|
<version>0.5.1</version>
|
|
</plugin>
|
|
<plugin>
|
|
<artifactId>maven-dependency-plugin</artifactId>
|
|
<version>3.1.1</version>
|
|
<executions>
|
|
<execution>
|
|
<id>copy-dependencies</id>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>copy-dependencies</goal>
|
|
</goals>
|
|
<configuration>
|
|
<outputDirectory>${project.build.directory}/tempDependencies</outputDirectory>
|
|
<overWriteReleases>false</overWriteReleases>
|
|
<overWriteSnapshots>false</overWriteSnapshots>
|
|
<overWriteIfNewer>true</overWriteIfNewer>
|
|
</configuration>
|
|
</execution>
|
|
</executions>
|
|
</plugin>
|
|
<plugin>
|
|
<groupId>de.perdian.maven.plugins</groupId>
|
|
<artifactId>macosappbundler-maven-plugin</artifactId>
|
|
<version>1.21.1</version>
|
|
<executions>
|
|
<execution>
|
|
<phase>package</phase>
|
|
<goals>
|
|
<goal>bundle</goal>
|
|
</goals>
|
|
</execution>
|
|
</executions>
|
|
<configuration>
|
|
<plist>
|
|
<JVMMainClassName>pamguard.Pamguard</JVMMainClassName>
|
|
<CFBundleIconFile>src/Resources/PamguardIcon2.icns</CFBundleIconFile>
|
|
<CFBundleDisplayName>PAMGuard</CFBundleDisplayName>
|
|
<CFBundleDevelopmentRegion>English</CFBundleDevelopmentRegion>
|
|
<CFBundleURLTypes>
|
|
<string>msa</string>
|
|
</CFBundleURLTypes>
|
|
<JVMVersion>21+</JVMVersion>
|
|
<JVMArguments>
|
|
<string>-v</string>
|
|
</JVMArguments>
|
|
</plist>
|
|
<dmg>
|
|
<generate>true</generate>
|
|
<additionalResources>
|
|
<additionalResource>
|
|
<directory>src/target/macos/</directory>
|
|
</additionalResource>
|
|
</additionalResources>
|
|
</dmg>
|
|
<jdk>
|
|
<include>true</include>
|
|
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
|
|
</jdk>
|
|
<codesign>
|
|
<identity>3rd Party Mac Developer Application: PAMGuard</identity>
|
|
</codesign>
|
|
</configuration>
|
|
</plugin>
|
|
</plugins>
|
|
</build>
|
|
<repositories>
|
|
<repository>
|
|
<releases>
|
|
<checksumPolicy>ignore</checksumPolicy>
|
|
</releases>
|
|
<snapshots>
|
|
<enabled>false</enabled>
|
|
</snapshots>
|
|
<id>repo</id>
|
|
<url>file://${project.basedir}/repo</url>
|
|
</repository>
|
|
<repository>
|
|
<snapshots>
|
|
<enabled>false</enabled>
|
|
</snapshots>
|
|
<id>unidata-all</id>
|
|
<name>Unidata netCDF</name>
|
|
<url>https://artifacts.unidata.ucar.edu/repository/unidata-all/</url>
|
|
</repository>
|
|
<repository>
|
|
<id>bedatadriven</id>
|
|
<name>bedatadriven public repo</name>
|
|
<url>https://nexus.bedatadriven.com/content/groups/public/</url>
|
|
</repository>
|
|
<repository>
|
|
<snapshots>
|
|
<enabled>false</enabled>
|
|
</snapshots>
|
|
<id>talan</id>
|
|
<name>talan</name>
|
|
<url>https://nexus.talanlabs.com/content/repositories/releases/</url>
|
|
</repository>
|
|
<repository>
|
|
<id>central</id>
|
|
<url>https://repo1.maven.org/maven2</url>
|
|
</repository>
|
|
</repositories>
|
|
<reporting>
|
|
<plugins>
|
|
<plugin>
|
|
<groupId>com.github.marschall</groupId>
|
|
<artifactId>jdeps-maven-plugin</artifactId>
|
|
<version>0.5.1</version>
|
|
</plugin>
|
|
</plugins>
|
|
</reporting>
|
|
<properties>
|
|
<maven.compiler.target>11</maven.compiler.target>
|
|
<maven.compiler.source>11</maven.compiler.source>
|
|
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
|
<powermock.version>1.6.6</powermock.version>
|
|
<javafx.version>21</javafx.version>
|
|
<jaxb.runtime.version>2.4.0-b180830.0438</jaxb.runtime.version>
|
|
<mockito.version>1.10.19</mockito.version>
|
|
<jaxb.xjc.version>2.4.0-b180830.0438</jaxb.xjc.version>
|
|
<jaxb.api.version>2.4.0-b180830.0359</jaxb.api.version>
|
|
</properties>
|
|
</project>
|