ShinobiSystems
/
Shinobi
mirror of https://gitlab.com/Shinobi-Systems/Shinobi.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

minor bug fixes

merge-requests/19/head
Moe 2018-08-08 19:59:32 -07:00
parent 3639b7b622
commit b9e57f9364
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
camera.js
View File

@ -2452,7 +2452,6 @@ s.event = function(x,e,cn){
var param = toCheck[condition.p1] var param = toCheck[condition.p1]
var pass = function(){ var pass = function(){
if(matrixPosition && dFilter.actions.halt === '1'){ if(matrixPosition && dFilter.actions.halt === '1'){
console.log(d.details.matrices[matrixPosition])
delete(d.details.matrices[matrixPosition]) delete(d.details.matrices[matrixPosition])
}else{ }else{
conditionChain[place].ok = true conditionChain[place].ok = true
@ -2502,8 +2501,6 @@ s.event = function(x,e,cn){
validationString += condition.next+' ' validationString += condition.next+' '
} }
}) })
console.log(validationString)
console.log(eval(validationString))
if(eval(validationString)){ if(eval(validationString)){
if(dFilter.actions.halt !== '1'){ if(dFilter.actions.halt !== '1'){
delete(dFilter.actions.halt) delete(dFilter.actions.halt)
@ -2516,11 +2513,13 @@ s.event = function(x,e,cn){
} }
} }
}) })
var reviewedMatrix = [] if(d.details.matrices && d.details.matrices.length > 0){
d.details.matrices.forEach(function(matrix){ var reviewedMatrix = []
if(matrix)reviewedMatrix.push(matrix) d.details.matrices.forEach(function(matrix){
}) if(matrix)reviewedMatrix.push(matrix)
d.details.matrices = reviewedMatrix })
d.details.matrices = reviewedMatrix
}
if(d.details.matrices && d.details.matrices.length === 0 || filter.halt === true){ if(d.details.matrices && d.details.matrices.length === 0 || filter.halt === true){
return return
} }

1
web/libs/css/main.dash2.css
View File

@ -287,6 +287,7 @@ form.modal-body{margin:0}
.dropdown-menu.scrollable{max-height:300px} .dropdown-menu.scrollable{max-height:300px}
.upload_file input{display:none} .upload_file input{display:none}
#video_preview .stream-objects{right:0;margin:auto;display:inline-block;position:relative;width:auto} #video_preview .stream-objects{right:0;margin:auto;display:inline-block;position:relative;width:auto}
.stream-block,.stream-objects{overflow: hidden!important}
.stream-objects{position:absolute;top:0;left:0;width:100%;height:100%;z-index:1} .stream-objects{position:absolute;top:0;left:0;width:100%;height:100%;z-index:1}
.stream-objects .tag{position:absolute;bottom:100%;left:0;background:red;color:#fff;font-family:monospace;font-size:80%;border-radius:5px 5px 0 0 ;padding:3px 5px;} .stream-objects .tag{position:absolute;bottom:100%;left:0;background:red;color:#fff;font-family:monospace;font-size:80%;border-radius:5px 5px 0 0 ;padding:3px 5px;}
.stream-objects .stream-detected-object{position:absolute;top:0;left:0;border:3px solid red;background:transparent;border-radius:5px} .stream-objects .stream-detected-object{position:absolute;top:0;left:0;border:3px solid red;background:transparent;border-radius:5px}

4
web/pages/blocks/monitoredit.ejs
View File

@ -1099,7 +1099,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="form-group-group orange shinobi-detector-opencv shinobi-detector-openalpr shinobi-detector-python-yolo shinobi-detector_plug" section id="monSectionDetectorObject"> <div class="form-group-group orange shinobi-detector-opencv shinobi-detector-openalpr shinobi-detector-pythonyolo shinobi-detector_plug" section id="monSectionDetectorObject">
<h4><%-lang['Object Detection']%> <small><%-lang['Plugin']%> : <b class="shinobi-detector_name"></b> <b class="shinobi-detector-invert"><%-lang['Not Connected']%></b><b class="shinobi-detector" style="display:none"><%-lang['Connected']%></b></small></h4> <h4><%-lang['Object Detection']%> <small><%-lang['Plugin']%> : <b class="shinobi-detector_name"></b> <b class="shinobi-detector-invert"><%-lang['Not Connected']%></b><b class="shinobi-detector" style="display:none"><%-lang['Connected']%></b></small></h4>
<div class="form-group"> <div class="form-group">
<label><div><span><%-lang['Detect Objects']%></span></div> <label><div><span><%-lang['Detect Objects']%></span></div>
@ -1514,7 +1514,7 @@
<li class="mdl-menu__item add_channel"><i class="fa fa-puzzle-piece"></i> <%-lang['Add Channel']%></li> <li class="mdl-menu__item add_channel"><i class="fa fa-puzzle-piece"></i> <%-lang['Add Channel']%></li>
</ul> </ul>
<div class="h_det_input h_det_1" style="display:inline-block"> <div class="h_det_input h_det_1" style="display:inline-block">
<button type="button" style="display:none" class="btn btn-primary" monitor="region"><i class="fa fa-grav"></i> <%-lang['Region Editor']%></button> <button type="button" class="btn btn-primary" monitor="region"><i class="fa fa-grav"></i> <%-lang['Region Editor']%></button>
<button type="button" class="btn btn-primary" monitor="detector_filters"><i class="fa fa-grav"></i> <%-lang['Detector Filters']%></button> <button type="button" class="btn btn-primary" monitor="detector_filters"><i class="fa fa-grav"></i> <%-lang['Detector Filters']%></button>
</div> </div>
</div> </div>