Commit Graph

419 Commits

Author SHA1 Message Date
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
2f7075e6ff Merge branch 'revert-f8780651' into 'ui-integration'
Revert "Merge branch 'speckle-rejection' into 'ui-integration'"

See merge request chameleon-vision/Chameleon-Vision!25
2019-10-23 23:03:40 +00: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
ori agranat
f87806519a Merge branch 'speckle-rejection' into 'ui-integration'
Speckle rejection

See merge request chameleon-vision/Chameleon-Vision!21
2019-10-23 21:39:47 +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
566a4e91d2 bug fix in camera index
camera index wasnt changing
2019-10-18 07:17:00 -07:00
ori agranat
a60cbadac4 made ui denser and finished all ui commands 2019-10-18 16:48:08 +03:00
ori agranat
188f6496aa bug fix for is binary in ui 2019-10-17 22:31:51 +03:00
ori agranat
aaa9b98290 bugfix for is binary in ui and target group
- css cleanup of main header
2019-10-16 23:46:46 +03:00
ori agranat
dc2b738190 finished integration between new client and backend
commands needs to be implemented
2019-10-16 14:13:12 +03:00
ori agranat
0828d2290a WIP stream divisor
set enum for stream divisor
2019-10-16 08:10:06 +03:00
ori agranat
c2fd34ed60 bugfix in target group 2019-10-15 21:24:38 +03:00
ori agranat
cd94c9f8c0 changed general settings naming and added general settings save in ui 2019-10-15 21:00:18 +03:00
ori agranat
91a1338022 changed all double and int data type to Number
added pipeline change handle in ui
2019-10-14 23:35:29 +03:00
ori agranat
221c1b7bfd fixed enums ordinal 2019-10-14 22:36:56 +03:00
ori agranat
ce29e904b9 enum and is binary bug fix 2019-10-14 22:24:37 +03:00
ori agranat
98a71aea66 working communication between client and backend with message pack with working data flow 2019-10-14 21:22:43 +03:00
ori agranat
63290a07d3 simplified the msgpack object using jackson-msgpack 2019-10-14 11:21:20 +03:00
Omer
ca2da43110 Added client parse message 2019-10-14 00:03:22 +03:00
Omer
8b61c87733 Simplified ServerHandler, move ApplyFields to set value function 2019-10-13 22:59:36 +03:00
Banks Troutman
1871f02a5a Fix for Maven devops builds 2019-10-13 15:55:07 -04:00
Omer
27dcef96dd Revert "Simplfied serverhandler and moved alot of the logic to ApplyFields"
This reverts commit 34eda17e97.
2019-10-13 21:58:34 +03:00
Omer
34eda17e97 Simplfied serverhandler and moved alot of the logic to ApplyFields 2019-10-13 00:44:17 +03:00
ori agranat
0aaff35e42 added camera settings send and general settings send 2019-10-12 18:09:05 +03:00
ori agranat
276e425183 added client structure handling for all message types 2019-10-12 16:58:32 +03:00
ori agranat
16d15070d3 fixed store variable naming and sliders number going under min and max values 2019-10-12 12:31:32 +03:00
Omer
9cc30ef6ae Merge branch 'ui-integration' of https://gitlab.com/chameleon-vision/Chameleon-Vision into ui-integration
# Conflicts:
#	New client/chameleon-client/src/views/CameraViewes/ContoursTab.vue
#	New client/chameleon-client/src/views/CameraViewes/InputTab.vue
#	New client/chameleon-client/src/views/CameraViewes/OutputTab.vue
#	New client/chameleon-client/src/views/CameraViewes/ThresholdTab.vue
2019-10-12 03:43:44 +03:00
Omer
5f879f9d98 Added enums, msgpack - new ui intergration 2019-10-12 03:38:42 +03:00
ori agranat
ecbd80768c finished all pipeline values and renamed all as java variables 2019-10-11 15:48:16 +03:00
Omer
2eb4cbc950 very early msgpack handler 2019-10-11 02:25:25 +03:00
ori agranat
0b0798ff51 fixed double emit bug 2019-10-11 01:18:14 +03:00
ori agranat
c841f3d456 key value fix in websocket 2019-10-11 00:48:59 +03:00
ori agranat
0c56aa878e added emmit for more pipeline values 2019-10-11 00:00:57 +03:00
ori agranat
d5cfd7fc72 removed json format in FE websocket 2019-10-10 23:36:33 +03:00
ori agranat
82ee832148 added first data emit 2019-10-10 23:32:55 +03:00
ori agranat
5421bb09f7 added message pack dependency 2019-10-10 22:40:51 +03:00