Commit Graph

119 Commits

Author SHA1 Message Date
ori agranat
8efd0a2b49 bug fix for color picker 2019-12-03 19:52:31 +02:00
ori agranat
9adde234b8 Merge branch 'ColorPick' into dev 2019-12-03 19:19:44 +02:00
Omer
8a7a234ede Reveted changes to range slider 2019-12-03 01:09:54 +02:00
Omer
c30b760a6e bugfix for current tab merge 2019-12-03 00:58:12 +02:00
Omer
b56b3a7918 cleanup and commenting 2019-12-03 00:57:21 +02:00
Unknown
5e96491953 bugfix for correct tab 2019-12-03 00:54:23 +02:00
ori agranat
b4e4f7b57c finished color picker in the ui 2019-12-03 00:28:36 +02:00
ori agranat
1858df993d bug for point data and bug fix for group contours 2019-12-01 22:06:06 +02:00
Unknown
8fffafa81c removed pipeline menu when in drivemode fixed driver mode in duplication 2019-12-01 10:32:09 +02:00
ori agranat
e8083794bd bug fix in video mode name 2019-11-30 22:03:28 +02:00
ori agranat
806c8d6968 web socket speed improvement and input values bugfix 2019-11-30 10:39:53 -08:00
ori agranat
5fe728751d moved res and divisor into pipeline in ui
-- added handling of divisor and res in socket handler 
-- moved pipeline to be index -1 in ui
-- removed driver mode object
2019-11-30 19:24:03 +02:00
Matt
bea80cb700 Fix noSuchFieldException on calibration 2019-11-29 20:38:31 -08:00
Banks Troutman
5b2af86f87 More UI fixes, add videomode and StreamDivisor to config 2019-11-29 14:24:34 -05:00
ori agranat
3ff1f56bd5 added show multiple switch in ui and back end 2019-11-29 16:50:16 +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
ori agranat
ab9cf217aa bugfix in 2d pipeline and added area in ui 2019-11-28 01:38:45 +02: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
Omer
92aed5696f Reverted changes of colorpicker.vue 2019-11-27 22:04:45 +02:00
Omer
2c4649a3be Major changes to threshold tab 2019-11-27 22:02:45 +02:00
ori agranat
e195cce026 bug fixes in ui and bug fixes in sever handler
-- updated pom
2019-11-27 21:46:07 +02:00
Omer
7caafb8bdf Major changes to colorpicker page 2019-11-26 18:24:45 +02:00
Omer
4392ece689 removed warning 2019-11-26 18:24:18 +02:00
Omer
fc0c83b323 Added another window from the press of the button 2019-11-25 02:00:05 +02:00
Omer
b0135d12e8 RangeSlider able to be disabled 2019-11-25 01:31:29 +02:00
Omer
8e28ac8339 Toggle mode 2019-11-25 01:08:08 +02:00
ori agranat
a0d180d538 added connection url by development or production 2019-11-13 20:54:06 +02:00
ori agranat
ee618f6d86 added ui save message on settings save 2019-11-09 21:26:02 +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
ori agranat
4bbc6457a1 changed store key to match java code 2019-11-01 17:13:59 +02:00
ori agranat
51a3f677bd added driver mode tab to settings in the ui 2019-11-01 17:10:48 +02:00
Omer
972df541e9 Rename "Closest" to "Centermost", rebuild for the ui needed 2019-10-30 14:35:30 +02:00
ori agranat
1e02f114e1 added auto save and save button 2019-10-29 23:58:06 +02:00
ori agranat
8fc78aea2b moved components to the right folder 2019-10-29 20:54:21 +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
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
0ce7d7465c bugfix for Settings where page moved down and url is lowercase 2019-10-24 21:27:49 +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
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
e6998cc1dd Merge branch 'NewUI' into 'dev'
New ui

See merge request chameleon-vision/Chameleon-Vision!20
2019-10-02 19:32:21 +00:00