Skip to content

Ddf3_fps_and_time #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Open
karlgjelland wants to merge 55 commits into
base: master
Choose a base branch
from
Open

Ddf3_fps_and_time #24

karlgjelland wants to merge 55 commits into from

Conversation

@karlgjelland
Copy link

@karlgjelland karlgjelland commented Jul 11, 2025

  • framerate (ddf3)
  • frameTime (ddf3)
  • highResolution (ddf3 and ddf5)
  • serialNumber (ddf3 and ddf5)

frafra and others added 30 commits April 2, 2025 14:26
@frafra @LatePate33
@karlgjelland @Nojani
Merge development branch (#23)
34e5348 
* support for MP4 filetypes added

* fixed ddf03

* updated yml file

* Update v3_file_info.py

beamLookUp.BeamLookUp requires largeLens, not highResolution. Replaced "highResolution" with "0" in cls.firstBeamAngle = beamLookUp.BeamLookUp (Line 346), since there is no largeLens parameter in ddf3 file header.

* Update beamLookUp.py

largeLens condition changed to 0 = breakpoints48 and else telephoto48, to account for default no largeLens in DIDSON ddf3.

* Update v3_frame_info.py

Replaced self.largeLens with 0 in BeamLookUp, since there is no largeLens parameter in ddf3 header

* Added inclusion of stored mount direction for flipping x-axis. Changed default tracking parameters to improve tracking of single fish in shoals.

---------

Co-authored-by: LatePate33 <[email protected]>
Co-authored-by: Karl Gjelland <[email protected]>
Co-authored-by: Jani Helminen <[email protected]>
@taheeraahmed @frafra
add nina python template
ffc4378
@taheeraahmed @frafra
fix typing errors with qt5
880ff08
@taheeraahmed @frafra
remove dependency on tkinter
e8f7e3b
@taheeraahmed @frafra
create uv environment and update readme
3491b92
@taheeraahmed @frafra
correct readme.md
cf60515
@taheeraahmed @frafra
remove old requirements file
0bf56f8
@taheeraahmed @frafra
update workflow to get python 3.11
7e0a749
@taheeraahmed @frafra
ensure proper type for timer interval and use QPointF for drawing in …
1561a05 
…sonar_widget
@taheeraahmed @frafra
run pre-commit on all files
b6e04da
@taheeraahmed @frafra
update pyproject.toml
a913c15
@taheeraahmed @frafra
fix line too long (E501)
a0ab44a
@taheeraahmed @frafra
fix don't assign lambda expression, use def (E731)
d93cb17
@taheeraahmed @frafra
fix comparison should be "is" not "==" (E711)
b1a9bb8
@taheeraahmed @frafra
fix renturn inside finally block (B012)
422065a
@taheeraahmed @frafra
fix not use mutable data structs for argument defaults (B006)
a236322
@taheeraahmed @frafra
fix using format specifiers instead of percent format (UP031)
c7892ff
@taheeraahmed @frafra
fix warp not imported
a0e4815
@taheeraahmed @frafra
fix using a cryptographically secure pseudo-random number generator (…
65c4be8 
…S311)
@taheeraahmed @frafra
fix not use assert (S101)
8935c6f
@taheeraahmed @frafra
fix .super() usage (UP008)
844266b
@taheeraahmed @frafra
fix avoid equality comparison for truth checks (E712)
a80865b
@taheeraahmed @frafra
fix do not perform function call in argumet default (B008)
d8b4efb
@taheeraahmed @frafra
fix unused variable within loop body (B007)
98b46a6
@taheeraahmed @frafra
fix except-raise statements without from clause (B904)
4b3be7a
@taheeraahmed @frafra
fix rename amiguous variable names (E741)
2a89dd8
@taheeraahmed @frafra
fix replace dict() and list() initialization to {} and []
50d2955
@taheeraahmed @frafra
fix only docstrings first
3925a83
@taheeraahmed @frafra
Ignoring some ruff linting errors
e533511
@frafra
Use uv run
5798a56
frafra and others added 25 commits April 25, 2025 14:44
@frafra
Update uv
9c40552
@frafra
Pin Python version
48e02b9
@frafra
Pin GitHub Actions
0802074
@taheeraahmed @frafra
Update branch references and copyright information in configuration f…
e4f065c 
…iles
@taheeraahmed @frafra
update pyproject.toml
886122c
@taheeraahmed @frafra
ensure proper type for timer interval and use QPointF for drawing in …
c6f75a5 
…sonar_widget and echogram_widget
@taheeraahmed @frafra
type error where elements are numpy arras, not floats
e54d679
@taheeraahmed @frafra
Revert "fix do not perform function call in argumet default (B008)"
18e0606 
This reverts commit 65a3aa8.
@karlgjelland @taheeraahmed
Added aspect angle of detections. Aspect shows correctly in the Detec…
6e2fece 
…tions tab, but shows only as 0 in Tracks tab. Header aspect is included in exported data, but not the data column itself (i.e. one more header than columns in detections and tracks export).
@taheeraahmed
Fix small linting errors
2073f2f
@taheeraahmed
Fix type error
0c6847f
@karlgjelland @taheeraahmed
Aspect angle function added and tested
7579c75
@karlgjelland @taheeraahmed
Removed version dependencies for PyQt5 and filterpy. Changed python r…
a53d787 
…equirement from 3.8 to 3.11. Tested on Linux and Windows, works fine.
@karlgjelland @taheeraahmed
uv.lock oppdater mhp revidert pyproject.toml
09f6a20
@taheeraahmed
Fix linting errors
37b2cd3
@taheeraahmed
Command line interface for batch tracking (#33)
f38ad5a
@karlgjelland @frafra
feat: add time for detections given time when sonar started recording…
4d4c627 
… + frames per seconds
@taheeraahmed @frafra
refactor: improve detection data handling and CSV export in Detector …
93b8538 
…and FishManager
@taheeraahmed @bjornsol
add version specifier for PyQt5 and filterpy
aba19c3
@taheeraahmed @bjornsol
ensure a _dets and _track file is created even when its empty
25c2c37
@taheeraahmed @bjornsol
ensure columns exists also when there are detections and tracks
be20a50
@karlgjelland @taheeraahmed
added time to detections var, and to track output
b30d8ed
@taheeraahmed
fix: too long lines
d7017c5
@taheeraahmed @bjornsol
feat: add possibility to change flow direction in batch_track
58b22b5
@karlgjelland @taheeraahmed
Fixed failed loading of following parameters into SONAR_File from ddf…
fc069ae 
…3 and ddf5 (.aris) files:

-	framerate (ddf3)
-	frameTime (ddf3)
-	highResolution (ddf3 and ddf5)
-	serialNumber (ddf3 and ddf5)
@taheeraahmed taheeraahmed deleted the ddf3_fps_and_time branch December 11, 2025 08:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@karlgjelland @frafra @taheeraahmed