Commit graph

81 commits

Author SHA1 Message Date
BroodjeAap
0a2f7ddc61 added js file missing from previous commit 2020-07-26 20:47:22 +00:00
BroodjeAap
63aae590d5 added inputs for interval/motion interval on the addStream page 2020-07-25 13:19:17 +00:00
BroodjeAap
f8b13dc3ef added 'MotionInterval' that is used instead of 'Interval' when motion is detected on a Stream 2020-07-25 12:39:19 +00:00
BroodjeAap
3e2e9a8182 removed some commented out code 2020-07-25 12:16:33 +00:00
BroodjeAap
b0a900f36f added exponential sleep time if there is a timeout for a stream 2020-07-25 12:08:52 +00:00
BroodjeAap
ddf6ffb4c8 removed most 'Fatal' usage, so that things keep going when something goes wrong 2020-07-25 11:24:33 +00:00
BroodjeAap
fd287d7ab8 removed filelock from json 2020-07-25 11:18:58 +00:00
BroodjeAap
27d0297c80 moved loading Streams from json to a function 2020-07-25 11:16:40 +00:00
BroodjeAap
3579788727 Switching to map[string]*Stream and making all Stream methods (s * Stream) worked 2020-07-14 19:57:11 +00:00
BroodjeAap
f9a6c37350 mostly working addWatchArea system, somehow wont actually add the watcharea to the WatchAreas list in a Strea, goroutine problem? 2020-07-12 19:54:05 +00:00
BroodjeAap
a88837f90f watcharea rows match color of watcharea 2020-07-12 18:48:27 +00:00
BroodjeAap
a6864c1928 added existing watchareas to canvas 2020-07-12 18:43:59 +00:00
BroodjeAap
7206c087d5 renamed 'rectangles' class and variables to WatchArea 2020-07-12 18:32:19 +00:00
BroodjeAap
b159278efe switched a Rectangle class in javascript 2020-07-12 18:27:59 +00:00
BroodjeAap
d4d0ba593d frontend of watchareas mostly done 2020-07-12 18:17:46 +00:00
BroodjeAap
cef301d7f4 added 'head' section to add_stream.html 2020-07-12 17:04:44 +00:00
BroodjeAap
e774c1d21d refactored a bunch of http endpoints to static file access (previous/debug/next etc) 2020-07-12 15:11:50 +00:00
BroodjeAap
9707f46259 added 'head' tag to base.html, moved stream.js import there for stream.html 2020-07-12 14:44:58 +00:00
BroodjeAap
1a4f3e8227 refactored to single area per WatchArea 2020-07-12 14:43:32 +00:00
BroodjeAap
eb11a50d08 display watches on stream page 2020-07-12 14:07:22 +00:00
BroodjeAap
91f042e1bb can draw rects on the canvas 2020-07-12 13:53:23 +00:00
BroodjeAap
8a8285240a currentColor stream display is now in a canvas 2020-07-12 13:38:04 +00:00
BroodjeAap
664fe5c22d updated to name based ID for streams instead of url 2020-07-12 12:33:14 +00:00
BroodjeAap
5d99649696 added 'addStream' page 2020-07-12 12:04:44 +00:00
BroodjeAap
97bbceea8a got watch areas working with current frames being copied to directories 2020-07-11 20:07:33 +00:00
BroodjeAap
f4099dc4f5 moved areas to a seperate Watch struct 2020-07-11 15:30:38 +00:00
BroodjeAap
1582a4714d UpdateInterval called instead of Update on first stream run 2020-07-11 14:46:06 +00:00
BroodjeAap
30d693d0fe added motion detection in areas, move to Area structs probably 2020-07-11 14:38:17 +00:00
broodjeaap
308b966119 debug IMReadColor 2020-07-11 16:06:44 +02:00
BroodjeAap
f71fb6a14a added a map of area name -> area list to Stream 2020-07-11 13:15:00 +00:00
BroodjeAap
409556604e fixed a bug in first start where CurrentColor was IMRead when it didn't exist yet 2020-07-11 12:59:47 +00:00
BroodjeAap
35d1a75eda got a area display working with overlapping contours highlighted 2020-07-11 12:53:20 +00:00
BroodjeAap
c383046fa2 rearranged stream page layout 2020-07-11 11:32:30 +00:00
BroodjeAap
0d7faa4397 added debug endpoint that gets a debug.jpg 2020-07-11 11:27:53 +00:00
BroodjeAap
dd86398394 removed instant update stuff from stream 2020-07-11 11:15:07 +00:00
BroodjeAap
280b3327bf grey scale is now properly saved to disk as current 2020-07-11 11:06:08 +00:00
BroodjeAap
a0ae04c494 updated Update() doc 2020-07-09 19:59:39 +00:00
BroodjeAap
0583189645 added http endpoints for previous/current/currentColor from disk 2020-07-09 19:57:30 +00:00
BroodjeAap
79273b2c0d added base html template 2020-07-09 19:55:42 +00:00
BroodjeAap
df08e944b9 added global vars for templates 2020-07-09 19:13:28 +00:00
BroodjeAap
69d30587cb added mutex to SaveStreamInstant to prevent weirdness 2020-07-09 19:03:38 +00:00
BroodjeAap
8f4d46bc3f Update now gets a new instant (not with GetStreamInstant) and uses SaveStreamInstant to save 2020-07-09 19:01:49 +00:00
BroodjeAap
4a196a21b2 GetStreamInstant returns a Mat now 2020-07-09 18:42:58 +00:00
BroodjeAap
eb8b0d4d61 removed URL parameter from GetStreamInstant 2020-07-09 18:24:17 +00:00
BroodjeAap
40fafe91e5 update ticks are started at startup and when a new stream is added 2020-07-07 20:14:25 +00:00
BroodjeAap
863d9e3577 have a server struct with a map of streams that update based on their interval 2020-07-07 20:05:45 +00:00
BroodjeAap
94c248ba7a moved GetStreamDir to util 2020-07-07 19:37:39 +00:00
BroodjeAap
79c7e03620 more cleanup 2020-07-07 19:04:12 +00:00
BroodjeAap
93f416403e more stuff to Stream 2020-07-07 18:38:20 +00:00
BroodjeAap
b8ea9750bf fixed naming of 'last' to 'next' 2020-07-07 18:23:55 +00:00