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.

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

Ai view integration (onnx) #49

Merged
merged 157 commits into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
157 commits
Select commit Hold shift + click to select a range
ada26a8
added prototype for data source
zegLine Mar 27, 2024
87d942b
added proof of concept of igt virtual device in python
zegLine Mar 29, 2024
9aef866
added igt server implementation in python yolov5
Apr 9, 2024
cd93750
added virtual camera to detect py
zegLine Apr 9, 2024
c5de2f9
create annotation tab
VincentStriegel Apr 10, 2024
e8d7d06
Merge pull request #6 from zegLine/groupe-e-task-13-create-tab
david-todorov Apr 10, 2024
94cf3e5
Basic GUI design added
david-todorov Apr 11, 2024
a72a02c
the igtpt tracker points away from its last known position (essential…
nguyensl-rose Apr 11, 2024
564384d
Merge branch 'ai-datasource' of https://github.com/zegLine/IGTPrototy…
nguyensl-rose Apr 11, 2024
635b590
orientation faces last position
nguyensl-rose Apr 11, 2024
84f0daf
Merge pull request #9 from zegLine/feature-14-side-view-and-main-pict…
david-todorov Apr 11, 2024
04db0df
Multiple Functionalities (Upload Pictures + Import Button + Picture S…
muazzamaqeel Apr 12, 2024
8e736c7
Merge pull request #10 from zegLine/mo_groupe
muazzamaqeel Apr 12, 2024
f0d742d
Update AnnotationView.fxml with new buttons and styles
VincentStriegel Apr 13, 2024
9347b7e
Merge pull request #11 from zegLine/group-e-task-28-create-buttons
david-todorov Apr 13, 2024
41235ac
Next and previous button functionality added
david-todorov Apr 14, 2024
d96399b
Simple Zoom in and Zoom out functionality added
david-todorov Apr 14, 2024
7fbb8a2
Merge pull request #13 from zegLine/feature-37-zooming-functionality
david-todorov Apr 14, 2024
8f1018c
Merge pull request #12 from zegLine/feature-33-navigation-keys-functi…
muazzamaqeel Apr 15, 2024
ea1cb6b
Create Rectangle Shape
BruderSimon Apr 15, 2024
6d58abe
Create AnnotationData to save the Data
BruderSimon Apr 15, 2024
018a01d
Two-way Annotation Functionality
BruderSimon Apr 15, 2024
9777e66
Focus of the image fixed, zooming functionality fixed when the image …
david-todorov Apr 15, 2024
b212ebc
Merge pull request #14 from zegLine/feature-33-navigation-keys-functi…
muazzamaqeel Apr 16, 2024
5c5a26d
Finished Annotation Functionality
BruderSimon Apr 17, 2024
2232dd0
added reference point setting
zegLine Apr 17, 2024
431894e
Middle point for each Box
BruderSimon Apr 17, 2024
a8f1187
added line plot overlay for showing distance
zegLine Apr 18, 2024
4a3f6b5
Merge branch 'refs/heads/group-e-task-38-annotation' into group-e-mer…
BruderSimon Apr 18, 2024
bcd2324
added line plot overlay for showing distance
zegLine Apr 18, 2024
33dfd78
Merged Annotation with Zooming
BruderSimon Apr 18, 2024
6571f15
fixed bug in reference point lines
zegLine Apr 19, 2024
a3fe0cd
Merge pull request #15 from zegLine/group-e-merge-annotation-with-zoom
muazzamaqeel Apr 20, 2024
16dc91f
Full_Functionality (ExportButton)
muazzamaqeel Apr 20, 2024
61c5636
Dark/Light-Mode (Full-Functionality)
muazzamaqeel Apr 20, 2024
c2651f8
clear marks
VincentStriegel Apr 21, 2024
08f7cf2
Merge pull request #17 from zegLine/group-e-task-40-clear-marks
muazzamaqeel Apr 21, 2024
e6f86ce
Merge branch 'group-e' into group-e_Export-Button-Functionality_Task38
muazzamaqeel Apr 21, 2024
ebd3c8e
Merge pull request #18 from zegLine/group-e_Export-Button-Functionali…
muazzamaqeel Apr 21, 2024
070311f
Fix
muazzamaqeel Apr 21, 2024
842f426
Fix
muazzamaqeel Apr 21, 2024
7636c8b
Update AnnotationController.java
muazzamaqeel Apr 21, 2024
b7e7abe
Merge pull request #19 from zegLine/group-e_fix_duplication_issue
muazzamaqeel Apr 21, 2024
ee73de8
fixed detect reference point
zegLine Apr 23, 2024
a660a6b
Delete Functionality
muazzamaqeel Apr 24, 2024
1355637
Update AnnotationController.java
muazzamaqeel Apr 24, 2024
7587771
Update AnnotationView.fxml
muazzamaqeel Apr 24, 2024
4632949
Variable Name Fix :)
muazzamaqeel Apr 24, 2024
d7b1430
removed unnecessary print statements
zegLine Apr 24, 2024
98aca66
Fixed Bug where Annotation wasn't deleted
BruderSimon Apr 24, 2024
445e1ff
Merge pull request #21 from zegLine/group-e-urgent-deletion-functiona…
muazzamaqeel Apr 24, 2024
81051cf
starting new tab work
zegLine Apr 24, 2024
e0af5a9
Merge branch 'ai-datasource' of https://github.com/zegLine/IGTPrototy…
nguyensl-rose Apr 29, 2024
044cca1
cleaned up aicontroller and aiview
nguyensl-rose Apr 29, 2024
33c9dd5
add export all button and functionality
VincentStriegel May 2, 2024
522c863
remove log and update gitignore
VincentStriegel May 2, 2024
346e8fe
Update AnnotationController.java
muazzamaqeel May 2, 2024
4326be5
Merge pull request #26 from zegLine/group-e-task-62-export-all
muazzamaqeel May 2, 2024
3f9f9e2
Merge pull request #27 from zegLine/group-e-task-66-remove-log
muazzamaqeel May 2, 2024
17a56cf
Update AnnotationController.java
muazzamaqeel May 2, 2024
0f1cf27
Update AnnotationController.java
muazzamaqeel May 2, 2024
850ce10
Merge pull request #28 from zegLine/group-e-FileNames-SideView
muazzamaqeel May 2, 2024
352e587
Revert "Merge pull request #28 from zegLine/group-e-FileNames-SideView"
muazzamaqeel May 2, 2024
4d3fdc0
Theme Button (Placement Fix)
muazzamaqeel May 2, 2024
cc8f9db
Select Multiple pictures in the Side View
BruderSimon May 2, 2024
3b16e92
Removed few Warnings
BruderSimon May 3, 2024
697fb0d
Merge pull request #30 from zegLine/group-e-taks-61-selecting-multiple
muazzamaqeel May 4, 2024
704e38e
Default Color - Fix
muazzamaqeel May 4, 2024
588fa83
Merge pull request #29 from zegLine/group-e-ThemeButton-PlacementFix
muazzamaqeel May 4, 2024
2b951cd
Update AnnotationController.java
muazzamaqeel May 4, 2024
9b2de9f
Merge pull request #31 from zegLine/group-e-BugFix-ExportAllFunctiona…
muazzamaqeel May 4, 2024
6ea6807
Update AnnotationController.java
muazzamaqeel May 4, 2024
a8725b4
Merge pull request #32 from zegLine/group-e-DeleteMultiplePictures-Fu…
muazzamaqeel May 5, 2024
8337e69
Deleting Annotation Data
muazzamaqeel May 5, 2024
134e5e4
Update AnnotationController.java
muazzamaqeel May 5, 2024
2951d6e
Update AnnotationController.java
muazzamaqeel May 5, 2024
2383c5b
Update AnnotationController.java
muazzamaqeel May 5, 2024
d1e17a4
Update AnnotationController.java
muazzamaqeel May 5, 2024
7e3e08b
Update AnnotationController.java
muazzamaqeel May 5, 2024
cc31ecf
Merge pull request #33 from zegLine/group-e-Multiple-BugFixes
muazzamaqeel May 5, 2024
b6a2d2d
Fix-ClearBox-After all of the pictures get deleted
muazzamaqeel May 5, 2024
a6a4a1f
Merge pull request #34 from zegLine/group-e-Multiple-BugFixes
muazzamaqeel May 5, 2024
e362f0f
Removed refrence point checkbox (eugense work) and added choice box (…
osama-alk May 7, 2024
084ab89
added functionlity to choicebox to allows single point mode
osama-alk May 7, 2024
460c20e
Added multipoint functinality, no path yet
osama-alk May 7, 2024
a058120
Added clear all boints
osama-alk May 7, 2024
d75def3
Update AnnotationController.java
muazzamaqeel May 9, 2024
84c1df9
Left-Right Button Fix + Annotation Code adjustment
muazzamaqeel May 12, 2024
a17edc8
Update AnnotationController.java
muazzamaqeel May 12, 2024
415257e
Update AnnotationController.java
muazzamaqeel May 12, 2024
5bcd7d1
Update AnnotationController.java
muazzamaqeel May 13, 2024
4fcbb2c
added path in bath mode )wow)
osama-alk May 13, 2024
8114cab
Revert "Update AnnotationController.java"
muazzamaqeel May 13, 2024
6a3131d
Revert "Update AnnotationController.java"
muazzamaqeel May 13, 2024
8eca647
Revert "Update AnnotationController.java"
muazzamaqeel May 13, 2024
007818c
Merge pull request #35 from zegLine/group-e-BugFix-LeftRightButtons
muazzamaqeel May 13, 2024
14b0280
Major Changes --- Export Functionality to now (Specific Export)
muazzamaqeel May 13, 2024
e7c4afa
Update AnnotationController.java
muazzamaqeel May 13, 2024
7018c82
Fix Button Placements
muazzamaqeel May 13, 2024
68105fd
Update AnnotationController.java
muazzamaqeel May 13, 2024
8378d3c
Merge pull request #36 from zegLine/group-e-Improvements(Multiple)
muazzamaqeel May 13, 2024
0dbeb97
Help Section - Full Functionality
muazzamaqeel May 14, 2024
690a108
Fixed colour change issue
osama-alk May 14, 2024
00b2a9f
Removed AI tab from start up and moved the "window" tab
osama-alk May 14, 2024
e94c203
Merge pull request #37 from zegLine/group-e-HelpWindow
muazzamaqeel May 15, 2024
09bc861
Added Keybinding toHelp Window
BruderSimon May 15, 2024
e66fcc2
Added Keybinding toHelp Window
BruderSimon May 15, 2024
6db382b
Merge pull request #38 from zegLine/group-e-HelpWindow
BruderSimon May 15, 2024
cc511e5
Update AnnotationView.fxml
muazzamaqeel May 15, 2024
8d71936
reversed shanes changes
zegLine May 15, 2024
bb90a4d
fixed ppoint tracking
osama-alk May 15, 2024
d711860
Merge remote-tracking branch 'origin/create-path' into create-path
osama-alk May 15, 2024
c967ec2
fixed ppoint tracking
osama-alk May 15, 2024
f6038a2
fixed ppoint tracking
osama-alk May 15, 2024
ba4e71f
fixed ppoint tracking
osama-alk May 15, 2024
a9ba4a6
No Tip Functionality + More extension
muazzamaqeel May 17, 2024
afad6df
Update AnnotationController.java
muazzamaqeel May 17, 2024
c0c0bbb
Update AnnotationController.java
muazzamaqeel May 17, 2024
5832ec0
Update AnnotationController.java
muazzamaqeel May 20, 2024
24227d5
Update AnnotationController.java
muazzamaqeel May 20, 2024
2f9d565
Update AnnotationController.java
muazzamaqeel May 20, 2024
b13c8ab
Update AnnotationController.java
muazzamaqeel May 20, 2024
7b7b9ee
Bugs+Count_Functionality
muazzamaqeel May 20, 2024
80b7cb5
Update AnnotationController.java
muazzamaqeel May 20, 2024
d9c747d
Merge pull request #39 from zegLine/group-e-NoTipFunctionality-Fix
muazzamaqeel May 20, 2024
b7d56a3
Update AnnotationController.java
muazzamaqeel May 20, 2024
93f3ebd
Update AnnotationController.java
muazzamaqeel May 20, 2024
db59a14
Update AnnotationController.java
muazzamaqeel May 20, 2024
16a45f7
Update AnnotationController.java
muazzamaqeel May 20, 2024
aadaf52
Update AnnotationController.java
muazzamaqeel May 20, 2024
465d128
Comments
muazzamaqeel May 20, 2024
57e3e31
Merge pull request #40 from zegLine/group-e
muazzamaqeel May 20, 2024
2cbe304
Merge branch 'master' into create-path
osama-alk May 24, 2024
5067a79
Merge pull request #41 from zegLine/create-path
osama-alk May 24, 2024
d965fea
fixed video source display and added distance calculation (untested)
MohamedTababi-GitH Aug 2, 2024
4b95b6f
fixed multi path mode
MohamedTababi-GitH Aug 3, 2024
c683182
updated distance calculation
MohamedTababi-GitH Aug 5, 2024
dc32ed6
added style to the thrombus point, also we can now invoke script from…
MohamedTababi-GitH Aug 6, 2024
22f9291
fixed collision detection (untested)
MohamedTababi-GitH Aug 6, 2024
b1b921e
fixed detected tip position
MohamedTababi-GitH Aug 7, 2024
0372803
test
MohamedTababi-GitH Aug 13, 2024
38e220f
onnx dependency included
MohamedTababi-GitH Oct 3, 2024
391205b
integrated live detection using onnx exported model (untested)
MohamedTababi-GitH Oct 6, 2024
2d9366e
implemented distance calculation and status updated, changed the fxml…
MohamedTababi-GitH Oct 7, 2024
ab813f1
tested v
MohamedTababi-GitH Oct 9, 2024
2ae7ac4
onnx file added
MohamedTababi-GitH Oct 9, 2024
85da24a
transformed video feed to grayscale and fixed absolute path problem f…
MohamedTababi-GitH Nov 14, 2024
aad90a4
deleted unnecessary files
MohamedTababi-GitH Nov 19, 2024
3dce526
Merge branch 'master' into ai-view-integration-(onnx)
MohamedTababi-GitH Nov 19, 2024
04fda24
deleted unnecessary files
MohamedTababi-GitH Nov 27, 2024
fb8c126
Merge branch 'master-timo' into ai-view-integration-(onnx)
MohamedTababi-GitH Nov 27, 2024
3eb238c
deleted unnecessary files
MohamedTababi-GitH Nov 27, 2024
b7a03af
Implemented status bar tracker for video source and igtlink. Synchron…
MohamedTababi-GitH Dec 31, 2024
3dbd2de
Apply suggestions from code review
MohamedTababi-GitH Jan 2, 2025
b796af5
Added a resizing option in the ai view control panel
MohamedTababi-GitH Jan 3, 2025
1f908fc
Merge remote-tracking branch 'THU_IGTP/ai-view-integration-(onnx)' in…
MohamedTababi-GitH Jan 3, 2025
b7b3268
Minor changes from code review
TheRisenPhoenix Jan 8, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
*.class

