Commit Graph

359 Commits

Author SHA1 Message Date
ori agranat
259753e582 redone grouped contours and fixed ratio slider 2019-10-04 16:46:16 +03:00
Matt
b618b7f897 Refactor member variables and functions to start with lowercase letters 2019-10-02 22:12:52 -07:00
ori agranat
645e3ed360 fix image location and added lazyload 2019-10-02 23:37:35 +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
ori agranat
ed94dc751f finished basic data flow 2019-10-02 22:07:04 +03:00
ori agranat
48d327fddf added pipeline action menu 2019-10-02 00:14:37 +03:00
ori agranat
2d32fa21ce v1.1.0-BETA 2019-10-01 19:57:46 +03:00
ori agranat
532231341f changed args key name 2019-10-01 19:12:29 +03:00
Banks Troutman
2097778461 Temp fix for port setting, add flush to NetworkTables, add --manage-network argument 2019-10-01 03:00:42 -04:00
Banks Troutman
b87d31e465 Added method for arg handling, added NT server mode and NT server host args 2019-10-01 02:19:32 -04:00
Banks Troutman
507592735c Changed all pipeline sets to integer 2019-10-01 02:18:55 -04:00
Banks Troutman
030a089d6b Fix for cscore version 2019-09-30 19:43:42 -04:00
Banks Troutman
74d5b4388f Update to latest cscore build for PS3Eye support 2019-09-30 19:37:47 -04:00
ori agranat
f6ff867070 Merge branch 'pipeline-update' into 'dev'
Pipeline update

See merge request chameleon-vision/Chameleon-Vision!18
2019-09-29 20:47:28 +00:00
ori agranat
4e6bd3e75a bug fixed the sync and bug fixed the pipe change from nt 2019-09-29 08:01:00 -07:00
ori agranat
b13f145ee6 initial pipeline update 2019-09-29 17:39:58 +03:00
ori agranat
1548d3aa14 added default webserver port change from arguments 2019-09-29 15:56:26 +03:00
ori agranat
585cbdae36 Merge branch 'area-slider' into 'dev'
Area slider

See merge request chameleon-vision/Chameleon-Vision!17
2019-09-29 12:40:35 +00:00
ori agranat
55902c45e7 fixed value going under 0 2019-09-28 14:27:50 -07:00
ori agranat
54412657ec Revert "Update MathHandler.java"
This reverts commit eb495284a5.
2019-09-28 14:27:05 -07:00
ori agranat
eb495284a5 Update MathHandler.java 2019-09-28 14:26:11 -07:00
ori agranat
055194f9a7 added sigmoid function 2019-09-29 00:05:20 +03:00
ori agranat
c0d10e7282 full ui finished 2019-09-28 21:42:04 +03:00
ori agranat
70a10a6ce9 added data flow 2019-09-28 18:27:17 +03:00
ori agranat
88419e956f done all inputs and major work on camera views 2019-09-28 02:17:18 +03:00
Banks Troutman
7a49541d45 Fix settings paths for Unix systems 2019-09-26 15:01:51 -04:00
Banks Troutman
d3083cceb1 Version number fix 2019-09-26 14:20:17 -04:00
Banks Troutman
c5de2f8f5e Updated Maven Deps to the new WPILib Artifactory, added AARCH64-Bionic support (Jetson) 2019-09-26 14:19:30 -04:00
Banks Troutman
c46ec3066d Update OpenCV to new WPI Maven Repo
Adds support for Linux AARCH64
2019-09-26 01:52:20 -04:00
ori agranat
e665a8c9e6 1.0.2 beta 2019-09-25 21:59:37 +03:00
ori agranat
267d06f577 removed log scale for area 2019-09-25 11:58:18 -07:00
Banks Troutman
4ddc8e2b08 Merge remote-tracking branch 'origin/dev' into dev 2019-09-25 14:41:40 -04:00
Banks Troutman
b913ea7595 More area slider tweaking 2019-09-25 14:41:24 -04:00
ori agranat
69bb4bc562 bug fix in calibration 2019-09-25 11:08:59 -07:00
ori agranat
42db3c12b5 fixed extent and area 2019-09-25 10:57:29 -07:00
Banks Troutman
abeda8e531 Merge branch 'dev' of https://gitlab.com/chameleon-vision/Chameleon-Vision into dev
# Conflicts:
#	Main/src/main/java/com/chameleonvision/Main.java
2019-09-25 13:37:17 -04:00
Banks Troutman
2d76152dda Merge branch 'Java' into dev 2019-09-25 13:35:17 -04:00
ori agranat
4b760a9e8a Merge branch 'master' into 'dev'
Master

See merge request chameleon-vision/Chameleon-Vision!15
2019-09-25 17:34:33 +00:00
Banks Troutman
d4842154a3 Area slider adjustments, add NT for local testing 2019-09-25 13:32:24 -04:00
ori agranat
f611b857a4 bug fixes and added nt pipline change 2019-09-25 10:32:22 -07:00
ori agranat
3af2f3c686 added more pipeline creation for new cam 2019-09-25 10:10:11 -07:00
ori agranat
9bf1bc40c1 Merge branch 'master' of gitlab.com:chameleon-vision/Chameleon-Vision 2019-09-25 20:04:43 +03:00
ori agranat
2cec2d83ae changed version number 2019-09-25 20:04:03 +03:00
ori agranat
7113e5147d changed version number 2019-09-25 20:03:41 +03:00
ori agranat
7f529de40c Merge branch 'readme' into 'master'
Update README.md with software installation instructions

See merge request chameleon-vision/Chameleon-Vision!14
2019-09-25 14:52:19 +00:00
Banks Troutman
5eec368f79 Update README.md with software installation instructions 2019-09-25 14:49:46 +00:00
ori agranat
088c32f573 Update README.md 2019-09-24 19:14:52 +00:00
ori agranat
94c3b2db88 Merge branch 'dev' into 'master'
initial version testing

See merge request chameleon-vision/Chameleon-Vision!13
2019-09-24 17:00:17 +00:00
ori agranat
0541865b64 Merge branch 'Java' into 'dev'
java translation complete

See merge request chameleon-vision/Chameleon-Vision!12
2019-09-24 16:52:35 +00:00
ori agranat
e8dc3ed3ac cleanup old code 2019-09-24 19:50:49 +03:00