From 6d6a9720445794d2ca1d7096eb988f9abef5dcea Mon Sep 17 00:00:00 2001
From: bleeptrack <mail@bleeptrack.de>
Date: Tue, 27 Aug 2024 10:35:55 +0200
Subject: [PATCH] tick only on update

---
 server.py                  |  6 +++---
 static/VectorizerCanvas.js |  8 +++++---
 static/WebcamGenerator.js  | 22 ++++++++++++++++------
 3 files changed, 24 insertions(+), 12 deletions(-)

diff --git a/server.py b/server.py
index c0db138..22fba51 100644
--- a/server.py
+++ b/server.py
@@ -288,9 +288,9 @@ def extend_pattern(data):
         emit('extention', info)
 
 
-@socketio.on('train')
-def train(data):
-    trainer.trainModel(data['name'])
+#@socketio.on('train')
+#def train(data):
+#    trainer.trainModel(data['name'])
 
 ###### ROUTES
 
diff --git a/static/VectorizerCanvas.js b/static/VectorizerCanvas.js
index f803e5d..10e41d0 100644
--- a/static/VectorizerCanvas.js
+++ b/static/VectorizerCanvas.js
@@ -236,8 +236,10 @@ export class VectorizerCanvas extends HTMLElement {
 			//jsfeat.imgproc.equalize_histogram(img_u8, img_u8)
 
 
-			var r = this.edgeDetails; //5 bei zu viel gedöns?
+			var r = Number(this.edgeDetails) //5 bei zu viel gedöns?
+			console.log("edgeDetails", r)
 			var kernel_size = (r+1) << 1;
+			console.log("kernel_size", kernel_size)
 
 
 			jsfeat.imgproc.gaussian_blur(img_u8, img_u8, kernel_size, 0);
@@ -322,9 +324,9 @@ export class VectorizerCanvas extends HTMLElement {
 			
 			
 			this.shadow.getElementById("canvas-container").appendChild(this.canvas)
-			paper.view.onFrame = this.tick.bind(this)
+			//paper.view.onFrame = this.tick.bind(this)
 			this.raster = new Raster([this.vidw,this.vidh]);
-			
+			this.tick()
 		})
 		
 		
diff --git a/static/WebcamGenerator.js b/static/WebcamGenerator.js
index 39a8726..d575c29 100644
--- a/static/WebcamGenerator.js
+++ b/static/WebcamGenerator.js
@@ -121,6 +121,8 @@ export class WebcamGenerator extends HTMLElement {
 					</div>
 					<div id="settings">
 						<div>
+						<label for="edge-detail">Edge Detail:</label>
+							<input type="range" min="1" max="8" value="2" class="slider" id="edge-detail">
 							<label for="edge-min">Edge Min:</label>
 							<input type="range" min="1" max="100" value="20" class="slider" id="edge-min">
 							<label for="edge-max">Edge Max:</label>
@@ -131,7 +133,6 @@ export class WebcamGenerator extends HTMLElement {
 									<ul id="model-list">
 										<li data-value="random">
 											<span>random</span>
-											<button class="delete-option">X</button>
 										</li>
 									</ul>
 									<button id="add-model" class="scribble">Add Model</button>
@@ -163,12 +164,13 @@ export class WebcamGenerator extends HTMLElement {
 				}
 			} else if (e.target.tagName === 'SPAN') {
 				toggle.textContent = e.target.textContent;
+				this.vectorizer.setModelName(e.target.textContent)
 				popover.hidePopover();
 			}
 		});
 
 		addModelBtn.addEventListener('click', () => {
-		const trainWindow = window.open('/train', '_self')
+			window.open('/train', '_self')
 		})
 
 
@@ -215,26 +217,34 @@ export class WebcamGenerator extends HTMLElement {
 		
 		this.vectorizer.edgemin = sessionStorage.getItem("tinqta:edge-min") || 20
 		this.vectorizer.edgemax = sessionStorage.getItem("tinqta:edge-max") || 50
+		this.vectorizer.edgeDetails = sessionStorage.getItem("tinqta:edge-detail") || 2
+
 		this.shadow.getElementById("edge-min").value = this.vectorizer.edgemin
 		this.shadow.getElementById("edge-max").value = this.vectorizer.edgemax
-		
+		this.shadow.getElementById("edge-detail").value = this.vectorizer.edgeDetails
+
 		 this.shadow.getElementById("edge-min").addEventListener("change", (event) => {
 			this.vectorizer.edgemin = event.target.value
+			this.vectorizer.tick()
 			sessionStorage.setItem("tinqta:edge-min", event.target.value)
 		})
 		
 		this.shadow.getElementById("edge-max").addEventListener("change", (event) => {
 			this.vectorizer.edgemax = event.target.value
+			this.vectorizer.tick()
 			sessionStorage.setItem("tinqta:edge-max", event.target.value)
 		})
 		
-		this.shadow.getElementById("model").addEventListener("change", (event) => {
-			console.log(event.target.value)
-			this.vectorizer.setModelName(event.target.value)
+		this.shadow.getElementById("edge-detail").addEventListener("change", (event) => {
+			this.vectorizer.edgeDetails = event.target.value
+			this.vectorizer.tick()
+			sessionStorage.setItem("tinqta:edge-detail", event.target.value)
 		})
 		
 		
 		
+		
+		
 	}