nordic-dev.net/PAMGuard
nordic-dev.net/PAMGuard
2
0
Fork 0
mirror of https://github.com/PAMGuard/PAMGuard.git synced 2025-02-16 17:22:46 +00:00
Code Issues Packages Projects Releases Wiki Activity
404 Commits 2 Branches 10 Tags 474 MiB
4f0f4a6c36
Commit Graph

404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Douglas Gillespie
4f0f4a6c36 Merge remote-tracking branch 'PAMGuardDGOriginal/main' into main 
Conflicts:
	src/binaryFileStorage/BinaryStoreProcess.java
	src/clickDetector/layoutFX/clickClassifiers/SweepClassifierSetPaneFX.java
 2023-04-13 18:04:38 +01:00
Douglas Gillespie
dfb78813ea Update TethysControl.java 2023-04-13 17:41:52 +01:00
Douglas Gillespie
795b32e440
Merge pull request #40 from PAMGuard/main 
merge fix in reprocess manager
 2023-04-13 17:11:28 +01:00
Douglas Gillespie
e3a7dc3ad1 Small changes for batch processing 2023-04-13 17:06:53 +01:00
Douglas Gillespie
57bae3c39c Fix reprocess manager 
Stop it responding with stupid questions when there are no part complete
stores.
 2023-04-13 17:05:40 +01:00
Douglas Gillespie
87db5ae6ab
Merge batch support (#103) 
* Update FileListWorker.java

* Support batch processing

Multicast controller and a couple of additional commands to work with
the batch processing plugin.

* Database float unpack

Better unpacking checks of floats coming back from the database

* Batch changes

Changes in support of batch processing
 2023-04-07 18:36:51 +01:00
Douglas Gillespie
f97977a1ea
Merge pull request #39 from PAMGuard/main 
Batch Processing (#102)
 2023-04-07 18:36:07 +01:00
Douglas Gillespie
fff36a904b Batch changes 
Changes in support of batch processing
 2023-04-07 18:32:18 +01:00
Douglas Gillespie
7ae7739b22
Batch Processing (#102) 
* Update FileListWorker.java

* Support batch processing

Multicast controller and a couple of additional commands to work with
the batch processing plugin.

* Database float unpack

Better unpacking checks of floats coming back from the database
 2023-04-07 18:25:27 +01:00
Douglas Gillespie
30fbc6d290 Database float unpack 
Better unpacking checks of floats coming back from the database
 2023-04-06 21:43:20 +01:00
Douglas Gillespie
a2da810690 Support batch processing 
Multicast controller and a couple of additional commands to work with
the batch processing plugin.
 2023-04-06 16:44:47 +01:00
Douglas Gillespie
2bb8c0b164 Merge branch 'main' of https://github.com/douggillespie/PAMGuard 2023-04-05 19:36:10 +01:00
Douglas Gillespie
da21d54d3e Update FileListWorker.java 2023-04-05 19:35:48 +01:00
Douglas Gillespie
ed77670458
Merge pull request #38 from PAMGuard/main 
Merge in from main
 2023-04-05 19:33:16 +01:00
Douglas Gillespie
42d560f91b
Merge branch 'main' into main 2023-04-05 19:33:05 +01:00
stabbutt
629f430988
Merge SMRUC Fork to PG Main Fork (#101) 
* Fix network sender since it was hopelessly out of date and did not send
data in the correct format. OK now, though only tested on NARW.

* Fix network sender since it was hopelessly out of date and did not send
data in the correct format. OK now, though only tested on NARW.

* Mods to support command line and Network control of PAMGuard and to
retrieve summary information from some modules.

* Fix issue #80: recording path command line override

* Allow RUNNOTHING bearing calculations

* Quick solution to issue #88.

* Added logic to allow run nothing direct PAMGuard control for SMRU
Consulting batch processing

* Mistake in merge, committing changes from PAMGuard Main to SMRU Fork

* Run nothing updates for preventing thread leaks on bash

* Synchronize with Pamguard Main at PAMGuard/Pamguard:main commit 3573eaa
on 1/24/23

* Added network sender global arguments for port, ipaddress, station Id1,
station Id2

* Added runtime arguments for network send configuration

* Fix typo in tag 'netSend' rather than 'newSend'

* Fixed typo. set port to port, not to address

---------

Co-authored-by: Douglas Gillespie <50671166+douggillespie@users.noreply.github.com>
 2023-04-05 09:37:17 +01:00
Douglas Gillespie
dbc8f0c682 Men items to open collections in browser 2023-04-04 21:02:09 +01:00
Douglas Gillespie
35fa8270d2 Changes to match server updates 
Deleting now working. am automatically calling a windows curl command to
disable the cache on the server.
 2023-04-04 20:53:14 +01:00
Douglas Gillespie
74066712b8 Fix Data export bug 
Bug causing npe when exporting data to database. Fixed problem.

And better error messages in some thrown exceptions to make it easier to
identify where errors are occurring.
 2023-04-04 18:04:13 +01:00
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