Commit Graph

380 Commits

Author SHA1 Message Date
Douglas Gillespie
faea94205c Merge branch 'main' of https://github.com/douggillespie/PAMGuard into main
Conflicts:
	src/Array/ArrayDialog.java
	src/PamModel/PamModel.java
	src/clickDetector/layoutFX/clickClassifiers/SweepClassifierSetPaneFX.java
2023-04-02 11:15:19 +01:00
Douglas Gillespie
573785d98f GUi Play
Export wizard for detections
2023-03-31 19:07:02 +01:00
Douglas Gillespie
4be259b76b GUI Play
Experimenting with GUI components
2023-03-29 20:57:54 +01:00
Douglas Gillespie
642f1da873 updated doc names
Dog names now match their id so it's easier to delete them from Tethys
2023-03-22 20:07:17 +00:00
Douglas Gillespie
c7ceba1604 GUI Work.
working on some GUI / control options. Semi functional. Seem to have a
problem with time zones converting from XML time to millis which need
sorting.
2023-03-21 20:05:38 +00:00
Douglas Gillespie
f51a519d82 Start Tethys GUI 2023-03-17 21:26:13 +00:00
Douglas Gillespie
b344b775ec Merge branch 'main' of https://github.com/douggillespie/PAMGuardTethys 2023-03-16 16:35:09 +00:00
Douglas Gillespie
cff6f71881 update autoprovider 2023-03-16 16:34:03 +00:00
kbolaughlin
ecf364f999 Merge branch 'main' of https://github.com/douggillespie/PAMGuardTethys 2023-03-16 09:14:11 -07:00
kbolaughlin
7f680f3e20 fixed some deploymentData defaulting
fixed some deploymentData defaulting
2023-03-16 09:13:42 -07:00
Douglas Gillespie
289b065914 Merge branch 'main' of https://github.com/douggillespie/PAMGuardTethys 2023-03-15 23:39:33 +00:00
Douglas Gillespie
8c3c0098da work 2023-03-15 23:38:51 +00:00
kbolaughlin
140af14cba required field update and post to tethys fxn updates
fill in required data for deployments/detections and minor tweaks to post to tethys fxn
2023-03-15 16:38:13 -07:00
kbolaughlin
d96ace1ca2 Merge branch 'main' of https://github.com/douggillespie/PAMGuardTethys 2023-03-15 15:05:57 -07:00
kbolaughlin
f15a6dafa6 TethysExportControl
add post to tethys code in TethysExportControl
2023-03-15 15:05:33 -07:00
Douglas Gillespie
27b8456c5a More detection work 2023-03-15 22:04:13 +00:00
kbolaughlin
e8e947b91f Merge branch 'main' of https://github.com/douggillespie/PAMGuardTethys 2023-03-15 12:38:33 -07:00
kbolaughlin
ceefa6188c Update TethysExporter.java
updated export code to add namespace to the xml produced
2023-03-15 12:38:29 -07:00
Douglas Gillespie
4876899b54 Detections Document ready to go 2023-03-15 18:13:11 +00:00
Douglas Gillespie
f97247f148 Detections output
Working towards output of Detections ...
2023-03-15 17:21:35 +00:00
kbolaughlin
98ce0ff9d2 Merge branch 'main' of https://github.com/douggillespie/PAMGuardTethys 2023-03-14 14:16:02 -07:00
kbolaughlin
68b7d08bc6 Update TethysExporter.java
minor tweak
2023-03-14 14:14:22 -07:00
Douglas Gillespie
3991a87102 up[dated exporter 2023-03-14 21:13:48 +00:00
Douglas Gillespie
0fad7c6cfa Deployment doc
Work on deployment document population
2023-03-14 17:34:45 +00:00
Douglas Gillespie
103c050d0c Trying to Merge with KB Changes 2023-03-14 17:28:13 +00:00
kbolaughlin
2dd870956a Update TethysExporter.java
small fix
2023-03-14 08:40:49 -07:00
kbolaughlin
8842166f43 Merge branch 'main' of https://github.com/douggillespie/PAMGuardTethys 2023-03-14 08:38:08 -07:00
kbolaughlin
799c7b218e Update TethysExporter.java
file importer
2023-03-13 17:27:39 -07:00
Douglas Gillespie
501c0ec292 Deployment positions 2023-03-13 21:44:19 +00:00
Douglas Gillespie
98cf904830 first very incomplete deployment doc 2023-03-13 20:45:51 +00:00
Douglas Gillespie
456f9102db Merge branch 'main' of https://github.com/douggillespie/PAMGuardTethys 2023-03-13 18:36:36 +00:00
Douglas Gillespie
534765d1cc notes 2023-03-13 18:35:25 +00:00
kbolaughlin
7d69992d44 Update TethysExporter.java
testing
2023-03-13 11:33:46 -07:00
Douglas Gillespie
24c7baab6e Notes 2023-03-13 18:31:04 +00:00
kbolaughlin
43ea481c3f adding deployment recovery pair 2023-03-13 11:05:10 -07:00
Douglas Gillespie
16e8184a23 Batch processing
Updates to support batch processing control
2023-03-01 16:43:08 +00:00
Douglas Gillespie
bfed9cfa00 Update to Nilus 3 2023-02-23 13:37:53 +00:00
Douglas Gillespie
9c10af43bc Added code to find acquisition settings
This is most of the data needed for TEthys
2023-02-22 10:51:04 +00:00
Douglas Gillespie
5f9d29e131 Reprocessing
Ironed out a few bugs in restarting processing.
2023-02-21 16:01:50 +00:00
Douglas Gillespie
f910d80517 Reprocessing options
Analysis of input and output files and can restart from where it left
off when processing an offline dataset.
2023-02-20 17:15:54 +00:00
Douglas Gillespie
f12be978aa
Merge pull request #2 from douggillespie/Tethys
Merging Tethys branch into main
2023-02-01 10:23:39 +00:00
Douglas Gillespie
e4de847b5d Merge branch 'main' of https://github.com/PAMGuard/PAMGuard into main 2023-01-30 08:36:28 +00:00
Douglas Gillespie
a7745c3bd5
Merge from DG (#97)
* Version 2.02.06

(hopefully)

* ROCCA Memory leak

Another attempt at healing ROCCA memory leak
2023-01-30 08:33:38 +00:00
Douglas Gillespie
7aa1968679
Merge from DG Fork. (#96)
* Version 2.02.06

(hopefully)

* ROCCA Memory leak

Another attempt at healing ROCCA memory leak
2023-01-30 08:31:59 +00:00
Douglas Gillespie
6a6930ea1a Merge test 2023-01-30 08:15:25 +00:00
Douglas Gillespie
5b649edc19 Comments
Added a couple of comments to help SDSU folk get off the ground
2023-01-27 15:13:30 +00:00
Douglas Gillespie
85d25401a1
Merge pull request #37 from PAMGuard/main
Couple of fixes
2023-01-27 14:43:24 +00:00
Douglas Gillespie
7baf6dcefe Couple of fixes
including comment out errors in JDJM classiferpanel
2023-01-27 14:40:15 +00:00
Douglas Gillespie
b2e6f85faf
Merge pull request #1 from douggillespie/Tethys
Tethys
2023-01-27 14:34:12 +00:00
Douglas Gillespie
1c11e3da15 DBXM Export
A few functions to help find data.
2023-01-27 11:11:02 +00:00