Skip to content

Commit 855df51

Browse files
committed
Update to latest PAMGuard
Update compatibility to PAMguard $2.2.14
1 parent 090d1fb commit 855df51

File tree

3 files changed

+22
-28
lines changed

3 files changed

+22
-28
lines changed

.classpath

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
33
<classpathentry kind="src" path="src"/>
4-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER">
4+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/ojdk-21.0.1">
55
<attributes>
66
<attribute name="module" value="true"/>
77
</attributes>
88
</classpathentry>
9-
<classpathentry combineaccessrules="false" kind="src" path="/PamGuard Main DG"/>
9+
<classpathentry combineaccessrules="false" kind="src" path="/PAMGuard"/>
1010
<classpathentry kind="output" path="bin"/>
1111
</classpath>

src/PamModel/PamModel.java

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import java.io.File;
2424
import java.io.FileNotFoundException;
2525
import java.io.Serializable;
26-
import java.lang.reflect.Method;
2726
import java.net.URL;
2827
import java.net.URLClassLoader;
2928
import java.util.ArrayList;
@@ -36,25 +35,7 @@
3635

3736
import Acquisition.DaqSystemInterface;
3837
import Array.ArraySidePanelControl;
39-
import clickDetector.ClickDetection;
40-
import dataMap.DataMapControl;
41-
import detectiongrouplocaliser.DetectionGroupControl;
42-
import effortmonitor.EffortControl;
43-
import whistlesAndMoans.AbstractWhistleDataUnit;
44-
import workshopdemodetector.WorkshopController;
45-
import workshopdemodetector.WorkshopPlugin;
46-
import fftManager.FFTDataUnit;
47-
import fftManager.PamFFTControl;
48-
import group3dlocaliser.Group3DLocaliserControl;
49-
import meygenturbine.MeygenTurbine;
50-
import networkTransfer.receive.BuoyStatusDataUnit;
51-
import networkTransfer.receive.NetworkReceiver;
52-
import printscreen.PrintScreenControl;
53-
import rockBlock.RockBlockControl;
54-
import turbineops.TurbineOperationControl;
5538
import GPS.GpsDataUnit;
56-
import Map.MapController;
57-
import Map.gridbaselayer.GridbaseControl;
5839
import NMEA.NMEADataUnit;
5940
import PamController.PamControlledUnitSettings;
6041
import PamController.PamController;
@@ -63,16 +44,29 @@
6344
import PamController.PamSettingManager;
6445
import PamController.PamSettings;
6546
import PamDetection.RawDataUnit;
47+
import PamUtils.FileFinder;
6648
import PamView.dialog.warn.WarnOnce;
6749
import PamguardMVC.PamDataBlock;
6850
import analogarraysensor.ArraySensorControl;
6951
import backupmanager.BackupManager;
7052
import beamformer.continuous.BeamFormerControl;
71-
import beamformer.localiser.BeamFormLocaliserControl;
7253
import bearinglocaliser.BearingLocaliserControl;
7354
import binaryFileStorage.SecondaryBinaryStore;
7455
import cepstrum.CepstrumControl;
75-
import PamUtils.FileFinder;
56+
import clickDetector.ClickDetection;
57+
import dataMap.DataMapControl;
58+
import detectiongrouplocaliser.DetectionGroupControl;
59+
import effortmonitor.EffortControl;
60+
import fftManager.FFTDataUnit;
61+
import fftManager.PamFFTControl;
62+
import group3dlocaliser.Group3DLocaliserControl;
63+
import meygenturbine.MeygenTurbine;
64+
import printscreen.PrintScreenControl;
65+
import rockBlock.RockBlockControl;
66+
import turbineops.TurbineOperationControl;
67+
import whistlesAndMoans.AbstractWhistleDataUnit;
68+
import workshopdemodetector.WorkshopController;
69+
import workshopdemodetector.WorkshopPlugin;
7670

7771
/**
7872
* @author Doug Gillespie
@@ -733,10 +727,10 @@ public void createPamModel() {
733727
* Don't do it like thi sany more. See added line for a developmental plugin in
734728
* loadPlugins(...) below. The latter method should also pick up the help files, etc .
735729
*/
736-
// mi = PamModuleInfo.registerControlledUnit(WorkshopController.class.getName(), "Workshop Demo Detector");
737-
// mi.addDependency(new PamDependency(FFTDataUnit.class, "fftManager.PamFFTControl"));
738-
// mi.setToolTipText("Simple demo detector for programmers");
739-
// mi.setModulesMenuGroup(detectorsGroup);
730+
mi = PamModuleInfo.registerControlledUnit(WorkshopController.class.getName(), "Workshop Demo Detector");
731+
mi.addDependency(new PamDependency(FFTDataUnit.class, "fftManager.PamFFTControl"));
732+
mi.setToolTipText("Simple demo detector for programmers");
733+
mi.setModulesMenuGroup(detectorsGroup);
740734

741735

742736
// mi = PamModuleInfo.registerControlledUnit("EdgeDetector.EdgeControl", "Edge Detector");

src/workshopdemodetector/WorkshopPlugin.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public String getPamVerDevelopedOn() {
130130

131131
@Override
132132
public String getPamVerTestedOn() {
133-
return "2.02.07";
133+
return "2.02.14";
134134
}
135135

136136
@Override

0 commit comments

Comments
 (0)