Update webapp

visioncortex · May 29, 2024 · 148328d · 148328d
1 parent f35df1f
commit 148328d
Show file tree

Hide file tree

Showing 9 changed files with 78 additions and 70 deletions.
diff --git a/docs/0.bootstrap.js b/docs/0.bootstrap.js
diff --git a/docs/1ea3f1b97c566154f2b2.module.wasm b/docs/1ea3f1b97c566154f2b2.module.wasm
diff --git a/docs/589cb57662b50620abca.module.wasm b/docs/589cb57662b50620abca.module.wasm
diff --git a/docs/COPYRIGHT b/docs/COPYRIGHT
diff --git a/docs/bootstrap.js b/docs/bootstrap.js
diff --git a/webapp/Cargo.toml b/webapp/Cargo.toml
@@ -22,7 +22,7 @@ console_log = { version = "0.2", features = ["color"] }
 wasm-bindgen = { version = "0.2", features = ["serde-serialize"]  }
 serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
-visioncortex = "0.6.0"
+visioncortex = "0.8.1"
 
 # The `console_error_panic_hook` crate provides better debugging of panics by
 # logging them with `console.error`. This is great for development, but requires

diff --git a/webapp/app/index.js b/webapp/app/index.js
@@ -35,7 +35,11 @@ document.addEventListener('paste', function (e) {
 
 // Download as SVG
 document.getElementById('export').addEventListener('click', function (e) {
-    const blob = new Blob([new XMLSerializer().serializeToString(svg)], {type: 'octet/stream'}),
+    const blob = new Blob([
+        `<?xml version="1.0" encoding="UTF-8"?>\n`,
+        `<!-- Generator: visioncortex VTracer -->\n`,
+        new XMLSerializer().serializeToString(svg)
+    ], {type: 'octet/stream'}),
     url = window.URL.createObjectURL(blob);
 
     this.href = url;
@@ -444,7 +448,7 @@ class ConverterRunner {
         this.converter.init();
         this.stopped = false;
         if (clustering_mode == 'binary') {
-            svg.style.background = '#000';
+            svg.style.background = '#fff';
             canvas.style.display = 'none';
         } else {
             svg.style.background = '';

diff --git a/webapp/src/conversion/binary_image.rs b/webapp/src/conversion/binary_image.rs
@@ -77,7 +77,7 @@ impl BinaryImageConverter {
                     self.params.max_iterations,
                     self.params.splice_threshold
                 );
-                let color = Color::color(&ColorName::White);
+                let color = Color::color(&ColorName::Black);
                 self.svg.prepend_path(
                     &paths,
                     &color,

diff --git a/webapp/src/conversion/color_image.rs b/webapp/src/conversion/color_image.rs
@@ -1,6 +1,6 @@
 use wasm_bindgen::prelude::*;
 use visioncortex::PathSimplifyMode;
-use visioncortex::color_clusters::{IncrementalBuilder, Clusters, Runner, RunnerConfig, HIERARCHICAL_MAX};
+use visioncortex::color_clusters::{Clusters, Runner, RunnerConfig, HIERARCHICAL_MAX, IncrementalBuilder, KeyingAction};
 
 use crate::canvas::*;
 use crate::svg::*;
@@ -78,6 +78,8 @@ impl ColorImageConverter {
             is_same_color_b: 1,
             deepen_diff: self.params.layer_difference,
             hollow_neighbours: 1,
+            key_color: Default::default(),
+            keying_action: KeyingAction::Discard,
         }, image);
         self.stage = Stage::Clustering(runner.start());
     }
@@ -108,6 +110,8 @@ impl ColorImageConverter {
                                 is_same_color_b: 1,
                                 deepen_diff: 0,
                                 hollow_neighbours: 0,
+                                key_color: Default::default(),
+                                keying_action: KeyingAction::Discard,
                             }, image);
                             self.stage = Stage::Reclustering(runner.start());
                         },