Commit Graph

104 Commits

Author SHA1 Message Date
Matt
55f01fb4b5 Only allow changes if we aren't driver mode right now 2019-11-29 21:21:40 -08:00
Matt
4aa9cc5dfc Fix driver mode hash map key bug 2019-11-29 21:18:07 -08:00
Matt
31f5c805a3 Fix int/double cast exception in request handler 2019-11-29 21:05:21 -08:00
Banks Troutman
d01e70b1ec Add PipelineManager 2019-11-29 23:13:57 -05:00
Banks Troutman
5b2af86f87 More UI fixes, add videomode and StreamDivisor to config 2019-11-29 14:24:34 -05:00
ori agranat
720911e5e6 removed unnecessary code 2019-11-29 13:58:37 +02:00
ori agranat
288000b295 fixed resolution list send to ui 2019-11-29 13:34:38 +02:00
Banks Troutman
25613d2625 Fix pipeline renaming and saving, RotationMode UI fix 2019-11-29 00:30:29 -05:00
Matt
2b85d3b120 Revert "Handle generalSettings saving"
This reverts commit 1d721f7867.
2019-11-28 20:04:20 +02:00
Matt
1d721f7867 Handle generalSettings saving 2019-11-28 09:13:16 -08:00
Matt
2a96ee917d Fix sockethandler rotation mode/orientation bug 2019-11-28 08:54:24 -08:00
Unknown
922bceda3e fixed remove pipeline 2019-11-28 13:42:53 +02:00
Unknown
6ae0f0c127 fixed duplicate pipeline 2019-11-28 13:28:36 +02:00
Matt
febd7292cf Start work on video mode selection 2019-11-27 21:11:05 -08:00
Matt
9e068ea0f0 Fix drivermode NPE and rename visionprocess method 2019-11-27 20:41:29 -08:00
Banks Troutman
07e07df040 Fixed usb camera bug, work on pipeline configs 2019-11-27 19:39:14 -05: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
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
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
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
ddba967793 Further abstract image capture, fix some UI bugs 2019-11-25 05:34:04 -05:00
Matt
ef60e1334d start on ui reintegration 2019-11-24 21:26:59 -08:00
Matt
0ce00ebdd4 send more settings to the UI 2019-11-24 20:46:25 -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
Banks Troutman
4dc86c6f25 Replace classes with new classabstraction classes 2019-11-23 11:55:20 -05:00
Banks Troutman
9b3e611eaa Continue plumbing ServerHandler 2019-11-23 04:05:37 -05:00
Matt
b19ae1f43b Start plumbing ServerHandler 2019-11-22 14:34:21 -08:00
ori agranat
1198e2cf99 general settings and camera settings as http requests 2019-11-09 19:52:33 +02:00
Banks Troutman
386533a41a More driverMode tweaks, and StreamDivisor , change port to 5800 2019-11-03 14:15:36 -05:00
Matt
24313ba45b Rename Camera and CamProcess to USBCamera and USBCameraProcess
Further changes:
- Add CameraProcess interface
- Change VisionProcess to pass the interface as parameter
2019-11-02 10:10:02 -07:00
Banks Troutman
a5477a7e4e fix exception when handling drivermode settings 2019-11-02 04:39:47 -04:00
Banks Troutman
570a042e35 fix for drivermode settings 2019-11-02 04:37:28 -04:00
Banks Troutman
bff2c2d8e0 reworked driverMode, fixed streamDivisor 2019-11-02 03:34:51 -04:00
Omer
f4d465d3e8 Small fix for driver settings 2019-11-01 18:02:48 +02:00
ori agranat
cfd5f22f05 Merge remote-tracking branch 'origin/dev' into dev 2019-11-01 17:11:20 +02:00
ori agranat
51a3f677bd added driver mode tab to settings in the ui 2019-11-01 17:10:48 +02:00
Omer
a050dff150 Support for driver settings tab 2019-11-01 17:01:10 +02:00
Omer
bb49cddd1a Merge branch 'dev' of https://gitlab.com/chameleon-vision/Chameleon-Vision into dev
# Conflicts:
#	chameleon-client/src/views/CameraViewes/OutputTab.vue
2019-10-30 14:34:19 +02:00
Omer
120fa64f3c Renamed "Closest" sort mode to "Centermost", Removed SpringFramework because its not needed 2019-10-30 14:32:57 +02:00
ori agranat
bddb9c0935 Merge branch 'dev' into 'V2.0/single-point-calibration'
# Conflicts:
#   Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#   Main/src/main/java/com/chameleonvision/web/Server.java
2019-10-29 20:30:42 +00:00
ori agranat
c33f822747 added save command and save data in more locations 2019-10-29 21:26:13 +02:00
Omer
a7f306d0b9 Added deletion for old nt table (after nickname change) and fixed a exposure set bug 2019-10-29 15:26:10 +02:00
Omer
8e1c4695f9 Nickname changes update in NT, added warning when lack of VC++ causes a crash 2019-10-29 15:10:43 +02:00
Unknown
a20d140531 added single point in pipeline and removed is calibrated for an enum 2019-10-28 20:16:18 +02:00
ori agranat
f3eea5c913 code cleanup and initial work 2019-10-26 23:41:45 +03:00