21 Commits

Author	SHA1	Message	Date
Omer	6cc0c65a7a	ignore auto created iml file	2019-12-07 00:26:02 +02:00
Matt	115bd72a96	Update .gitignore	2019-12-01 12:19:11 -08:00
Banks Troutman	386d195d2d	Move Java backend to properly named folder	2019-12-01 01:44:19 -05:00
Banks Troutman	a363e3568b	Replace StringBuilder with String in CVPipeline2d	2019-11-30 22:38:05 -05: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
Matt	0ce00ebdd4	send more settings to the UI	2019-11-24 20:46:25 -08:00
ori agranat	faa59c4157	bugfixed file	2019-11-18 22:00:51 +02:00
Banks Troutman	2ddddd2955	Update pom.xml to build uberjar	2019-09-21 19:50:18 -04: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
Banks Troutman	25652ba32e	Adjusted folder structure to sit under com.chameleonvision package	2019-09-15 15:03:44 -04:00
ori agranat	aa45f9ece2	added jni libs to pom and stated work on camera info	2019-09-13 02:45:11 +03:00
ori agranat	e72bb51308	initial project setup and updated git ignore	2019-09-10 23:47:06 +03:00
ori	8e2d0fdbd5	updated git ignore	2019-08-16 12:58:50 -07:00
ori agranat	bfb42f31fb	updated git ignore	2019-08-15 08:08:03 +03:00
Sagi Frimer	5637948521	update git ignore	2019-07-03 20:50:34 +03:00
ori agranat	05305393a9	web socket using tornado	2019-03-01 21:59:49 +02:00
ori agranat	366466260c	fixed git ignore	2019-03-01 20:18:50 +02:00
ori agranat	ad217909b4	update colors on site	2019-03-01 20:17:53 +02:00
Sagi Frimer	28f9d9eb10	Merge remote-tracking branch 'origin/master'	2019-03-01 18:45:47 +02:00
Sagi Frimer	403544d7f0	gitigonre	2019-03-01 18:44:29 +02:00
ori agranat	d6f84141f3	updated server file	2019-03-01 18:44:08 +02:00