v3.0.t14
-didn't properly remove use of evhist from the last commit. it is truely removed now. -added delay cycles to detectLoop is motion was detected to prevent some event overlap.
This commit is contained in:
parent
4b4c2649b8
commit
baf0b86610
|
@ -256,11 +256,6 @@ bool Upkeep::exec()
|
|||
enforceMaxImages();
|
||||
enforceMaxVids();
|
||||
|
||||
if (shared->evtHist.size() >= MAX_EVTHIST)
|
||||
{
|
||||
shared->evtHist.clear();
|
||||
}
|
||||
|
||||
genHTMLul(".", shared->camName, shared);
|
||||
|
||||
genCSS(shared);
|
||||
|
@ -298,14 +293,6 @@ bool EventLoop::exec()
|
|||
vidList.removeLast();
|
||||
vidList.append(forwardFacingFiles("live", ".ts", event.timeStamp, maxFiles / 2));
|
||||
|
||||
for (auto &&hist : shared->evtHist)
|
||||
{
|
||||
if (vidList.contains(hist))
|
||||
{
|
||||
vidList.removeAll(hist);
|
||||
}
|
||||
}
|
||||
|
||||
shared->recList.removeFirst();
|
||||
}
|
||||
|
||||
|
@ -498,6 +485,8 @@ bool DetectLoop::exec()
|
|||
event.score = score;
|
||||
event.imgPath = images[pos];
|
||||
|
||||
delayCycles = (shared->evMaxSecs / 2) - 1;
|
||||
|
||||
shared->recList.append(event); mod = true;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -117,7 +117,7 @@ class DetectLoop : public Loop
|
|||
private:
|
||||
|
||||
QTimer *pcTimer;
|
||||
int delayCycles;
|
||||
uint delayCycles;
|
||||
bool mod;
|
||||
|
||||
void resetTimers();
|
||||
|
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
using namespace std;
|
||||
|
||||
#define APP_VER "3.0.t13"
|
||||
#define APP_VER "3.0.t14"
|
||||
#define APP_NAME "Motion Watch"
|
||||
#define APP_BIN "mow"
|
||||
#define REC_LOG_NAME "rec_log_lines.html"
|
||||
|
@ -38,7 +38,6 @@ using namespace std;
|
|||
#define STRFTIME_FMT "%Y%m%d%H%M%S"
|
||||
#define MAX_IMAGES 1000
|
||||
#define MAX_VIDEOS 1000
|
||||
#define MAX_EVTHIST 100
|
||||
|
||||
struct evt_t
|
||||
{
|
||||
|
@ -50,7 +49,6 @@ struct evt_t
|
|||
struct shared_t
|
||||
{
|
||||
QList<evt_t> recList;
|
||||
QStringList evtHist;
|
||||
QString conf;
|
||||
QString recLog;
|
||||
QString detLog;
|
||||
|
|
Loading…
Reference in New Issue
Block a user