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
dc2b738190
finished integration between new client and backend
...
commands needs to be implemented
2019-10-16 14:13:12 +03:00
ori agranat
cd94c9f8c0
changed general settings naming and added general settings save in ui
2019-10-15 21:00:18 +03:00
Banks Troutman
d56a27c017
Cleanups, fixed isValid glitch
2019-10-10 15:07:56 -04:00
Banks Troutman
34c88cb9a4
Fix for Pi OS detection
2019-10-07 16:36:53 -04:00
Banks Troutman
47307e1fbd
Networking bugfixes, added PixelFormat to resolution selection
2019-10-06 21:49:17 -04:00
Banks Troutman
3db2f30ea7
Continued rework of networking, added root check
2019-10-06 17:26:17 -04:00
Banks Troutman
7699766091
Begin network rewrite
2019-10-04 15:55:45 -04: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
7a49541d45
Fix settings paths for Unix systems
2019-09-26 15:01:51 -04:00
Banks Troutman
8dbf5b3a73
Potential fix for multi-camera on Windows
2019-09-24 10:35:14 -04:00
Omer
0d9b987b19
Removed windows support for networksettings
2019-09-24 03:31:56 +03:00
Omer
012c4f44de
added some windows commands
2019-09-22 04:01:01 +03:00
Banks Troutman
038e84ce0d
Various cleanup, slowed down UI FPS counter
2019-09-21 13:05:00 -04:00
ori agranat
305bd65e43
Merge remote-tracking branch 'origin/Java' into Java
2019-09-21 18:52:36 +03:00
ori agranat
d97f3c1e1a
added port handling and pipline change sync wth ui
...
- added port hash map
- putting port into hashmap from camera class
- added sending port from full settings and camera change
- nt pipe change now sends pipe name to ui
2019-09-21 18:52:28 +03:00
Omer
8a451f74ab
Network settings for linux
2019-09-21 18:39:31 +03:00
Omer
5aa829a134
Revert "Revert "Added network settings handler for linux""
...
This reverts commit d94ac908ec
2019-09-21 18:38:08 +03:00
Omer
d94ac908ec
Revert "Added network settings handler for linux"
...
This reverts commit a327abc4c2
2019-09-21 18:33:00 +03:00
Omer
a327abc4c2
Added network settings handler for linux
2019-09-21 18:31:29 +03:00
Banks Troutman
096e214a8e
Make SettingsManager completely static
2019-09-20 19:54:59 -04:00
Banks Troutman
012aa9559a
Moved CvSink/CvSource to Camera class
2019-09-20 02:17:22 -04:00
Banks Troutman
508ccff766
Full rewrite of camera system
2019-09-19 14:07:42 -04:00
Unknown
5b75c85c0f
removed unnecessary save of cameras current pipline
2019-09-18 10:36:29 +03:00
Omer
7fdab7d3db
Merge branch 'Java' of https://gitlab.com/chameleon-vision/Chameleon-Vision into Java
2019-09-18 03:06:10 +03:00
Omer
5fd3dc8f6c
Added saving for selected pipeline
2019-09-18 03:04:48 +03:00
ori agranat
45916b3e11
removed setCameraSettings function
2019-09-18 00:16:56 +03:00
ori
2e5c2bcddb
bug fix for creating a new cam
2019-09-17 13:44:42 -07:00
Banks Troutman
6187b1a205
Added SortMode rect filtering, Added exposure/brightness websocket adjustment
2019-09-17 02:12:53 -04:00
Omer
8374b9af7b
camera and pipeline changes synced
2019-09-16 18:50:00 +03:00
Omer
00552c751a
Websockets almost done TODO ports, testing
2019-09-16 04:10:26 +03:00
Banks Troutman
25652ba32e
Adjusted folder structure to sit under com.chameleonvision package
2019-09-15 15:03:44 -04:00
