Commit Graph

147 Commits

Author SHA1 Message Date
ori agranat
7aa17e83b7 re did pipeline duplication 2020-01-02 20:45:54 +02:00
ori agranat
27a338e1d1 bug fix in index parsing 2020-01-01 12:18:35 -08:00
ori agranat
207249ca19 WIP: 3D res filter 2020-01-01 22:06:09 +02:00
Unknown
5f8f7ca555 updated pom for release, 3d calibration change, cosmetic changes 2020-01-01 15:46:05 +02:00
Matt
9559bb360e standardize on calibration in inches and add square size as a divisor
This should do the same thing as calibrating in the correct units but it doesnt like meeeeee
2019-12-31 16:38:52 -08:00
Matt
1decd2c3d7 Add solvePNP, 3d tab on the UI, and some other misc bug fixes (#35)
* Rebase solvePNP on master

* added 3D tab minimap and csv reader

* More solvePNP

* Create draw pipe for pnp data

* SolvePNP piping work

* Move sorting into solvepnppipe

* Create calibration pipeline

* Update CalibrateSolvePNPPipeline.java

* add camera tilt angle

* Add calibration slider and snapshot button to 3D view

* Mirror updates in the socket handler

* add 3d calibration mode to the pipeline manager

* created calibration functions in ui and backend

* Start plumbing calibration

* Add snapshot and other handling to the RequestHandler

* added select resolution before starting calibration

* Rename solvePNPPipe to bounding box solve pnp pipe

* Update BoundingBoxSolvePNPPipe.java

* Add Mat serializer and CameraCalibrationConfig

* Begun calibration saving, fixed UI/Backend snapshot count mismatch

* Add (unplumbed) option to set checkerboard size

This will allow users to change the units their calibration is in

* Create chessboard.png

* Fix calibration NPE

* changed string serialization to a json send

* bug fixed cancellation button

* Fix spelling of snapshot in 3d.vue

* Plumb resolution change

* Set resolution during config, start on config serialization

* Update .gitignore

* Config fixes

* Start transition away from cvpipeline3d

* fix NPE on uncalibrated cameras

* clear list on fail

* Fix video mode index error

* ignore getters in camera calibration config

* Create json constructor for jsonmat

* get solvePNP mostly returning sane values

* Fix solvePNP bug and add unit test

* FIx calibration mat truncation

* added capture amount model upload and minimap data

* Standardize on meters in calibration and bounding box

* fix json out of bounds and handle null calibration more gracefully

* don't put text on calibrate image, go back to inches

* convert distance to meters

this means calibration will need to be in inches

* Actually save raw contor

* Update GroupContoursPipe.java

* Add all calibration return to camera capture

* hard code 2019 target

* bugfixed draw2d added fail calib popup, merge end and cancel

added the res index to the calib start

* Clarify error message and draw more fancy rectangles

* Cleanup memory in solvepnp

* re did minimap component

* fix npe if left/right is null

* remove references to 2d

* try-catch running the current pipeline

* Add method to find corners using the harris corner detector

* Possibly fix left/right missmatch

* Fix 3D Tab error

* FIx file permissions, mat serializer adjustments

* fixed mini map for field coordinates

* mini map changes fov

* Update SolvePNPPipe.java

* get rid of target corners

* some memory leak fixes

* fixed mini map location

* added position under minimap

* changed player fov look

* put all targets in the web send

* re did target send to ui added target tables, bugfix calibration

* fixed y position

* Add tilt angle to capture properties

* maybe fix y axis in minimap

* Add square size to onCalibrationEnding

* Possibly add square size to UI

* fix NPE with pitch

* Fix bug with sending multiple targets

* Only instantiate 3d stuff if we are in 3d mode

* Fix array list exceptions

* Fix bug in sort contors

list was truncated too early

* added download chess, tilt setting and ordinal tilt,

* added square size connection

* removed unused code

* Update pom version to 2.1-RELEASE

* Send camera calibrations to UI

* Stream pose list to a LIst

* Only stream necessary parts of the aux list entry

* Make broadcastMessage synchronized to prevent ConcurrentModificationExceptions

* added fps counter changed squaresize steps bug fixes in tables

* bugfix camera settings cam wont change

Authored-by: oriagranat9 <oriagranat9@gmail.com>
2019-12-31 14:53:20 +02:00
ori agranat
0fe8b6cb2b adde ( ) - and . to regex 2019-12-10 19:35:48 +02:00
OmerZ7
92ccd5aed1 Merge pull request #30 from Chameleon-Vision/pipeline-popup
Pipeline popup for renaming and creating
2019-12-10 15:33:31 +02:00
ori agranat
7233fff173 added regex test for camera name and pipe name 2019-12-09 22:55:29 +02:00
Omer
9755c4193a Round steam divisor resolution 2019-12-09 22:37:11 +02:00
ori agranat
d5d6171547 added pipeline popup 2019-12-09 22:34:35 +02:00
Omer
192e8834f0 Spelling + button style change 2019-12-09 02:09:43 +02:00
Omer
37fa1383a3 Merge branch 'dev' of https://github.com/Chameleon-Vision/chameleon-vision into dev 2019-12-08 22:10:22 +02:00
Omer
1f2eac5911 Enum fix for the UI 2019-12-08 22:09:17 +02:00
ori agranat
4213e28da4 cleaned up single point calibration and bug fixed isBinary in driverMode 2019-12-07 17:11:22 +02:00
Omer
9db06f690b fixed rotated camera too heigh for UI and corrected scalling 2019-12-06 00:54:04 +02:00
Omer
a88e09d4c3 Revert "fixed roated camera too heigh for the UI"
This reverts commit 50c8ecd345.
2019-12-06 00:41:29 +02:00
Omer
50c8ecd345 fixed roated camera too heigh for the UI 2019-12-06 00:21:05 +02:00
Omer
2040620270 fixed problem with clear points in single point calibration 2019-12-05 23:01:27 +02:00
Omer
d18954f549 Proper no target found fix, and snackbar error now showing 2019-12-05 15:38:30 +02:00
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
OmerZ7
a031f8431a Updated UI readme
added nodejs installation and explanation
2019-12-02 01:52:35 +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