Commit Graph

196 Commits

Author SHA1 Message Date
ori agranat
b4e4f7b57c finished color picker in the ui 2019-12-03 00:28:36 +02:00
Omer
fd71767b44 fix for BGR not RGB 2019-11-27 22:03:44 +02:00
ori agranat
faa59c4157 bugfixed file 2019-11-18 22:00:51 +02:00
ori agranat
1198e2cf99 general settings and camera settings as http requests 2019-11-09 19:52:33 +02:00
ori agranat
0881880b86 changed stream resolution list from ratio
- changed the resolution list to be the actual resolution instead of ratio 
- changed development port to be 5800
2019-11-05 21:15:10 +02:00
Banks Troutman
ac7bd48d87 Fix JPEG Image error 2019-11-03 15:09:01 -05:00
Banks Troutman
2a78334bbb Fix null pointer in CameraProcess 2019-11-03 14:21:37 -05:00
Banks Troutman
386533a41a More driverMode tweaks, and StreamDivisor , change port to 5800 2019-11-03 14:15:36 -05: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
cb733aa19e Fix path loads on linux 2019-11-02 04:04:19 -04:00
ori agranat
1e43547635 compiled web ui 2019-11-02 09:53:31 +02:00
Banks Troutman
c73b68947b reword 2019-11-02 03:35:12 -04:00
Banks Troutman
bff2c2d8e0 reworked driverMode, fixed streamDivisor 2019-11-02 03:34:51 -04:00
ori agranat
58e39b2922 added stream divisor to cv source 2019-11-01 22:37:41 +02: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
7ef05e6077 Added driver mode exposure and brightness 2019-11-01 11:38:58 +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
e24cc5564a BUG FIX IN PITCH AND YAW CALCULATION 2019-10-29 21:53:00 +02: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
ori agranat
a89ab3393f added set camera by index and bugfix in current camera 2019-10-25 06:37:04 -07:00
ori agranat
583154090b added current pipeline to full settings and current camera 2019-10-25 15:57:46 +03:00
ori agranat
ec117e9884 bugfix in delete pipeline in ui, changed pipelines to be a list instead of a hashmap, ui renaming
- changed pipeline delete message to be Can not remove the only pipeline!
- duplicate pipeline window will display current pipeline on open
- duplicate windows button changed from discard to cancel
2019-10-25 15:02:17 +03:00
ori agranat
dfe88d8df5 added nickname call in server handler 2019-10-25 14:05:00 +03:00
ori agranat
666cf66a99 added call by nickname 2019-10-25 14:02:42 +03:00
Banks Troutman
7b48c9f964 Added command handling for camera name, pipeline name pipeline duplication 2019-10-24 15:20:15 -04:00
ori agranat
0ce7d7465c bugfix for Settings where page moved down and url is lowercase 2019-10-24 21:27:49 +03:00
ori agranat
4577f5de32 target grouping improvement 2019-10-24 21:02:19 +03:00
ori agranat
f5aa1159be manual merge of speckle rejection into new ui and updated ui to include speckle slider 2019-10-24 02:35:08 +03:00
ori agranat
e1f908e0a1 Merge remote-tracking branch 'origin/dev' into ui-integration
# Conflicts:
#	Main/src/main/java/com/chameleonvision/network/NetworkManager.java
#	Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java
#	Main/src/main/java/com/chameleonvision/vision/process/PipelineResult.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
#	Main/src/main/java/com/chameleonvision/web/ServerHandler.java
2019-10-24 02:12:04 +03:00
ori agranat
081fc1f9a2 Revert "Merge branch 'speckle-rejection' into 'ui-integration'"
This reverts merge request !21
2019-10-23 23:03:32 +00:00
Matt M
910d377440 Create speckle rejection code and add to VisionProcess
Isn't yet added to the GUI
2019-10-23 21:39:47 +00:00
ori agranat
12c409b953 disabled duplicate to another camera when only one cam is connected and disabled pipeline delete when only one left 2019-10-23 00:01:57 +03:00
ori agranat
72889c5e18 changed camera index from null to -1 2019-10-21 21:19:44 +03:00
ori agranat
9331f30473 duplicate values not receiving in BE bugfix 2019-10-21 21:10:42 +03:00
ori agranat
e3a01c19fa bug fix in duplicate pipeline 2019-10-21 20:34:47 +03:00
ori agranat
717e4f3568 type fix and added full setting save 2019-10-21 20:22:39 +03:00
ori agranat
c6cd86d8db code cleanup and ui route bugfix 2019-10-20 10:13:07 +03:00
ori agranat
ded791b31c added all cases to the server handler 2019-10-19 17:45:40 +03:00
ori agranat
5b66de7f8b removed old ui src and moved new one to its location and builded ui for distribution 2019-10-19 16:58:10 +03:00
ori agranat
188f6496aa bug fix for is binary in ui 2019-10-17 22:31:51 +03:00