# Log file
*.log
*.log*
*.log.lck

# BlueJ files
Expand Down
1 change: 1 addition & 0 deletions COPYING
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
This application uses the following 3rd party libraries.
The respective license files can be accessed by the respective URL.

com.microsoft.onnxruntime:onnxruntime. Microsoft. MIT License. https://github.com/microsoft/onnxruntime/blob/main/LICENSE
org.openpnp:opencv. Jason von Nieda. BSD-3 License. https://github.com/openpnp/opencv/blob/develop/LICENSE
org.apache.commons:commons-math3. Apache Commons. Apache 2.0 License. https://commons.apache.org/proper/commons-math/
org.apache.commons:commons-csv. Apache Commons. Apache 2.0 License. https://commons.apache.org/proper/commons-csv/
Expand Down
Binary file added Python/best.onnx
Binary file not shown.
3 changes: 3 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ repositories {
}

dependencies {
implementation 'com.microsoft.onnxruntime:onnxruntime:1.20.0'

implementation 'org.openpnp:opencv:4.9.0-0'
implementation 'org.apache.commons:commons-math3:3.6.1'
implementation 'org.apache.commons:commons-csv:1.12.0'
Expand All @@ -41,6 +43,7 @@ dependencies {
testRuntimeOnly 'org.junit.platform:junit-platform-commons:1.11.3'
}


// JUnit 5 support
test {
useJUnitPlatform()
Expand Down
Loading
Loading