120 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sagi Frimer	f4bf51ebb2	Fully merged CmerasHandler to SettingManger ... hadn't the time to check, also refractord every use of cameras handler to settings manager, might have missed	2019-05-05 01:07:38 +03:00
Sagi Frimer	7ca1bbde1e	Merged Cameras handler into settings manager	2019-05-05 00:54:45 +03:00
ori	fc5ddfd937	fixed bugs in settings manager	2019-05-04 14:36:03 -07:00
ori	0907c31aad	integration of camera handler into settings manager	2019-05-02 12:42:44 -07:00
ori	ce94cea27b	Merge branch 'master' into dev	2019-05-01 12:10:46 -07:00
ori	6c2a2926af	new branch and error	2019-05-01 10:37:52 -07:00
ori	93a22ffe9f	intagrated setting manager into socket handler and camera handler	2019-05-01 10:16:40 -07:00
ori	82f24882cc	mirrored dic keys in ui from backend	2019-05-01 19:57:03 +03:00
ori	406a9f2021	added lists to the ui and the store	2019-05-01 19:46:22 +03:00
ori	d073f6fcd2	working camera process ... it need more work with integration	2019-04-29 14:15:53 -07:00
ori	6ee31a9d0c	working camera runner	2019-04-29 11:57:18 -07:00
ori	560c619db7	network tables listener and cam values functiuon	2019-04-28 13:30:01 -07:00
Sagi Frimer	17381a37bf	Merge remote-tracking branch 'origin/master'	2019-04-28 23:10:11 +03:00
Sagi Frimer	a37e73bde5	fixed problem	2019-04-28 23:10:02 +03:00
sagi	95429f69c5	seems to work but i have no cameras to check	2019-04-27 14:48:58 -07:00
Sagi Frimer	8db7627730	Merge remote-tracking branch 'origin/master'	2019-04-28 00:12:10 +03:00
Sagi Frimer	b99d6ef3dd	fixed settings manager where no camera is connected ... didn't check yet	2019-04-28 00:12:02 +03:00
ori	1f550f91c6	added selction of threshold and normal images	2019-04-27 12:00:15 -07:00
ori	09685d46eb	updated settings manager and integrated naming with UI	2019-04-26 21:56:40 +03:00
ori	105b85be37	fixed bug in backend	2019-04-26 21:35:35 +03:00
ori	a695884f18	mjepeg images with vuex integeration	2019-04-26 17:12:49 +03:00
ori	2fd075398c	completed system settings page with vuex integration	2019-04-26 00:28:31 +03:00
ori	cbbd34abcf	work on system settings page	2019-04-23 14:42:51 -07:00
ori agranat	d5a0cb00fa	added contour tab and more filters to threshold	2019-04-20 22:49:44 +03:00
ori	71489d1835	Added network tables listener	2019-04-20 09:31:16 -07:00
ori	53716dd2dc	Added shit	2019-04-20 09:02:21 -07:00
Unknown	d599b4fe8c	Merge remote-tracking branch 'origin/master'	2019-04-20 16:53:13 +03:00
Unknown	4df4b3ec72	little changes to camera process	2019-04-20 16:53:06 +03:00
ori	8118bb29a7	finished settings manager and socket handler	2019-04-20 06:53:06 -07:00
Sagi Frimer	cef43d9bcd	little fixes	2019-04-20 12:39:24 +03:00
ori	8226179881	started merge with the dictionary	2019-04-15 12:57:59 -07:00
ori	9e8018ff78	re did the run function and added camera process	2019-04-15 11:53:39 -07:00
ori	867c63379f	basic vision handler class	2019-04-14 13:35:31 -07:00
ori	3fb0820b52	added start cameras method	2019-04-14 11:55:07 -07:00
ori	400de5eb48	FIilter usb devices	2019-04-13 11:57:43 -07:00
Sagi Frimer	cf7de01338	improved singleton	2019-04-10 19:23:40 +03:00
Sagi Frimer	73e044ed89	base implementation of SettingsManager singleton class ... need to load cameras base on the connected cameras instead of all cameras in cams directory	2019-04-09 00:37:26 +03:00
Sagi Frimer	3f265272e5	misc	2019-04-08 21:35:17 +03:00
Sagi Frimer	e47b571145	Fixed the problem when deleting cams folder	2019-04-01 00:26:58 +03:00
Sagi Frimer	f959b4de75	Merge remote-tracking branch 'origin/master'	2019-03-31 23:01:01 +03:00
Sagi Frimer	04db1d570e	Fixed camera change bug	2019-03-31 23:00:55 +03:00
ori agranat	8d627736b7	created recived data handler from server	2019-03-31 22:52:38 +03:00
ori agranat	478a480fce	Auto stash before merge of "master" and "origin/master"	2019-03-31 22:51:43 +03:00
Sagi Frimer	abc63661c9	Settings and Cameras read and save	2019-03-31 22:24:10 +03:00
Sagi Frimer	557f6a109f	Cameras dic ... Added settings folder, and creating dictionary from the cameras and pipelines	2019-03-31 01:27:17 +03:00
ori agranat	3d5a326e0b	Merge remote-tracking branch 'origin/master'	2019-03-29 18:20:48 +03:00
ori agranat	5dfb468831	updates from session	2019-03-29 18:20:40 +03:00
ori agranat	c7b2459c6c	Update README.md	2019-03-29 10:42:14 +00:00
ori agranat	b86af0abea	added vuex to range slider	2019-03-27 23:23:01 +02:00
ori agranat	9a2232974a	vuex realtime value redone	2019-03-27 23:12:15 +02:00