From fa062c9e19783f4e960ca11f6f66f00e3b495473 Mon Sep 17 00:00:00 2001 From: Moe Date: Mon, 18 Oct 2021 13:44:29 -0700 Subject: [PATCH] clean up region editor+ --- definitions/en_CA.js | 7 +++++++ web/assets/js/bs5.regionEditor.js | 6 +++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/definitions/en_CA.js b/definitions/en_CA.js index 851fed43..d140d69c 100644 --- a/definitions/en_CA.js +++ b/definitions/en_CA.js @@ -5990,6 +5990,13 @@ module.exports = function(s,config,lang){ "class": `btn-info toggle-region-still-image`, "btnContent": `   ${lang['Live Stream Toggle']}`, }, + { + "fieldType": "btn", + forForm: true, + attribute: "href=#", + "class": `btn-success`, + "btnContent": `   ${lang['Save']}`, + }, ] }, "Points": { diff --git a/web/assets/js/bs5.regionEditor.js b/web/assets/js/bs5.regionEditor.js index 29dadbe8..bc967817 100644 --- a/web/assets/js/bs5.regionEditor.js +++ b/web/assets/js/bs5.regionEditor.js @@ -133,7 +133,7 @@ $(document).ready(function(e){ liveElement.attr('width',regionViewerDetails.detector_scale_x) liveElement.attr('height',regionViewerDetails.detector_scale_y) } - var initCanvas = function(){ + var initCanvas = function(dontReloadStream){ var newArray = []; var regionEditorRegionsListValue = regionEditorRegionsList.val(); if(!regionEditorRegionsListValue){ @@ -165,7 +165,7 @@ $(document).ready(function(e){ regionEditorForm.find('[name="threshold"]').val(cord.threshold) regionEditorForm.find('[name="color_threshold"]').val(cord.color_threshold) regionEditorWindow.find('.canvas_holder canvas').remove() - initLiveStream() + if(!dontReloadStream)initLiveStream(); regionEditorRegionsCanvas.val(newArray.join(',')) regionEditorRegionsCanvas.canvasAreaDraw({ imageUrl: placeholder.getData(placeholder.plcimg({ @@ -182,7 +182,7 @@ $(document).ready(function(e){ return dashboardSwitches.regionStillImage || '0' } regionEditorRegionsList.change(function(e){ - initCanvas(); + initCanvas(true); }) regionEditorWindow.on('change','[name]',function(){ var currentRegionId = getCurrentlySelectedRegionId()