updated settings manager and integrated naming with UI

This commit is contained in:
ori
2019-04-26 21:56:40 +03:00
parent 105b85be37
commit 09685d46eb
3 changed files with 16 additions and 5 deletions

View File

@@ -8,9 +8,9 @@ from app.handlers.VisionHandler import VisionHandler
if __name__ == "__main__":
mng = SettingsManager()
a = CamerasHandler.get_cameras_info()
b = CamerasHandler.get_or_start_cameras(a)
VisionHandler().run()
# a = CamerasHandler.get_cameras_info()
# b = CamerasHandler.get_or_start_cameras(a)
# VisionHandler().run()
tornado.options.parse_command_line()
app = ChameleonApplication()

View File

@@ -13,12 +13,23 @@ class SettingsManager(metaclass=Singleton):
default_pipeline = {
"exposure": 50,
"brightness": 50,
"orientation": "Normal",
"resolution": [320, 160],
"hue": [0, 100],
"saturation": [0, 100],
"value": [0, 100]
"value": [0, 100],
"erode": False,
"dilate": False,
"area": [0, 100],
"ratio": [0, 20],
"extent": [0, 100]
}
default_general_settings = {
"team_number": 1577,
"connection_type": "DHCP",
"ip": "",
"gateway": "",
"hostname": "Chameleon-Vision",
"curr_camera": "",
"curr_pipeline": ""
}

View File

@@ -70,7 +70,7 @@
methods: {
socketSendAll: function(){
this.$socket.sendObj([
{'teamValue':this.teamNum},
{'team_number':this.teamNum},
{'connectionType':this.connectionType},
{'ip':this.ip},
{'gateWay':this.gateWay},