Commit Graph

20 Commits

Author SHA1 Message Date
Banks Troutman
7a49541d45 Fix settings paths for Unix systems 2019-09-26 15:01:51 -04:00
Banks Troutman
8dbf5b3a73 Potential fix for multi-camera on Windows 2019-09-24 10:35:14 -04:00
Banks Troutman
038e84ce0d Various cleanup, slowed down UI FPS counter 2019-09-21 13:05:00 -04:00
ori agranat
305bd65e43 Merge remote-tracking branch 'origin/Java' into Java 2019-09-21 18:52:36 +03:00
ori agranat
d97f3c1e1a added port handling and pipline change sync wth ui
- added port hash map
- putting port into hashmap from camera class
- added sending port from full settings and camera change 
- nt pipe change now sends pipe name to ui
2019-09-21 18:52:28 +03:00
Omer
5aa829a134 Revert "Revert "Added network settings handler for linux""
This reverts commit d94ac908ec.
2019-09-21 18:38:08 +03:00
Omer
d94ac908ec Revert "Added network settings handler for linux"
This reverts commit a327abc4c2.
2019-09-21 18:33:00 +03:00
Omer
a327abc4c2 Added network settings handler for linux 2019-09-21 18:31:29 +03:00
Banks Troutman
096e214a8e Make SettingsManager completely static 2019-09-20 19:54:59 -04:00
Banks Troutman
012aa9559a Moved CvSink/CvSource to Camera class 2019-09-20 02:17:22 -04:00
Banks Troutman
508ccff766 Full rewrite of camera system 2019-09-19 14:07:42 -04:00
Unknown
5b75c85c0f removed unnecessary save of cameras current pipline 2019-09-18 10:36:29 +03:00
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
ori
2e5c2bcddb bug fix for creating a new cam 2019-09-17 13:44:42 -07:00
Banks Troutman
6187b1a205 Added SortMode rect filtering, Added exposure/brightness websocket adjustment 2019-09-17 02:12:53 -04:00
Omer
8374b9af7b camera and pipeline changes synced 2019-09-16 18:50:00 +03:00
Omer
00552c751a Websockets almost done TODO ports, testing 2019-09-16 04:10:26 +03:00
Banks Troutman
25652ba32e Adjusted folder structure to sit under com.chameleonvision package 2019-09-15 15:03:44 -04:00