mirror of
https://github.com/PAMGuard/PAMGuard.git
synced 2024-11-21 22:52:22 +00:00
Version 2.02.14
Released code for Version 2.02.14
This commit is contained in:
parent
6ed4ac7fcd
commit
6c7389c3fc
@ -4,7 +4,7 @@
|
|||||||
<groupId>org.pamguard</groupId>
|
<groupId>org.pamguard</groupId>
|
||||||
<artifactId>Pamguard</artifactId>
|
<artifactId>Pamguard</artifactId>
|
||||||
<name>Pamguard</name>
|
<name>Pamguard</name>
|
||||||
<version>2.02.13d</version>
|
<version>2.02.14</version>
|
||||||
<description>Pamguard using Maven to control dependencies</description>
|
<description>Pamguard using Maven to control dependencies</description>
|
||||||
<url>www.pamguard.org</url>
|
<url>www.pamguard.org</url>
|
||||||
<organization>
|
<organization>
|
||||||
@ -137,49 +137,6 @@
|
|||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</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>false</include>
|
|
||||||
<location>/Library/Java/JavaVirtualMachines/amazon-corretto-21.jdk</location>
|
|
||||||
</jdk>
|
|
||||||
<codesign>
|
|
||||||
<identity>3rd Party Mac Developer Application: PAMGuard</identity>
|
|
||||||
</codesign>
|
|
||||||
</configuration>
|
|
||||||
</plugin>
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
<repositories>
|
<repositories>
|
||||||
|
10
pom.xml
10
pom.xml
@ -4,7 +4,7 @@
|
|||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<groupId>org.pamguard</groupId>
|
<groupId>org.pamguard</groupId>
|
||||||
<artifactId>Pamguard</artifactId>
|
<artifactId>Pamguard</artifactId>
|
||||||
<version>2.02.13d</version>
|
<version>2.02.14</version>
|
||||||
<name>Pamguard</name>
|
<name>Pamguard</name>
|
||||||
<description>Pamguard using Maven to control dependencies</description>
|
<description>Pamguard using Maven to control dependencies</description>
|
||||||
<url>www.pamguard.org</url>
|
<url>www.pamguard.org</url>
|
||||||
@ -184,7 +184,7 @@
|
|||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|
||||||
<!-- Plugin which creates a .dmg file for MacOS. -->
|
<!-- Plugin which creates a .dmg file for MacOS.
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>de.perdian.maven.plugins</groupId>
|
<groupId>de.perdian.maven.plugins</groupId>
|
||||||
<artifactId>macosappbundler-maven-plugin</artifactId>
|
<artifactId>macosappbundler-maven-plugin</artifactId>
|
||||||
@ -199,10 +199,6 @@
|
|||||||
<string>msa</string>
|
<string>msa</string>
|
||||||
</CFBundleURLTypes>
|
</CFBundleURLTypes>
|
||||||
<JVMVersion>21+</JVMVersion>
|
<JVMVersion>21+</JVMVersion>
|
||||||
<!--<JVMOptions>
|
|
||||||
<string>-Dfoo=bar</string>
|
|
||||||
<string>-Dx=y</string>
|
|
||||||
</JVMOptions>-->
|
|
||||||
<JVMArguments>
|
<JVMArguments>
|
||||||
<string>-v</string>
|
<string>-v</string>
|
||||||
</JVMArguments>
|
</JVMArguments>
|
||||||
@ -231,7 +227,7 @@
|
|||||||
</goals>
|
</goals>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
</plugin>
|
</plugin> -->
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
|
|
||||||
|
@ -31,12 +31,12 @@ public class PamguardVersionInfo {
|
|||||||
* Version number, major version.minorversion.sub-release.
|
* Version number, major version.minorversion.sub-release.
|
||||||
* Note: can't go higher than sub-release 'f'
|
* Note: can't go higher than sub-release 'f'
|
||||||
*/
|
*/
|
||||||
static public final String version = "2.02.13d";
|
static public final String version = "2.02.14";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Release date
|
* Release date
|
||||||
*/
|
*/
|
||||||
static public final String date = "October 2024";
|
static public final String date = " 18 October 2024";
|
||||||
|
|
||||||
// /**
|
// /**
|
||||||
// * Release type - Beta or Core
|
// * Release type - Beta or Core
|
||||||
|
@ -61,6 +61,7 @@ import effortmonitor.EffortControl;
|
|||||||
import fftManager.FFTDataUnit;
|
import fftManager.FFTDataUnit;
|
||||||
import fftManager.PamFFTControl;
|
import fftManager.PamFFTControl;
|
||||||
import group3dlocaliser.Group3DLocaliserControl;
|
import group3dlocaliser.Group3DLocaliserControl;
|
||||||
|
import landMarks.LandmarkControl;
|
||||||
import meygenturbine.MeygenTurbine;
|
import meygenturbine.MeygenTurbine;
|
||||||
import printscreen.PrintScreenControl;
|
import printscreen.PrintScreenControl;
|
||||||
import ravendata.RavenControl;
|
import ravendata.RavenControl;
|
||||||
@ -267,7 +268,7 @@ final public class PamModel implements PamSettings {
|
|||||||
mi.setMinNumber(0);
|
mi.setMinNumber(0);
|
||||||
// mi.setMaxNumber(1);
|
// mi.setMaxNumber(1);
|
||||||
|
|
||||||
mi = PamModuleInfo.registerControlledUnit("landMarks.LandmarkControl", "Fixed Landmarks");
|
mi = PamModuleInfo.registerControlledUnit(LandmarkControl.class.getName(), "Fixed Landmarks");
|
||||||
mi.setModulesMenuGroup(mapsGroup);
|
mi.setModulesMenuGroup(mapsGroup);
|
||||||
mi.setToolTipText("Place object symbols on the PAMGuard map");
|
mi.setToolTipText("Place object symbols on the PAMGuard map");
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user