Commit Graph

12 Commits

Author SHA1 Message Date
Omer
7fdab7d3db Merge branch 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java 2019-09-18 03:06:10 +03:00
Omer
5fd3dc8f6c Added saving for selected pipeline 2019-09-18 03:04:48 +03:00
ori agranat
45916b3e11 removed setCameraSettings function 2019-09-18 00:16:56 +03:00
Unknown
326da862c4 added calib calc
added bool to check if calib is done
2019-09-17 13:59:53 +03:00
Banks Troutman
6187b1a205 Added SortMode rect filtering, Added exposure/brightness websocket adjustment 2019-09-17 02:12:53 -04: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
Omer
00552c751a Websockets almost done TODO ports, testing 2019-09-16 04:10:26 +03: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