Commit Graph

161 Commits

Author SHA1 Message Date
ori agranat
e7e0632b2b added group contours method and target intersection 2019-09-16 21:45:04 +03:00
Omer
adc5aa2399 Merge branch 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java 2019-09-16 18:50:30 +03:00
Omer
8374b9af7b camera and pipeline changes synced 2019-09-16 18:50:00 +03:00
Banks Troutman
99c32e1d18 Fixed area filtering of contours 2019-09-16 11:45:56 -04:00
Banks Troutman
86b811a36d Vision work, move camera calcs to CameraValues class 2019-09-16 04:08:23 -04:00
Omer
dc3936ad8f Websockets almost done, TODO ports,testing 2019-09-16 04:20:40 +03:00
Omer
00552c751a Websockets almost done TODO ports, testing 2019-09-16 04:10:26 +03:00
Banks Troutman
0e8029840d Memory usage fixes, general cleanup 2019-09-15 19:07:58 -04:00
Banks Troutman
d04096f2c8 Package change fix
Moved Main.java, added missing import
2019-09-15 15:22:52 -04:00
Banks Troutman
f26b7df000 Merge branch 'folderStructure' into Java
# Conflicts:
#	Main/pom.xml
#	Main/src/main/java/com/chameleonvision/web/Server.java
2019-09-15 15:11:26 -04:00
Banks Troutman
25652ba32e Adjusted folder structure to sit under com.chameleonvision package 2019-09-15 15:03:44 -04:00