From 82abee42bd914bf0bcf3a180d29056a9b2178bf3 Mon Sep 17 00:00:00 2001 From: Tamius Han Date: Wed, 16 May 2018 20:59:39 +0200 Subject: [PATCH] autodetection works more or less properly. Removed some console.logs --- js/lib/EdgeDetect.js | 8 -------- js/lib/GuardLine.js | 6 +----- js/modules/ArDetect.js | 2 -- js/modules/Resizer.js | 5 ----- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/js/lib/EdgeDetect.js b/js/lib/EdgeDetect.js index 4db094c..c9e4792 100644 --- a/js/lib/EdgeDetect.js +++ b/js/lib/EdgeDetect.js @@ -37,7 +37,6 @@ class EdgeDetect{ edgeCandidates = this.edgeDetect(image, fastCandidates); bars = this.edgePostprocess(edgeCandidates, this.conf.canvas.height); - console.log("\n------------------------------------\nguardLineOut",guardLineOut,"\nsample cols",sampleCols,"\nfast candidates:", fastCandidates, "\nedgeCandidates:",edgeCandidates,"\nbars:",bars,"\n----------------------------\n\n\n") // } } else { bars = this.pillarTest(image) ? {status: 'ar_known'} : {status: 'ar_unknown'}; @@ -246,8 +245,6 @@ class EdgeDetect{ delete(edges.edgeCandidatesTop.count); delete(edges.edgeCandidatesBottom.count); - console.log("edges", edges, "missing edge?" ,missingEdge); - if( edges.edgeCandidatesTopCount > 0){ for(var e in edges.edgeCandidatesTop){ var edge = edges.edgeCandidatesTop[e]; @@ -270,15 +267,10 @@ class EdgeDetect{ } } - console.log("edges pre-sort:", edgesTop.slice(0), edgesBottom.slice(0)); - // sort by distance edgesTop = edgesTop.sort((a,b) => {return a.distance - b.distance}); edgesBottom = edgesBottom.sort((a,b) => {return a.distance - b.distance}); - console.log("edges post-sort:", edgesTop.slice(0), edgesBottom.slice(0)); - - // če za vsako stran (zgoraj in spodaj) poznamo vsaj enega kandidata, potem lahko preverimo nekaj // stvari diff --git a/js/lib/GuardLine.js b/js/lib/GuardLine.js index 625c594..c1efad8 100644 --- a/js/lib/GuardLine.js +++ b/js/lib/GuardLine.js @@ -105,8 +105,6 @@ class GuardLine { var rowStart, rowEnd; - console.log("!!!! -asdsa --------------- asdas- BLACKBAR CHECK") - // <<<=======| checking upper row |========>>> rowStart = ((edge_upper * this.conf.canvas.width) << 2) + offset; @@ -147,7 +145,7 @@ class GuardLine { } imageCheck(image){ - if(GlobalVars.arDetect.guardLine.top == null || GlobalVars.arDetect.guardLine.bottom == null) + if(!this.imageBar.top || !this.imageBar.bottom) return { success: false }; @@ -185,8 +183,6 @@ class GuardLine { var res = false; - console.log("!!!! -asdsa --------------- asdas- IMAGE CHECK") - if(Debug.debugCanvas.enabled && Debug.debugCanvas.guardLine){ res = this._ti_debugCheckRow(image, rowStart, rowEnd, successTreshold); } else { diff --git a/js/modules/ArDetect.js b/js/modules/ArDetect.js index 70dde20..c243256 100644 --- a/js/modules/ArDetect.js +++ b/js/modules/ArDetect.js @@ -480,8 +480,6 @@ class ArDetector { } - console.log("sample cols", sampleCols) - // save black level only if defined if(currentMinVal) this.blackLevel = this.blackLevel < currentMinVal ? this.blackLevel : currentMinVal; diff --git a/js/modules/Resizer.js b/js/modules/Resizer.js index bd5df6d..f193e22 100644 --- a/js/modules/Resizer.js +++ b/js/modules/Resizer.js @@ -71,11 +71,8 @@ class Resizer { } else if (this.stretch.mode == StretchMode.CONDITIONAL) { stretchFactors = Stretcher.conditionalStretch(dimensions, ExtensionConf.stretch.conditionalDifferencePercent); } - console.log("PRE_ZOOM DIMENSIONS:",dimensions); - this.zoom.applyZoom(dimensions); - console.log("POST_ZOOM DIMENSIONS:",dimensions); var cssOffsets = this.computeOffsets(dimensions); this.applyCss(cssOffsets, stretchFactors); } @@ -193,8 +190,6 @@ class Resizer { applyCss(dimensions, stretchFactors){ - console.log("CSS DIMENSIOPNS", dimensions) - if(this.video == undefined || this.video == null){ if(Debug.debug) console.log("[Resizer::_res_applyCss] Video went missing, doing nothing.");