Commit Graph

265 Commits

Author SHA1 Message Date
Banks Troutman
07e07df040 Fixed usb camera bug, work on pipeline configs 2019-11-27 19:39:14 -05:00
Matt
5f8ca112a9 Scale area to [0,1] out of total image size in pixels 2019-11-27 16:08:46 -08:00
Matt
bf3de38a2b Merge branch 'dev' of https://github.com/chameleon-vision/Chameleon-Vision into dev 2019-11-27 15:39:30 -08:00
Matt
37159f9e6c Add image rotation mode to CVPipelineSettings 2019-11-27 15:38:59 -08:00
ori agranat
16c6caab8a Merge remote-tracking branch 'origin/dev' into dev 2019-11-28 01:38:52 +02:00
ori agranat
ab9cf217aa bugfix in 2d pipeline and added area in ui 2019-11-28 01:38:45 +02:00
Banks Troutman
221af540b2 GroupContoursPipe optimization 2019-11-27 18:16:00 -05:00
Banks Troutman
c5f2a90f86 Now running after merge to dev 2019-11-27 18:09:41 -05:00
Matt
154667c9d0 Fix average FPS calculation 2019-11-27 14:59:26 -08:00
Banks Troutman
b49ad68df0 Updated SocketHandler dependent classes 2019-11-27 17:43:33 -05:00
Banks Troutman
a0dddc0289 Merge branch 'dev' into class-abstraction
# Conflicts:
#	.gitignore
#	Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
#	Main/src/main/java/com/chameleonvision/vision/camera/CameraSerializer.java
#	Main/src/main/java/com/chameleonvision/vision/enums/StreamDivisor.java
#	Main/src/main/java/com/chameleonvision/vision/process/CameraProcess.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#	Main/src/main/java/com/chameleonvision/web/Server.java
#	Main/src/main/java/com/chameleonvision/web/SocketHandler.java
2019-11-27 17:40:24 -05:00
ori agranat
663786e21b bug fix for current camera name 2019-11-27 23:53:41 +02:00
ori agranat
b683abad20 bug fixed object mapper and changed hsv pipe to bgr 2019-11-27 22:19:21 +02:00
Banks Troutman
6b5bd75dbe Config fixes, add JUnit maven dependency, potential fix for stream latency 2019-11-27 14:59:36 -05:00
ori agranat
e195cce026 bug fixes in ui and bug fixes in sever handler
-- updated pom
2019-11-27 21:46:07 +02:00
Matt
ca7f15aeb7 Catch file exceptions in CameraConfig and ConfigManager 2019-11-27 08:58:20 -08:00
Banks Troutman
ebf87c8b2a Fix for cameras folder not getting created 2019-11-27 01:37:50 -05:00
Matt
019ad14c73 use mkdirs() method to create the directory 2019-11-26 22:26:53 -08:00
Matt
b3f39f0201 Only post the first (up to) 5 targets 2019-11-26 22:18:29 -08:00
Banks Troutman
8b8138eb50 Config tweaks, fixed CameraStreamer 2019-11-26 23:03:07 -05:00
Banks Troutman
d588b1a69e Camera configuration rewrite, begin on CameraStreamer threading fix 2019-11-26 17:57:51 -05:00
Banks Troutman
f6e56ce930 Major pipeline optimizations, moved grabFrame in to vision thread 2019-11-26 02:55:05 -05:00
Banks Troutman
4bebc3d063 Added method to set camera gain for PS3Eye 2019-11-26 01:45:35 -05:00
Banks Troutman
29b52d485b Add PS3Eye detection 2019-11-26 01:39:36 -05:00
Banks Troutman
79fd79be41 Memory cleanups 2019-11-25 16:40:23 -05:00
Banks Troutman
55cc337198 tweaked pipeline FPS prints 2019-11-25 16:06:21 -05:00
Banks Troutman
ddba967793 Further abstract image capture, fix some UI bugs 2019-11-25 05:34:04 -05:00
Banks Troutman
26e0bb733b Small cleanups, possible leak fix 2019-11-25 00:34:13 -05:00
Matt
ef60e1334d start on ui reintegration 2019-11-24 21:26:59 -08:00
Matt
2ae6582291 Instantiate auxListEntry 2019-11-24 20:57:48 -08:00
Matt
0ce00ebdd4 send more settings to the UI 2019-11-24 20:46:25 -08:00
Matt
0a1046ff39 Clear lists in Pipes 2019-11-24 18:45:53 -08:00
Banks Troutman
4975e5cfe8 Fix CvExceptions for pipes, CVPipeline2d cleanups 2019-11-24 21:07:22 -05:00
Banks Troutman
88cfbc820a ConfigManager cleanups 2019-11-24 21:06:09 -05:00
Matt
d53f047ad7 stop instantiating new pipes every tick 2019-11-24 16:54:10 -08:00
Banks Troutman
80d4451e56 Fix timing calculations, add OpenCV exception catching to some pipes 2019-11-24 19:31:45 -05:00
ori agranat
3852e6d908 removed unnecessary call for send full settings 2019-11-24 23:51:12 +02:00
Matt
a8480d6516 Actually initilize network tables 2019-11-23 20:13:01 -08:00
Matt
299692c286 Fix pipeline errors 2019-11-23 20:06:37 -08:00
Matt
3756d537cb Disable prints in visionprocess 2019-11-23 19:28:11 -08:00
Matt
45a1415a16 Fix mixup between Pipeline and PipelineSettings in getOrdinalPipeline() 2019-11-23 18:34:10 -08:00
Banks Troutman
d6e435a124 UI now partially running, but errors still getting thrown 2019-11-23 20:02:21 -05:00
ori agranat
bca207fc3f Merge remote-tracking branch 'origin/class-abstraction' into class-abstraction 2019-11-23 19:39:55 +02:00
ori agranat
63ada3d866 finished save cameras function and helper functions 2019-11-23 19:39:24 +02:00
Banks Troutman
3362a6b4b9 Add saveSettings and various cleanup in ConfigManager 2019-11-23 12:23:21 -05:00
Banks Troutman
cb401997ca replace CameraSerializer with helper function in CameraConfig 2019-11-23 12:13:38 -05:00
Matt
faf03e7ba2 Fix some compilation errors 2019-11-23 09:11:38 -08:00
Matt
dbe22417ae Update cameraRunnable fps with video mode change 2019-11-23 09:09:31 -08:00
Banks Troutman
4dc86c6f25 Replace classes with new classabstraction classes 2019-11-23 11:55:20 -05:00
ori agranat
4bcae6590f Merge remote-tracking branch 'origin/class-abstraction' into class-abstraction 2019-11-23 18:29:54 +02:00