Skip to content
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

Ai view integration (onnx) #49

Merged
merged 157 commits into from
Jan 8, 2025
Merged

Ai view integration (onnx) #49

merged 157 commits into from
Jan 8, 2025

Conversation

MohamedTababi-GitH
Copy link
Collaborator

Initial pull request to merge the Ai live tracking into master

zegLine and others added 30 commits March 27, 2024 20:39
@zegLine
added prototype for data source
ada26a8
@zegLine
added proof of concept of igt virtual device in python
87d942b
added igt server implementation in python yolov5
9aef866
@zegLine
added virtual camera to detect py
cd93750
@VincentStriegel
create annotation tab
c5de2f9
@david-todorov
Merge pull request #6 from zegLine/groupe-e-task-13-create-tab
e8d7d06 
Create annotation tab
@david-todorov
Basic GUI design added
94cf3e5
@nguyensl-rose
the igtpt tracker points away from its last known position (essential…
a72a02c 
…ly a velocity vector)
@nguyensl-rose
Merge branch 'ai-datasource' of https://github.com/zegLine/IGTPrototy…
564384d 
…pingTool into ai-datasource
@nguyensl-rose
orientation faces last position
635b590
@david-todorov
Merge pull request #9 from zegLine/feature-14-side-view-and-main-pict…
84f0daf 
…ure-view

Basic GUI design added
@muazzamaqeel
Multiple Functionalities (Upload Pictures + Import Button + Picture S…
04db0df 
…election + Picture View in the Big box)
@muazzamaqeel
Merge pull request #10 from zegLine/mo_groupe
8e736c7 
Multiple Functionalities
@VincentStriegel
Update AnnotationView.fxml with new buttons and styles
f0d742d
@david-todorov
Merge pull request #11 from zegLine/group-e-task-28-create-buttons
9347b7e 
Update AnnotationView with new buttons and style
@david-todorov
Next and previous button functionality added
41235ac
@david-todorov
Simple Zoom in and Zoom out functionality added
d96399b
@david-todorov
Merge pull request #13 from zegLine/feature-37-zooming-functionality
7fbb8a2 
Simple Zoom in and Zoom out functionality added
@muazzamaqeel
Merge pull request #12 from zegLine/feature-33-navigation-keys-functi…
8f1018c 
…onality

Next and previous button functionality added
@BruderSimon
Create Rectangle Shape
ea1cb6b
@BruderSimon
Create AnnotationData to save the Data
6d58abe
@BruderSimon
Two-way Annotation Functionality
018a01d
@david-todorov
Focus of the image fixed, zooming functionality fixed when the image …
9777e66 
…is changed during zooming with reseting the scale
@muazzamaqeel
Merge pull request #14 from zegLine/feature-33-navigation-keys-functi…
b212ebc 
…onality

Focus of the image fixed, zooming functionality fixed when the image …
@BruderSimon
Finished Annotation Functionality
5c5a26d
@zegLine
added reference point setting
2232dd0
@BruderSimon
Middle point for each Box
431894e
@zegLine
added line plot overlay for showing distance
a8f1187
@BruderSimon
Merge branch 'refs/heads/group-e-task-38-annotation' into group-e-mer…
4a3f6b5 
…ge-annotation-with-zoom

# Conflicts:
#	src/main/java/controller/AnnotationController.java
#	src/main/resources/view/AnnotationView.fxml
@zegLine
added line plot overlay for showing distance
bcd2324
muazzamaqeel and others added 21 commits May 20, 2024 21:11
@muazzamaqeel
Merge pull request #40 from zegLine/group-e
57e3e31 
Group e
@osama-alk
Merge branch 'master' into create-path
2cbe304
@osama-alk
Merge pull request #41 from zegLine/create-path
5067a79 
Create path
@MohamedTababi-GitH
fixed video source display and added distance calculation (untested)
d965fea
@MohamedTababi-GitH
fixed multi path mode
4b95b6f
@MohamedTababi-GitH
updated distance calculation
c683182
@MohamedTababi-GitH
added style to the thrombus point, also we can now invoke script from…
dc32ed6 
… the openigt tool UI
@MohamedTababi-GitH
fixed collision detection (untested)
22f9291
@MohamedTababi-GitH
fixed detected tip position
b1b921e
@MohamedTababi-GitH
test
0372803
@MohamedTababi-GitH
onnx dependency included
38e220f
@MohamedTababi-GitH
integrated live detection using onnx exported model (untested)
391205b
@MohamedTababi-GitH
implemented distance calculation and status updated, changed the fxml…
2d9366e 
… layout (untested)
@MohamedTababi-GitH
tested v
ab813f1
@MohamedTababi-GitH
onnx file added
2ae7ac4
@MohamedTababi-GitH
transformed video feed to grayscale and fixed absolute path problem f…
85da24a 
…or placeholder image
@MohamedTababi-GitH
deleted unnecessary files
aad90a4
@MohamedTababi-GitH
Merge branch 'master' into ai-view-integration-(onnx)
3dce526 
# Conflicts:
#	src/main/java/controller/AutoTrackController.java
#	src/main/resources/view/AutoTrackView.fxml
@MohamedTababi-GitH
deleted unnecessary files
04fda24
@MohamedTababi-GitH
Merge branch 'master-timo' into ai-view-integration-(onnx)
fb8c126 
# Conflicts:
#	src/main/java/controller/AutoTrackController.java
#	src/main/resources/view/AutoTrackView.fxml
@MohamedTababi-GitH
deleted unnecessary files
3eb238c
@TheRisenPhoenix TheRisenPhoenix self-requested a review December 18, 2024 09:32
TheRisenPhoenix
TheRisenPhoenix requested changes Dec 18, 2024
View reviewed changes
Copy link
Collaborator

@TheRisenPhoenix TheRisenPhoenix left a comment •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I added a few comments and suggestions.
Also please check the resolved conflicts in AutoTrackController.java and AutoTrackView.fxml , it looks like that changes were discarded there

@TheRisenPhoenix TheRisenPhoenix merged commit 723d1d0 into master Jan 8, 2025
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheRisenPhoenix TheRisenPhoenix TheRisenPhoenix approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@MohamedTababi-GitH @TheRisenPhoenix @zegLine @VincentStriegel @david-todorov @nguyensl-rose @muazzamaqeel @BruderSimon @osama-alk