Commit Graph

144 Commits

Author SHA1 Message Date
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
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
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
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
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
Omer
5f879f9d98 Added enums, msgpack - new ui intergration 2019-10-12 03:38:42 +03:00
Omer
2eb4cbc950 very early msgpack handler 2019-10-11 02:25:25 +03:00
Banks Troutman
d56a27c017 Cleanups, fixed isValid glitch 2019-10-10 15:07:56 -04:00