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

Add Primary Fields to Region Editor

rkmpp-v4l2m2m-decode
Moe 2022-11-27 15:11:35 -08:00
parent d021652078
commit f797521d51
2 changed files with 202 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
definitions/base.js
View File

@ -2674,7 +2674,6 @@ module.exports = function(s,config,lang){
"field": lang['Filter for Objects only'],
"description": "",
"default": "0",
"example": "",
"fieldType": "select",
"form-group-class": "h_det_fil_input h_det_fil_1",
"form-group-class-pre-layer": "h_det_input h_det_1",
@ -5906,6 +5905,13 @@ module.exports = function(s,config,lang){
"section": "Region Editor",
"blocks": {
"Regions": {
"color": "green",
isFormGroupGroup: true,
"noHeader": true,
"section-class": "col-md-6",
"noDefaultSectionClasses": true,
"info": [
{
"name": lang["Regions"],
"headerTitle": `<span class="cord_name">&nbsp;</span>
<div class="pull-right">
@ -5913,9 +5919,8 @@ module.exports = function(s,config,lang){
<a href=# class="btn btn-danger btn-sm erase"><i class="fa fa-trash-o"></i></a>
</div>`,
"color": "orange",
"section-pre-class": "col-md-6",
"section-class": "where",
"box-wrapper-class": "row",
isFormGroupGroup: true,
"info": [
{
"field": lang["Monitor"],
@ -5981,6 +5986,120 @@ module.exports = function(s,config,lang){
},
]
},
{
"name": lang["Primary"],
"color": "blue",
"section-class": "hide-box-wrapper",
"box-wrapper-class": "row",
isFormGroupGroup: true,
"info": [
{
"name": "detail=detector_sensitivity",
"field": lang['Minimum Change'],
"description": "The motion confidence rating must exceed this value to be seen as a trigger. This number correlates directly to the confidence rating returned by the motion detector. This option was previously named \"Indifference\".",
"default": "10",
"example": "10",
},
{
"name": "detail=detector_max_sensitivity",
"field": lang["Maximum Change"],
"description": "The motion confidence rating must be lower than this value to be seen as a trigger. Leave blank for no maximum. This option was previously named \"Max Indifference\".",
"default": "",
"example": "75",
},
{
"name": "detail=detector_threshold",
"field": lang["Trigger Threshold"],
"description": lang["fieldTextDetectorThreshold"],
"default": "1",
"example": "3",
"possible": "Any non-negative integer."
},
{
"name": "detail=detector_color_threshold",
"field": lang["Color Threshold"],
"description": lang["fieldTextDetectorColorThreshold"],
"default": "9",
"example": "9",
"possible": "Any non-negative integer."
},
{
"name": "detail=detector_frame",
"field": lang["Full Frame Detection"],
"description": lang["fieldTextDetectorFrame"],
"default": "1",
"fieldType": "select",
"possible": [
{
"name": lang.No,
"value": "0"
},
{
"name": lang.Yes,
"value": "1"
}
]
},
{
"name": "detail=detector_motion_tile_mode",
"field": lang['Accuracy Mode'],
"default": "1",
"example": "",
"fieldType": "select",
"possible": [
{
"name": lang.No,
"value": "0"
},
{
"name": lang.Yes,
"value": "1"
}
]
},
{
"name": "detail=detector_tile_size",
"field": lang["Tile Size"],
"description": lang.fieldTextTileSize,
"default": "20",
},
{
"name": "detail=use_detector_filters",
"field": lang['Event Filters'],
"description": lang.fieldTextEventFilters,
"default": "0",
"fieldType": "select",
"possible": [
{
"name": lang.No,
"value": "0"
},
{
"name": lang.Yes,
"value": "1"
}
]
},
{
"name": "detail=use_detector_filters_object",
"field": lang['Filter for Objects only'],
"default": "0",
"fieldType": "select",
"possible": [
{
"name": lang.No,
"value": "0"
},
{
"name": lang.Yes,
"value": "1"
}
]
},
]
},
]
},
"Points": {
"name": lang["Points"],
"color": "orange",

16
web/assets/js/bs5.regionEditor.js
View File

@ -41,6 +41,7 @@ $(document).ready(function(e){
}
}
var loadRegionEditor = function(monitor){
regionEditorForm.find('input').prop('disabled',false)
var theCanvas = getRegionEditorCanvas()
var monitorDetails = Object.assign({},monitor.details)
var imageWidth = !isNaN(monitorDetails.detector_scale_x) ? parseInt(monitorDetails.detector_scale_x) : 640
@ -59,6 +60,13 @@ $(document).ready(function(e){
}
regionViewerDetails = monitorDetails;
initiateRegionList()
loadPrimaryFields(monitor)
}
function loadPrimaryFields(monitor){
var monitorDetails = Object.assign({},monitor.details)
$.each(monitorDetails,function(n,v){
regionEditorForm.find(`[detail="${n}"]`).val(v)
})
}
var drawPointsTable = function(){
var currentRegionId = getCurrentlySelectedRegionId()
@ -90,6 +98,12 @@ $(document).ready(function(e){
var monitorId = getCurrentlySelectedMonitorId()
var monitorConfig = Object.assign({},loadedMonitors[monitorId])
var regionCoordinates = Object.assign({},coorindates || regionViewerDetails.cords instanceof Object ? regionViewerDetails.cords : safeJsonParse(regionViewerDetails.cords) || {});
regionEditorForm.find('[detail]').each(function(n,v){
var el = $(this);
var key = el.attr('detail')
var value = el.val()
monitorConfig.details[key] = value;
});
monitorConfig.details.cords = JSON.stringify(regionCoordinates)
monitorConfig.details = JSON.stringify(monitorConfig.details)
$.post(getApiPrefix(`configureMonitor`)+ '/' + monitorId,{
@ -311,9 +325,7 @@ $(document).ready(function(e){
}
})
addOnTabOpen('regionEditor', function () {
if(!regionEditorMonitorsList.val()){
drawMonitorListToSelector(regionEditorMonitorsList,true)
}
initLiveStream()
})
addOnTabReopen('regionEditor', function () {