From dcbf7172745982aa40445e88d6f6e656fd32c10f Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Thu, 10 May 2018 19:53:09 +1200 Subject: [PATCH] Removed old Preview artifacts --- desktop/sources/links/main.css | 2 -- desktop/sources/scripts/dotgrid.js | 35 +--------------------------- desktop/sources/scripts/generator.js | 2 -- desktop/sources/scripts/guide.js | 2 +- desktop/sources/scripts/tool.js | 3 +-- 5 files changed, 3 insertions(+), 41 deletions(-) diff --git a/desktop/sources/links/main.css b/desktop/sources/links/main.css index dda67dd..2dedd21 100644 --- a/desktop/sources/links/main.css +++ b/desktop/sources/links/main.css @@ -7,7 +7,6 @@ body { padding: 5px; font-family: 'input_mono_regular'; -webkit-user-select: non #guide { position: absolute;width: 300px;height: 300px; transition: opacity 150ms;} #render { display: none } #vector { z-index: 1000;position: relative;width:300px; height:300px; } -#preview { z-index: 1001;position: absolute; top:15px; left:15px; stroke-dasharray: 4,4;} /* Interface */ @@ -43,5 +42,4 @@ body { background:var(--background) !important; } .b_inv { background:var(--b_inv) !important ; ; } .icon { color:var(--f_high) !important; stroke:var(--f_high) !important; } #dotgrid svg.vector { stroke:var(--f_high) !important; } -#dotgrid #preview { stroke:var(--f_high) !important; } \ No newline at end of file diff --git a/desktop/sources/scripts/dotgrid.js b/desktop/sources/scripts/dotgrid.js index c309b32..454b3b0 100644 --- a/desktop/sources/scripts/dotgrid.js +++ b/desktop/sources/scripts/dotgrid.js @@ -44,22 +44,6 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y) this.svg_el.style.fill = "none"; this.svg_el.style.strokeWidth = this.tool.style().thickness; // this.element.appendChild(this.svg_el); - - // Preview - this.preview_el = document.createElementNS("http://www.w3.org/2000/svg", "svg"); - this.preview_el.id = "preview" - this.preview_el.setAttribute("class","vector"); - this.preview_el.setAttribute("width",this.tool.settings.size.width+"px"); - this.preview_el.setAttribute("height",this.tool.settings.size.height+"px"); - this.preview_el.setAttribute("xmlns","http://www.w3.org/2000/svg"); - this.preview_el.setAttribute("baseProfile","full"); - this.preview_el.setAttribute("version","1.1"); - this.preview_el.style.width = this.tool.settings.size.width; - this.preview_el.style.height = this.tool.settings.size.height; - this.preview_el.style.strokeWidth = this.tool.style().thickness; - this.preview_el.style.strokeLinecap = this.tool.style().strokeLinecap; - this.preview_el.style.fill = this.tool.style().fill; - // this.element.appendChild(this.preview_el); this.svg_el.appendChild(this.layer_3); this.svg_el.appendChild(this.layer_2); @@ -282,16 +266,6 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y) setTimeout(() => { dotgrid.tool.clear(); },150); } - this.preview_prev = null - - this.preview = function(operation) - { - if(this.preview_prev == operation){ return; } - - this.preview_el.innerHTML = !operation || operation == "close" || !dotgrid.tool.can_cast(operation) ? `` : ``; - this.preview_prev = operation; - } - // Toggles this.mod_thickness = function(mod,step = false) @@ -356,11 +330,7 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y) this.grid_y = size.height/15 this.svg_el.setAttribute("width",size.width+"px"); this.svg_el.setAttribute("height",size.height+"px"); - this.preview_el.style.width = size.width - this.preview_el.style.height = size.height - this.preview_el.setAttribute("width",size.width+"px"); - this.preview_el.setAttribute("height",size.height+"px"); - + this.element.style.width = this.tool.settings.size.width; this.element.style.height = this.tool.settings.size.height; @@ -374,8 +344,6 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y) this.draw = function(exp = false) { - console.log("draw") - var paths = this.tool.paths(); var d = this.tool.path(); @@ -404,7 +372,6 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y) this.layer_3.style.stroke = this.tool.styles[2].color; this.layer_3.style.fill = this.tool.styles[2].fill; - this.preview(); this.render.draw(); this.interface.update(); this.guide.refresh(); diff --git a/desktop/sources/scripts/generator.js b/desktop/sources/scripts/generator.js index 247eb3c..7763855 100644 --- a/desktop/sources/scripts/generator.js +++ b/desktop/sources/scripts/generator.js @@ -63,8 +63,6 @@ function Generator(layer) var layer = operate(this.layer,offset,scale) - console.log(layer) - for(id in layer){ var seg = layer[id]; s += `${this.render(seg)}` diff --git a/desktop/sources/scripts/guide.js b/desktop/sources/scripts/guide.js index dc37adf..f08d11c 100644 --- a/desktop/sources/scripts/guide.js +++ b/desktop/sources/scripts/guide.js @@ -201,7 +201,7 @@ function Guide() var path = new Generator([{vertices:dotgrid.tool.vertices,type:operation}]).toString({x:15,y:15},2) var style = { - color:"#f00", + color:dotgrid.theme.active.f_med, thickness:2, strokeLinecap:"round", strokeLinejoin:"round", diff --git a/desktop/sources/scripts/tool.js b/desktop/sources/scripts/tool.js index 53f0f2a..752c442 100644 --- a/desktop/sources/scripts/tool.js +++ b/desktop/sources/scripts/tool.js @@ -29,7 +29,6 @@ function Tool() this.clear = function() { this.vertices = []; - dotgrid.preview(); dotgrid.draw(); } @@ -62,7 +61,7 @@ function Tool() this.replace = function(dot) { - if(!dot.layers || dot.layers.length != 3){ console.log("Incompatible version"); return; } + if(!dot.layers || dot.layers.length != 3){ console.warn("Incompatible version"); return; } if(this.settings && (this.settings.size.width != dot.settings.size.width || this.settings.size.height != dot.settings.size.height)){ dotgrid.set_size({width:dot.settings.size.width,height:dot.settings.size.height})