Isaac Connor
|
61bffdb249
|
fix compiler warning
|
2020-12-27 11:57:23 -05:00 |
|
Isaac Connor
|
5624a0bef4
|
NULL->nullptr
|
2020-12-27 11:56:59 -05:00 |
|
Isaac Connor
|
d6bbc9bbbb
|
Set codec_type in ffmpeg_camera instead of in monitor
|
2020-12-27 11:56:44 -05:00 |
|
Isaac Connor
|
0521d05295
|
Can only output jpegs if we are doing decoding.
|
2020-12-27 11:55:53 -05:00 |
|
Isaac Connor
|
9b916a15a2
|
Only get ref image if we are doing motion detection.
|
2020-12-27 11:55:14 -05:00 |
Isaac Connor
|
a362f2abc2
|
Merge pull request #3102 from connortechnology/fix_3101
fix api monitor save daemon control
|
2020-12-25 13:29:01 -05:00 |
Andrew Bauer
|
2adeedf418
|
additional mootools cleanup in event.js
|
2020-12-25 07:19:41 -06:00 |
|
Andrew Bauer
|
9209f40daa
|
eslint
|
2020-12-24 14:59:27 -06:00 |
|
Andrew Bauer
|
5fa8cbf158
|
add Frames button to event view
|
2020-12-24 14:46:13 -06:00 |
|
Andrew Bauer
|
3fd50bb01d
|
reorganize logger.js and use jquery
|
2020-12-24 14:32:23 -06:00 |
|
Andrew Bauer
|
e66b050c72
|
WIP jquery conversion of event view
|
2020-12-24 10:38:44 -06:00 |
|
Isaac Connor
|
ddf66bc9b5
|
Merge pull request #3100 from vertigeaux/share_frame_scores
save frame scores to SharedData for use with linked monitors
|
2020-12-24 11:08:25 -05:00 |
|
Andrew Bauer
|
b093e99688
|
disable click to select on the events table Cause column
|
2020-12-24 07:10:47 -06:00 |
|
Isaac Connor
|
48d9b4d5a5
|
Remove unused variables
|
2020-12-23 18:50:52 -05:00 |
|
Isaac Connor
|
f934a6bbaf
|
spacing and change last_fps_time and last_analysis_time to doubles
|
2020-12-23 18:50:38 -05:00 |
|
Isaac Connor
|
1ffc233593
|
Move some initialisation into MOnitor() initialisation. Update UpdateAnalysisFPS to use more doubles instead of integers to get better numbers. Move capture FPS updating to UpdateCaptureFPS and use doubles there too. remove some dead code and add some debugging
|
2020-12-23 18:50:07 -05:00 |
|
Isaac Connor
|
3893e97e94
|
Quieten compiler warnings
|
2020-12-23 18:18:30 -05:00 |
|
Isaac Connor
|
ee8f940acf
|
Add some debug
|
2020-12-23 18:18:16 -05:00 |
|
Isaac Connor
|
3132820a71
|
Move daemonControl logic into the model. daemonControl needs to be called on the previous monitor data so that it knows which daemons to stop.
|
2020-12-23 13:48:12 -05:00 |
|
Andrew Bauer
|
816c306518
|
use jquery for submitTab
|
2020-12-23 12:29:39 -06:00 |
|
Andrew Bauer
|
a94550795b
|
update setButtonState
|
2020-12-23 12:20:31 -06:00 |
|
Andrew Bauer
|
f64f3262ed
|
WIP replace mootools in evnet.js
|
2020-12-23 12:19:35 -06:00 |
|
Andrew Bauer
|
f857d12103
|
WIP replace mootools in event.js
|
2020-12-23 10:51:23 -06:00 |
|
Andrew Bauer
|
493bfa6a16
|
eslint
|
2020-12-23 09:15:31 -06:00 |
|
Andrew Bauer
|
3c79204592
|
replace mootools in add_monitors
|
2020-12-23 08:54:11 -06:00 |
|
Isaac Connor
|
286a5a72a3
|
Merge branch 'master' into zma_to_thread
|
2020-12-23 09:47:31 -05:00 |
|
Andrew Bauer
|
c91a0b2c09
|
fixup jquery click functions
|
2020-12-23 08:37:28 -06:00 |
|
Isaac Connor
|
fb2793d337
|
use nullptr instead of 0 when init'ing event
|
2020-12-23 09:11:33 -05:00 |
|
Andrew Bauer
|
c497b94378
|
use tlzoom class to avoid conflict with thumbnail zoom
|
2020-12-23 07:57:44 -06:00 |
|
Andrew Bauer
|
a9b92905ca
|
eslint
|
2020-12-22 19:07:12 -06:00 |
|
Isaac Connor
|
a1917d83d0
|
Merge branch 'master' into zma_to_thread
|
2020-12-22 19:52:09 -05:00 |
Vertigeaux
|
1416cbb03c
|
save frame scores to SharedData for use with linked monitors
|
2020-12-22 17:44:53 -06:00 |
|
Andrew Bauer
|
cc5a732103
|
continue work on timeline.js
|
2020-12-22 16:06:21 -06:00 |
|
Isaac Connor
|
6be9b294ef
|
Hidden and hidden are two very different classes
|
2020-12-22 17:00:07 -05:00 |
|
Isaac Connor
|
d6486d1a7e
|
use nullptr instead of 0 when init'ing event
|
2020-12-22 15:44:07 -05:00 |
|
Andrew Bauer
|
8a26252914
|
update object detected link in events
|
2020-12-22 12:42:27 -06:00 |
|
Andrew Bauer
|
9af383db92
|
set the width style for the objdetect modal
|
2020-12-22 12:30:44 -06:00 |
|
Andrew Bauer
|
2ea4b39d93
|
don't use quotes around the event id
|
2020-12-22 11:46:31 -06:00 |
|
Andrew Bauer
|
ee45916526
|
move objdetect image to a modal
|
2020-12-22 10:08:31 -06:00 |
|
Isaac Connor
|
a231125fb3
|
Replace Download with a direct link to the mp4 like it used to be. Add back a Frames link
|
2020-12-22 10:23:44 -05:00 |
|
Isaac Connor
|
400e0de609
|
When updating Monitor_Status, reset FPS on Prime
|
2020-12-22 10:22:52 -05:00 |
|
Isaac Connor
|
4bea286cfe
|
Use new get_event_start_packet_it function to start the new event with the right packet.
|
2020-12-22 10:22:28 -05:00 |
|
Isaac Connor
|
91057b9546
|
Clean up video_packet_count stuff. use packet_counts instead. Use more efficient logic for managing the # of video packets on the queue. Rewrite clearQueue to not use reverse iterators. Implement get_starting_packet to return an iterator to the packet that SHOULD start an event. So it takes into account pre_event_count and keyframe rules.
|
2020-12-22 10:20:44 -05:00 |
|
Isaac Connor
|
d89cbebbdf
|
AddPacket should just take a packet. score and alarm_image are members of the packet
|
2020-12-22 10:18:15 -05:00 |
|
Andrew Bauer
|
cbe04674c5
|
remove non-existent id preview
|
2020-12-21 15:59:05 -06:00 |
|
Andrew Bauer
|
d080109f4b
|
eslint
|
2020-12-21 15:20:38 -06:00 |
|
Andrew Bauer
|
663748d9a7
|
partial replace mootools
|
2020-12-21 13:07:14 -06:00 |
|
Isaac Connor
|
c9ac5dff62
|
Use parent printMsg
|
2020-12-21 12:17:02 -05:00 |
|
Andrew Bauer
|
1f3fd93296
|
use setTimeout instead of mootools pass
|
2020-12-20 15:21:38 -06:00 |
|
Andrew Bauer
|
92361210ce
|
eslint
|
2020-12-20 15:07:16 -06:00 |