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

Create path #41

Merged
merged 133 commits into from
May 29, 2024
Merged

Create path #41

merged 133 commits into from
May 29, 2024

Conversation

osama-alk
Copy link
Contributor

No description provided.

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 24 commits May 15, 2024 11:12
@muazzamaqeel
Update AnnotationView.fxml
cc511e5
@zegLine
reversed shanes changes
8d71936
@osama-alk
fixed ppoint tracking
bb90a4d
@osama-alk
Merge remote-tracking branch 'origin/create-path' into create-path
d711860
@osama-alk
fixed ppoint tracking
c967ec2
@osama-alk
fixed ppoint tracking
f6038a2
@osama-alk
fixed ppoint tracking
ba4e71f
@muazzamaqeel
No Tip Functionality + More extension
a9ba4a6
@muazzamaqeel
Update AnnotationController.java
afad6df 
New Functionalities
Ctrl A functionality
@muazzamaqeel
Update AnnotationController.java
c0c0bbb
@muazzamaqeel
Update AnnotationController.java
5832ec0
@muazzamaqeel
Update AnnotationController.java
24227d5
@muazzamaqeel
Update AnnotationController.java
2f9d565
@muazzamaqeel
Update AnnotationController.java
b13c8ab
@muazzamaqeel
Bugs+Count_Functionality
7b7b9ee
@muazzamaqeel
Update AnnotationController.java
80b7cb5
@muazzamaqeel
Merge pull request #39 from zegLine/group-e-NoTipFunctionality-Fix
d9c747d 
Group e no tip functionality fix
@muazzamaqeel
Update AnnotationController.java
b7d56a3
@muazzamaqeel
Update AnnotationController.java
93f3ebd
@muazzamaqeel
Update AnnotationController.java
db59a14
@muazzamaqeel
Update AnnotationController.java
16a45f7
@muazzamaqeel
Update AnnotationController.java
aadaf52
@muazzamaqeel
Comments
465d128
@muazzamaqeel
Merge pull request #40 from zegLine/group-e
57e3e31 
Group e
@osama-alk osama-alk closed this May 23, 2024
@TheRisenPhoenix TheRisenPhoenix changed the base branch from master to 2024-cigs-ai-tracking May 29, 2024 13:02
@TheRisenPhoenix TheRisenPhoenix merged commit 09e53ba into NAMI-THU:2024-cigs-ai-tracking May 29, 2024
1 of 10 checks passed
MohamedTababi-GitH pushed a commit that referenced this pull request Nov 19, 2024
@osama-alk
Merge pull request #41 from zegLine/create-path
5067a79 
Create path
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.
8 participants
@osama-alk @TheRisenPhoenix @zegLine @VincentStriegel @david-todorov @nguyensl-rose @muazzamaqeel @BruderSimon